Update CM to us Local Intermediate Certs

[aaf/authz.git] / cadi / aaf / src / test / java / org / onap / aaf / cadi / cm / test / JU_ArtifactDir.java

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 dbddd57..ed23179 100644 (file)
--- 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
@@ -23,7 +23,6 @@ package org.onap.aaf.cadi.cm.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
@@ -36,13 +35,14 @@ 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;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.cm.ArtifactDir;
+import org.onap.aaf.cadi.configure.ArtifactDir;
 import org.onap.aaf.cadi.util.Chmod;
 import org.onap.aaf.misc.env.Trans;
 
@@ -70,10 +70,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 +133,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 {