Add new unit test to make sure config overrides are workign as expected

Signed-off-by: Marvin Froeder <[email protected]>

Author: velo

sqrl-tools/sqrl-config/src/main/java/com/datasqrl/config/SqrlConfigCommons.java

@@ -408,14 +408,6 @@ public static SqrlConfig fromFiles(ErrorCollector errors, String jsonSchemaResou
     NodeCombiner combiner = new OverrideCombiner();
     CombinedConfiguration combinedConfiguration = new CombinedConfiguration(combiner);
 
-    try {
-        URL url = SqrlConfigCommons.class.getResource("/default-package.json");
-		JSONConfiguration config = configs.fileBased(JSONConfiguration.class,   url);
-		combinedConfiguration.addConfiguration(config);
-    } catch (ConfigurationException e) {
-        throw errors.withConfig("Error loading default configuration").handle(e);
-    }
-
     for (int i = files.size()-1; i >= 0; i--) { //iterate backwards so last file takes precedence
       Path file = files.get(i);
       ErrorCollector localErrors = errors.withConfig(file);
@@ -428,6 +420,14 @@ public static SqrlConfig fromFiles(ErrorCollector errors, String jsonSchemaResou
       }
     }
 
+    try {
+        URL url = SqrlConfigCommons.class.getResource("/default-package.json");
+		JSONConfiguration config = configs.fileBased(JSONConfiguration.class,   url);
+		combinedConfiguration.addConfiguration(config);
+    } catch (ConfigurationException e) {
+        throw errors.withConfig("Error loading default configuration").handle(e);
+    }
+
     String configFilename;
     if (files.isEmpty()){
         configFilename = "default-package.json";

sqrl-tools/sqrl-config/src/test/java/com/datasqrl/config/SqrlConfigCommonsTest.java

@@ -31,6 +31,7 @@ void givenNoPaths_whenCreatingConfig_thenReturnDefaults() {
         assertThat(underTest.getEngines().getEngineConfig("flink")).isPresent();
         assertThat(underTest.getScriptConfig().getGraphql()).isEmpty();
         assertThat(underTest.getScriptConfig().getMainScript()).isEmpty();
+        assertThat(underTest.getPackageConfig().getName()).isEqualTo("datasqrl.profile.default");
     }
 
     @Test
@@ -41,12 +42,13 @@ void givenSinglePath_whenCreatingConfig_thenOverrideDefaults() {
         assertThat(underTest.getVersion()).isEqualTo(1);
 
         //test-package.json overrides enabled engines ONLY
-        assertThat(underTest.getEnabledEngines()).contains("flink");
+        assertThat(underTest.getEnabledEngines()).contains("test");
 
         assertThat(underTest.getTestConfig()).isPresent();
         assertThat(underTest.getEngines().getEngineConfig("flink")).isPresent();
         assertThat(underTest.getScriptConfig().getGraphql()).isEmpty();
         assertThat(underTest.getScriptConfig().getMainScript()).isEmpty();
+        assertThat(underTest.getPackageConfig().getName()).isEqualTo("datasqrl.test");
     }
 
 }

sqrl-tools/sqrl-config/src/test/resources/config/test-package.json

@@ -1,4 +1,7 @@
 {
   "version": "1",
-  "enabled-engines": ["flink"]
+  "enabled-engines": ["test"],
+  "package": {
+    "name": "datasqrl.test"
+  }
 }