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 1f68cf6..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
@@ -21,9 +21,10 @@
 
 package org.onap.aaf.cadi.cm.test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,11 +35,15 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.*;
-import org.mockito.*;
-
+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;
 
@@ -66,6 +71,11 @@ public class JU_ArtifactDir {
                issuers.add("issuer2");
        }
        
+       @After
+       public void tearDown() {
+               ArtifactDir.clear();
+       }
+       
        @AfterClass
        public static void tearDownOnce() {
                cleanup();
@@ -96,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");
@@ -138,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() {