X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfig%2Ftest%2FJU_SecurityInfo.java;h=98c1a2927f1288e639d92bfd3f7accc9218e0a2b;hp=001d0fe605ca4ce2326cfa76256020ff8a6b0c38;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e

diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_SecurityInfo.java b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_SecurityInfo.java
index 001d0fe6..98c1a292 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_SecurityInfo.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_SecurityInfo.java
@@ -45,92 +45,92 @@ import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.config.SecurityInfo;
 
 public class JU_SecurityInfo {
-	
-	private static PropAccess access;
-	
-	private static final String keyStoreFileName = "src/test/resources/keystore.p12";
-	private static final String keyStorePassword = "Password for the keystore";
-	private static final String keyPassword = "Password for the key";
-		
-	private static final String trustStoreFileName = "src/test/resources/truststore.jks";
-	private static final String trustStorePasswd = "Password for the truststore";
-	
-	@BeforeClass
-	public static void setupOnce() throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
-		KeyStore keyStore = KeyStore.getInstance("PKCS12");
-		keyStore.load(null, null);
-		keyStore.store(new FileOutputStream(keyStoreFileName), keyStorePassword.toCharArray());
-
-		KeyStore trustStore = KeyStore.getInstance("JKS");
-		trustStore.load(null, null);
-		trustStore.store(new FileOutputStream(trustStoreFileName), trustStorePasswd.toCharArray());
-	}
-	
-	@Before
-	public void setup() throws IOException {
-		access = new PropAccess(new PrintStream(new ByteArrayOutputStream()), new String[0]);
-
-		access.setProperty(Config.CADI_KEYSTORE, keyStoreFileName);
-		access.setProperty(Config.CADI_KEYSTORE_PASSWORD, access.encrypt(keyStorePassword));
-		access.setProperty(Config.CADI_KEY_PASSWORD, access.encrypt(keyPassword));
-		
-		access.setProperty(Config.CADI_TRUSTSTORE, trustStoreFileName);
-		access.setProperty(Config.CADI_TRUSTSTORE_PASSWORD, access.encrypt(trustStorePasswd));
-	}
-
-	@AfterClass
-	public static void tearDownOnce() {
-		File keyStoreFile = new File(keyStoreFileName);
-		if (keyStoreFile.exists()) {
-			keyStoreFile.delete();
-		}
-		File trustStoreFile = new File(trustStoreFileName);
-		if (trustStoreFile.exists()) {
-			trustStoreFile.delete();
-		}
-	}
-
-	@Test
-	public void test() throws CadiException {
-		SecurityInfo si = new SecurityInfo(access);
-
-		assertNotNull(si.getSSLSocketFactory());
-		assertNotNull(si.getSSLContext());
-		assertNotNull(si.getKeyManagers());
-		
-		access.setProperty(Config.CADI_TRUST_MASKS, "123.123.123.123");
-		si = new SecurityInfo(access);
-	}
-
-	@Test(expected = CadiException.class)
-	public void nullkeyStoreTest() throws CadiException {
-		access.setProperty(Config.CADI_KEYSTORE, "passwords.txt");
-		@SuppressWarnings("unused")
-		SecurityInfo si = new SecurityInfo(access);
-	}
-
-	@Test(expected = CadiException.class)
-	public void nullTrustStoreTest() throws CadiException {
-		access.setProperty(Config.CADI_TRUSTSTORE, "passwords.txt");
-		@SuppressWarnings("unused")
-		SecurityInfo si = new SecurityInfo(access);
-	}
-	
-	
-	@Test(expected = NumberFormatException.class)
-	public void badTrustMaskTest() throws CadiException {
-		access.setProperty(Config.CADI_TRUST_MASKS, "trustMask");
-		@SuppressWarnings("unused")
-		SecurityInfo si = new SecurityInfo(access);
-	}
-
-	@Test
-	public void coverageTest() throws CadiException {
-		PropAccess badAccess = new PropAccess(new PrintStream(new ByteArrayOutputStream()), new String[0]);
-		@SuppressWarnings("unused")
-		SecurityInfo si = new SecurityInfo(badAccess);
-		badAccess.setProperty(Config.CADI_KEYSTORE, keyStoreFileName);
-		si = new SecurityInfo(badAccess);
-	}
+    
+    private static PropAccess access;
+    
+    private static final String keyStoreFileName = "src/test/resources/keystore.p12";
+    private static final String keyStorePassword = "Password for the keystore";
+    private static final String keyPassword = "Password for the key";
+        
+    private static final String trustStoreFileName = "src/test/resources/truststore.jks";
+    private static final String trustStorePasswd = "Password for the truststore";
+    
+    @BeforeClass
+    public static void setupOnce() throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
+        KeyStore keyStore = KeyStore.getInstance("PKCS12");
+        keyStore.load(null, null);
+        keyStore.store(new FileOutputStream(keyStoreFileName), keyStorePassword.toCharArray());
+
+        KeyStore trustStore = KeyStore.getInstance("JKS");
+        trustStore.load(null, null);
+        trustStore.store(new FileOutputStream(trustStoreFileName), trustStorePasswd.toCharArray());
+    }
+    
+    @Before
+    public void setup() throws IOException {
+        access = new PropAccess(new PrintStream(new ByteArrayOutputStream()), new String[0]);
+
+        access.setProperty(Config.CADI_KEYSTORE, keyStoreFileName);
+        access.setProperty(Config.CADI_KEYSTORE_PASSWORD, access.encrypt(keyStorePassword));
+        access.setProperty(Config.CADI_KEY_PASSWORD, access.encrypt(keyPassword));
+        
+        access.setProperty(Config.CADI_TRUSTSTORE, trustStoreFileName);
+        access.setProperty(Config.CADI_TRUSTSTORE_PASSWORD, access.encrypt(trustStorePasswd));
+    }
+
+    @AfterClass
+    public static void tearDownOnce() {
+        File keyStoreFile = new File(keyStoreFileName);
+        if (keyStoreFile.exists()) {
+            keyStoreFile.delete();
+        }
+        File trustStoreFile = new File(trustStoreFileName);
+        if (trustStoreFile.exists()) {
+            trustStoreFile.delete();
+        }
+    }
+
+    @Test
+    public void test() throws CadiException {
+        SecurityInfo si = new SecurityInfo(access);
+
+        assertNotNull(si.getSSLSocketFactory());
+        assertNotNull(si.getSSLContext());
+        assertNotNull(si.getKeyManagers());
+        
+        access.setProperty(Config.CADI_TRUST_MASKS, "123.123.123.123");
+        si = new SecurityInfo(access);
+    }
+
+    @Test(expected = CadiException.class)
+    public void nullkeyStoreTest() throws CadiException {
+        access.setProperty(Config.CADI_KEYSTORE, "passwords.txt");
+        @SuppressWarnings("unused")
+        SecurityInfo si = new SecurityInfo(access);
+    }
+
+    @Test(expected = CadiException.class)
+    public void nullTrustStoreTest() throws CadiException {
+        access.setProperty(Config.CADI_TRUSTSTORE, "passwords.txt");
+        @SuppressWarnings("unused")
+        SecurityInfo si = new SecurityInfo(access);
+    }
+    
+    
+    @Test(expected = NumberFormatException.class)
+    public void badTrustMaskTest() throws CadiException {
+        access.setProperty(Config.CADI_TRUST_MASKS, "trustMask");
+        @SuppressWarnings("unused")
+        SecurityInfo si = new SecurityInfo(access);
+    }
+
+    @Test
+    public void coverageTest() throws CadiException {
+        PropAccess badAccess = new PropAccess(new PrintStream(new ByteArrayOutputStream()), new String[0]);
+        @SuppressWarnings("unused")
+        SecurityInfo si = new SecurityInfo(badAccess);
+        badAccess.setProperty(Config.CADI_KEYSTORE, keyStoreFileName);
+        si = new SecurityInfo(badAccess);
+    }
 
 }