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_PlaceArtifactInKeystore.java;h=d146f631f863f10a09b848d26a34d5652f2193c2;hb=refs%2Fchanges%2F67%2F46767%2F1;hp=02054cbfb00dbfc640d8bcf3081b55aa81668364;hpb=34f6446e97199cb5aaefd1369d9faaf297a9b6bf;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
index 02054cbf..d146f631 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
@@ -53,6 +53,7 @@ public class JU_PlaceArtifactInKeystore {
 	@Mock private CertInfo certInfoMock;
 	@Mock private Artifact artiMock;
 
+	private static final String caName = "onap";
 	private static final String dirName = "src/test/resources/artifacts";
 	private static final String nsName = "org.onap.test";
 	private static final String mechID = "m12345";
@@ -77,6 +78,7 @@ public class JU_PlaceArtifactInKeystore {
 		when(certInfoMock.getChallenge()).thenReturn(luggagePassword);
 		when(certInfoMock.getCerts()).thenReturn(certs);
 
+		when(artiMock.getCa()).thenReturn(caName);
 		when(artiMock.getDir()).thenReturn(dirName);
 		when(artiMock.getNs()).thenReturn(nsName);
 		when(artiMock.getMechid()).thenReturn(mechID);
@@ -94,12 +96,13 @@ public class JU_PlaceArtifactInKeystore {
 
 	@Test
 	public void test() throws CadiException {
-		PlaceArtifactInKeystore placer = new PlaceArtifactInKeystore("pkcs12");
+		// Note: PKCS12 can't be tested in JDK 7 and earlier.  Can't handle Trusting Certificates.
+		PlaceArtifactInKeystore placer = new PlaceArtifactInKeystore("jks");
 
 		certs.add(x509String);
 		certs.add(x509Chain);
 		assertThat(placer.place(transMock, certInfoMock, artiMock, "machine"), is(true));
-		for (String ext : new String[] {"chal", "keyfile", "pkcs12", "props", "trust.pkcs12"}) {
+		for (String ext : new String[] {"chal", "keyfile", "jks", "props", "trust.jks"}) {
 			assertThat(new File(dirName + '/' + nsName + '.' + ext).exists(), is(true));
 		}