fixes tests

Author: otaviojava

artemis-configuration/src/main/java/org/jnosql/artemis/configuration/DefaultConfigurationReader.java

@@ -70,15 +70,12 @@ public <T> ConfigurationSettingsUnit read(ConfigurationUnit annotation, Class<T>
 
         String name = configuration.getName();
         String description = configuration.getDescription();
-        Map<String, Object> settings = new HashMap<>(ofNullable(configuration.getSettings()).orElse(emptyMap()));
-        settings.putAll(System.getenv());
-        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
+        Map<String, Object> settings = getSettings(configuration);
         Class<?> provider = getProvider(configurationClass, configuration);
 
         return new DefaultConfigurationSettingsUnit(name, description, provider, Settings.of(settings));
     }
 
-
     @Override
     public <T> ConfigurationSettingsUnit read(ConfigurationUnit annotation) {
 
@@ -89,7 +86,7 @@ public <T> ConfigurationSettingsUnit read(ConfigurationUnit annotation) {
 
         String name = configuration.getName();
         String description = configuration.getDescription();
-        Map<String, Object> settings = new HashMap<>(ofNullable(configuration.getSettings()).orElse(emptyMap()));
+        Map<String, Object> settings = getSettings(configuration);
 
         return new DefaultConfigurationSettingsUnit(name, description, null, Settings.of(settings));
     }
@@ -107,6 +104,13 @@ private List<Configurable> getConfigurations(ConfigurationUnit annotation) {
         return select.get().read(stream, annotation);
     }
 
+    private Map<String, Object> getSettings(Configurable configuration) {
+        Map<String, Object> settings = new HashMap<>(ofNullable(configuration.getSettings()).orElse(emptyMap()));
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k, v) -> settings.put(k.toString(), v));
+        return settings;
+    }
+
     private String getExtension(ConfigurationUnit annotation) {
         String[] fileName = annotation.fileName().split("\\.");
         if (fileName.length != 2) {

artemis-configuration/src/test/java/org/jnosql/artemis/configuration/DefaultJSONConfigurationreaderTest.java

@@ -58,6 +58,8 @@ public void shouldReadAnnotationDefaultFile() {
         settings.put("key","value");
         settings.put("key2","value2");
         settings.put("key3","value3");
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
 
         assertEquals("name-2", unit.getName().get());
         assertEquals("that is the description", unit.getDescription().get());
@@ -75,7 +77,8 @@ public void shouldReadConfiguration() {
         Map<String, Object> settings = new HashMap<>();
         settings.put("key","value");
         settings.put("key2","value2");
-
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
         assertEquals("name", unit.getName().get());
         assertEquals("that is the description", unit.getDescription().get());
         assertEquals(Settings.of(settings), unit.getSettings());
@@ -93,6 +96,8 @@ public void shouldReadDefaultFile() {
         settings.put("key","value");
         settings.put("key2","value2");
         settings.put("key3","value3");
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
 
         assertEquals("name-2", unit.getName().get());
         assertEquals("that is the description", unit.getDescription().get());

artemis-configuration/src/test/java/org/jnosql/artemis/configuration/DefaultXMLConfigurationReaderTest.java

@@ -48,6 +48,8 @@ public void shouldReadDefaultNameXML() {
         Map<String, Object> settings = new HashMap<>();
         settings.put("key","value");
         settings.put("key2","value2");
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
 
         assertEquals("name", unit.getName().get());
         assertEquals("that is the description", unit.getDescription().get());

artemis-configuration/src/test/java/org/jnosql/artemis/configuration/DefaultYAMLConfigurationReaderTest.java

@@ -48,6 +48,8 @@ public void shouldReadDefaultNameYAML() {
         Map<String, Object> settings = new HashMap<>();
         settings.put("key","value");
         settings.put("key2","value2");
+        settings.putAll(System.getenv());
+        System.getProperties().forEach((k,v) -> settings.put(k.toString(), v));
 
         assertEquals("name", unit.getName().get());
         assertEquals("that is the description", unit.getDescription().get());