Remove dependency on working directory

Author: russgold

kubernetes/src/test/java/oracle/kubernetes/operator/helm/ProcessedChart.java

@@ -12,15 +12,14 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import oracle.kubernetes.operator.utils.PathUtils;
 import oracle.kubernetes.operator.utils.YamlReader;
 import org.yaml.snakeyaml.Yaml;
 
@@ -117,7 +116,7 @@ public Iterable<Object> getYamlDocuments() throws Exception {
    *
    * @return a map of values
    */
-  public Map<String, Object> getValues() throws Exception {
+  Map<String, Object> getValues() throws Exception {
     getYamlDocuments();
 
     return values;
@@ -164,23 +163,6 @@ private File getChartDir(String chartName) throws URISyntaxException {
   }
 
   private File getChartsParentDir() throws URISyntaxException {
-    return new File(getModuleDir(), "charts");
-  }
-
-  private File getModuleDir() throws URISyntaxException {
-    return getTargetDir(getClass()).getParentFile();
-  }
-
-  private File getTargetDir(Class<?> aClass) throws URISyntaxException {
-    File dir = getPackageDir(aClass);
-    while (dir.getParent() != null && !dir.getName().equals("target")) {
-      dir = dir.getParentFile();
-    }
-    return dir;
-  }
-
-  private File getPackageDir(Class<?> aClass) throws URISyntaxException {
-    URL url = aClass.getResource(aClass.getSimpleName() + ".class");
-    return Paths.get(url.toURI()).toFile().getParentFile();
+    return new File(PathUtils.getModuleDir(getClass()), "charts");
   }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/utils/CreateOperatorInputs.java

@@ -6,9 +6,10 @@
 
 import static oracle.kubernetes.operator.utils.YamlUtils.newYaml;
 
+import java.io.File;
 import java.io.Reader;
+import java.net.URISyntaxException;
 import java.nio.charset.Charset;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -26,7 +27,7 @@
  */
 public class CreateOperatorInputs extends OperatorValues {
 
-  private static final String DEFAULT_INPUTS = "../kubernetes/create-weblogic-operator-inputs.yaml";
+  private static final String DEFAULT_INPUTS = "create-weblogic-operator-inputs.yaml";
 
   public static OperatorValues readDefaultInputsFile() throws Exception {
     return readInputsYamlFile(defaultInputsPath());
@@ -37,7 +38,7 @@ private static OperatorValues readInputsYamlFile(Path path) throws Exception {
     return newYaml().loadAs(r, CreateOperatorInputs.class);
   }
 
-  private static Path defaultInputsPath() {
-    return FileSystems.getDefault().getPath(DEFAULT_INPUTS);
+  private static Path defaultInputsPath() throws URISyntaxException {
+    return new File(PathUtils.getModuleDir(CreateOperatorInputs.class), DEFAULT_INPUTS).toPath();
   }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/utils/ExecCreateOperator.java

@@ -31,10 +31,11 @@ public static ExecResult execCreateOperator(
   }
 
   public static ExecResult execCreateOperator(String options) throws Exception {
-    return ExecCommand.exec(CREATE_SCRIPT + options);
+    return ExecCommand.exec(
+        PathUtils.getModuleDir(ExecCreateOperator.class) + "/" + CREATE_SCRIPT + options);
   }
 
-  public static Path getInputsYamlPath(Path userProjectsPath) {
+  private static Path getInputsYamlPath(Path userProjectsPath) {
     return userProjectsPath.resolve("create-weblogic-operator-inputs.yaml");
   }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/utils/PathUtils.java

@@ -0,0 +1,25 @@
+package oracle.kubernetes.operator.utils;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
+
+public class PathUtils {
+  public static File getModuleDir(Class<?> aClass) throws URISyntaxException {
+    return getTargetDir(aClass).getParentFile();
+  }
+
+  private static File getTargetDir(Class<?> aClass) throws URISyntaxException {
+    File dir = getPackageDir(aClass);
+    while (dir.getParent() != null && !dir.getName().equals("target")) {
+      dir = dir.getParentFile();
+    }
+    return dir;
+  }
+
+  private static File getPackageDir(Class<?> aClass) throws URISyntaxException {
+    URL url = aClass.getResource(aClass.getSimpleName() + ".class");
+    return Paths.get(url.toURI()).toFile().getParentFile();
+  }
+}