X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fcm%2Ftest%2FJU_ArtifactDir.java;fp=cadi%2Faaf%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fcm%2Ftest%2FJU_ArtifactDir.java;h=5121448f793f4c3e1d102f08495718700e066b51;hb=f5bb572dd89dea0d74e4e8ba17c7bf5b044c2dc4;hp=dbddd57a65d3efd52b922a090f26a0d4f7d69d4d;hpb=a30fc7afb8c889dedc3be4fa55de5bdbf35f6086;p=aaf%2Fauthz.git

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 dbddd57a..5121448f 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
@@ -36,6 +36,7 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,10 +71,14 @@ public class JU_ArtifactDir {
 		issuers.add("issuer2");
 	}
 	
+	@After
+	public void tearDown() {
+		ArtifactDir.clear();
+	}
+	
 	@AfterClass
 	public static void tearDownOnce() {
 		cleanup();
-		ArtifactDir.clear();
 	}
 
 	@Test
@@ -129,12 +134,12 @@ public class JU_ArtifactDir {
 	
 	}
 
-	@Test
+	@Test(expected = CadiException.class)
 	public void throwsTest() throws CadiException {
 		ArtifactDirStud artiDir = new ArtifactDirStud();
 		when(artiMock.getDir()).thenReturn(dirName);
 		when(artiMock.getNs()).thenReturn(nsName);
-		assertTrue(artiDir.place(transMock, certInfoMock, artiMock, "machine"));
+		artiDir.place(transMock, certInfoMock, artiMock, "machine");
 	}
 
 	private class ArtifactDirStud extends ArtifactDir {