X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fcm%2Ftest%2FJU_ArtifactDir.java;h=70550451469da7b93b71ce6ff8f2c696157fed5e;hp=d50b87a223e63dd322c2136936e0ab39c561483b;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e

diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
index d50b87a2..70550451 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
@@ -52,112 +52,112 @@ import certman.v1_0.CertInfo;
 
 public class JU_ArtifactDir {
 
-	@Mock private Trans transMock;
-	@Mock private CertInfo certInfoMock;
-	@Mock private Artifact artiMock;
-	
-	private static final String dirName = "src/test/resources/artifacts";
-	private static final String nsName = "org.onap.test";
-	private static final String luggagePassword = "12345";  // That's the stupidest combination I've ever heard in my life
-
-	private List<String> issuers;
-
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
-		
-		issuers = new ArrayList<>();
-		issuers.add("issuer1");
-		issuers.add("issuer2");
-	}
-	
-	@After
-	public void tearDown() {
-		ArtifactDir.clear();
-	}
-	
-	@AfterClass
-	public static void tearDownOnce() {
-		cleanup();
-	}
-
-	@Test
-	public void test() throws CadiException, IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
-		ArtifactDirStud artiDir = new ArtifactDirStud();
-
-		try {
-			artiDir.place(transMock, certInfoMock, artiMock, "machine");
-			fail("Should've thrown an exception");
-		} catch (CadiException e) {
-			assertThat(e.getMessage(), is("File Artifacts require a path\nFile Artifacts require an AAF Namespace"));
-		}
-		
-		when(artiMock.getDir()).thenReturn(dirName);
-		try {
-			artiDir.place(transMock, certInfoMock, artiMock, "machine");
-			fail("Should've thrown an exception");
-		} catch (CadiException e) {
-			assertThat(e.getMessage(), is("File Artifacts require an AAF Namespace"));
-		}
-		
-		when(artiMock.getNs()).thenReturn(nsName);
-		when(certInfoMock.getCaIssuerDNs()).thenReturn(issuers);
-		when(certInfoMock.getChallenge()).thenReturn(luggagePassword);
-		artiDir.place(transMock, certInfoMock, artiMock, "machine");
-		
-		File writableFile = new File(dirName + '/' + nsName + "writable.txt");
-		ArtifactDir.write(writableFile, Chmod.to755, "first data point", "second data point");
-		try {
-			ArtifactDir.write(writableFile, Chmod.to755, (String[])null);
-			fail("Should've thrown an exception");
-		} catch(NullPointerException e) {
-		}
-		
-		KeyStore ks = KeyStore.getInstance(Agent.PKCS12);
-		try {
-			ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
-			fail("Should've thrown an exception");
-		} catch(CadiException e) {
-		}
-		
-		ks.load(null, null);
-		ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
-		
-		ArtifactDirStud artiDir2 = new ArtifactDirStud();
-		artiDir2.place(transMock, certInfoMock, artiMock, "machine");
-
-		// coverage
-		artiDir.place(transMock, certInfoMock, artiMock, "machine");
-
-		ArtifactDir.clear();
-		artiDir.place(transMock, certInfoMock, artiMock, "machine");
-	
-	}
-
-	@Test(expected = CadiException.class)
-	public void throwsTest() throws CadiException {
-		ArtifactDirStud artiDir = new ArtifactDirStud();
-		when(artiMock.getDir()).thenReturn(dirName);
-		when(artiMock.getNs()).thenReturn(nsName);
-		artiDir.place(transMock, certInfoMock, artiMock, "machine");
-	}
-
-	private class ArtifactDirStud extends ArtifactDir {
-		@Override
-		protected boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
-			// This is only here so that we have a concrete class to test
-			return false;
-		}
-	}
-
-	private static void cleanup() {
-		File dir = new File(dirName);
-		if (dir.exists()) {
-			for (File f : dir.listFiles()) {
-				f.delete();
-			}
-			dir.delete();
-		}
-	}
+    @Mock private Trans transMock;
+    @Mock private CertInfo certInfoMock;
+    @Mock private Artifact artiMock;
+    
+    private static final String dirName = "src/test/resources/artifacts";
+    private static final String nsName = "org.onap.test";
+    private static final String luggagePassword = "12345";  // That's the stupidest combination I've ever heard in my life
+
+    private List<String> issuers;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        
+        issuers = new ArrayList<>();
+        issuers.add("issuer1");
+        issuers.add("issuer2");
+    }
+    
+    @After
+    public void tearDown() {
+        ArtifactDir.clear();
+    }
+    
+    @AfterClass
+    public static void tearDownOnce() {
+        cleanup();
+    }
+
+    @Test
+    public void test() throws CadiException, IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
+        ArtifactDirStud artiDir = new ArtifactDirStud();
+
+        try {
+            artiDir.place(transMock, certInfoMock, artiMock, "machine");
+            fail("Should've thrown an exception");
+        } catch (CadiException e) {
+            assertThat(e.getMessage(), is("File Artifacts require a path\nFile Artifacts require an AAF Namespace"));
+        }
+        
+        when(artiMock.getDir()).thenReturn(dirName);
+        try {
+            artiDir.place(transMock, certInfoMock, artiMock, "machine");
+            fail("Should've thrown an exception");
+        } catch (CadiException e) {
+            assertThat(e.getMessage(), is("File Artifacts require an AAF Namespace"));
+        }
+        
+        when(artiMock.getNs()).thenReturn(nsName);
+        when(certInfoMock.getCaIssuerDNs()).thenReturn(issuers);
+        when(certInfoMock.getChallenge()).thenReturn(luggagePassword);
+        artiDir.place(transMock, certInfoMock, artiMock, "machine");
+        
+        File writableFile = new File(dirName + '/' + nsName + "writable.txt");
+        ArtifactDir.write(writableFile, Chmod.to755, "first data point", "second data point");
+        try {
+            ArtifactDir.write(writableFile, Chmod.to755, (String[])null);
+            fail("Should've thrown an exception");
+        } catch(NullPointerException e) {
+        }
+        
+        KeyStore ks = KeyStore.getInstance(Agent.PKCS12);
+        try {
+            ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
+            fail("Should've thrown an exception");
+        } catch(CadiException e) {
+        }
+        
+        ks.load(null, null);
+        ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
+        
+        ArtifactDirStud artiDir2 = new ArtifactDirStud();
+        artiDir2.place(transMock, certInfoMock, artiMock, "machine");
+
+        // coverage
+        artiDir.place(transMock, certInfoMock, artiMock, "machine");
+
+        ArtifactDir.clear();
+        artiDir.place(transMock, certInfoMock, artiMock, "machine");
+    
+    }
+
+    @Test(expected = CadiException.class)
+    public void throwsTest() throws CadiException {
+        ArtifactDirStud artiDir = new ArtifactDirStud();
+        when(artiMock.getDir()).thenReturn(dirName);
+        when(artiMock.getNs()).thenReturn(nsName);
+        artiDir.place(transMock, certInfoMock, artiMock, "machine");
+    }
+
+    private class ArtifactDirStud extends ArtifactDir {
+        @Override
+        protected boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
+            // This is only here so that we have a concrete class to test
+            return false;
+        }
+    }
+
+    private static void cleanup() {
+        File dir = new File(dirName);
+        if (dir.exists()) {
+            for (File f : dir.listFiles()) {
+                f.delete();
+            }
+            dir.delete();
+        }
+    }
 
 }