X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Ftest%2FJU_CmdLine.java;h=52be7d5e6a26d3c8c2f3b97fef88ec29caf67ecc;hb=087706284431e63ea77b934859a47beeb59e4592;hp=b2820db2b223fd8fb5a85c8b52cea6411d57758a;hpb=c36423577d5b8501af78cc2f8a7db1e43eacdf0d;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
index b2820db2..52be7d5e 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
@@ -21,18 +21,15 @@
  ******************************************************************************/
 package org.onap.aaf.cadi.test;
 
-import static org.mockito.Matchers.*;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 import org.junit.*;
 import org.mockito.*;
-import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -43,7 +40,6 @@ import java.util.Properties;
 import org.onap.aaf.cadi.CmdLine;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.util.Chmod;
 
 public class JU_CmdLine {
 
@@ -69,29 +65,10 @@ public class JU_CmdLine {
 		p.setProperty("force_exit", "false");
 
 		CmdLine.access = new PropAccess(p);
-		File test = new File("test");
-		if(test.exists()) {
-			if(!test.isDirectory()) {
-				test.delete();
-				test.mkdirs();
-			}
-		} else {
-			test.mkdirs();
-		}
-		
-		File keyF= new File(test,"keyfile");
-		if(!keyF.exists()) {
-			FileOutputStream fos = new FileOutputStream(keyF);
-			try {
-				fos.write(Symm.keygen());
-				fos.flush();
-			} finally {
-				fos.close();
-			}
-		}
-		keyfile = "test/keyfile";
+		keyfile = "src/test/resources/keyfile";
 		password = "password";
 
+		File keyF = new File("src/test/resources", "keyfile");
 		FileInputStream fis = new FileInputStream(keyF);
 		try {
 			symm = Symm.obtain(fis);
@@ -186,6 +163,10 @@ public class JU_CmdLine {
 		assertThat(outContent.toString().length(), is(2074));
 
 		String filePath = "test/output_key";
+		File testDir = new File("test");
+		if(!testDir.exists()) {
+			testDir.mkdirs();
+		}
 		CmdLine.main(new String[]{"keygen", filePath});
 		File keyfile = new File(filePath);
 		assertTrue(Files.isReadable(Paths.get(filePath)));