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;
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.Agent;
+import org.onap.aaf.cadi.configure.ArtifactDir;
import org.onap.aaf.cadi.util.Chmod;
import org.onap.aaf.misc.env.Trans;
issuers.add("issuer2");
}
+ @After
+ public void tearDown() {
+ ArtifactDir.clear();
+ }
+
@AfterClass
public static void tearDownOnce() {
cleanup();
- ArtifactDir.clear();
}
@Test
artiDir.place(transMock, certInfoMock, artiMock, "machine");
File writableFile = new File(dirName + '/' + nsName + "writable.txt");
- artiDir.write(writableFile, Chmod.to755, "first data point", "second data point");
+ ArtifactDir.write(writableFile, Chmod.to755, "first data point", "second data point");
try {
- artiDir.write(writableFile, Chmod.to755, (String[])null);
+ ArtifactDir.write(writableFile, Chmod.to755, (String[])null);
fail("Should've thrown an exception");
} catch(NullPointerException e) {
}
- KeyStore ks = KeyStore.getInstance("pkcs12");
+ KeyStore ks = KeyStore.getInstance(Agent.PKCS12);
try {
- artiDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
+ ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
fail("Should've thrown an exception");
} catch(CadiException e) {
}
ks.load(null, null);
- artiDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
+ ArtifactDir.write(writableFile, Chmod.to755, ks, luggagePassword.toCharArray());
ArtifactDirStud artiDir2 = new ArtifactDirStud();
artiDir2.place(transMock, certInfoMock, artiMock, "machine");
}
- @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 {
// This is only here so that we have a concrete class to test
return false;
}
-
- // Expose the protected methods
-
- public void write(File f, Chmod c, String ... data) throws IOException {
- super.write(f, c, data);
- }
- public void write(File f, Chmod c, KeyStore ks, char[] pass ) throws IOException, CadiException {
- super.write(f, c, ks, pass);
- }
}
private static void cleanup() {