Move chart tests to top level of kubernetes directory

Author: russgold

kubernetes/charts/pom.xml renamed to kubernetes/pom.xml

@@ -11,7 +11,7 @@
     <version>1.0</version>
   </parent>
 
-  <artifactId>helm-charts-test</artifactId>
+  <artifactId>installation-tests</artifactId>
 
   <description>Oracle Weblogic Server Kubernetes Operator</description>
   <name>helm-chart-tests</name>

kubernetes/charts/src/test/java/oracle/kubernetes/operator/helm/ChartITBase.java renamed to kubernetes/src/test/java/oracle/kubernetes/operator/helm/ChartITBase.java

@@ -110,7 +110,7 @@ private Process getProcess() throws Exception {
   }
 
   private Process processChart(String chartName, UpdateValues updateValues) throws Exception {
-    File chartsDir = getChartsDir(chartName);
+    File chartsDir = getChartDir(chartName);
     File baseValuesFile = new File(chartsDir, "values.yaml");
     Map<String, String> values = new Yaml().load(new FileReader(baseValuesFile));
 
@@ -134,8 +134,16 @@ private Path createUpdatedValuesFile(UpdateValues updateValues, Map<String, Stri
     return valuesFile;
   }
 
-  private File getChartsDir(String chartName) throws URISyntaxException {
-    return new File(getTargetDir(getClass()).getParentFile(), chartName);
+  private File getChartDir(String chartName) throws URISyntaxException {
+    return new File(getChartsParentDir(), chartName);
+  }
+
+  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 {

kubernetes/charts/src/test/java/oracle/kubernetes/operator/helm/OperatorChartIT.java renamed to kubernetes/src/test/java/oracle/kubernetes/operator/helm/OperatorChartIT.java

@@ -13,7 +13,7 @@
 		<module>operator</module>
 		<module>swagger</module>
 		<module>integration-tests</module>
-		<module>kubernetes/charts</module>
+		<module>kubernetes</module>
 	</modules>
 
 	<scm>