Merge "System dependent separators"

[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 d0d67e2..d50b87a 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
@@ -42,7 +42,8 @@ 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;
 
@@ -105,22 +106,22 @@ public class JU_ArtifactDir {
                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");
@@ -147,15 +148,6 @@ public class JU_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() {