Merge branch 'feature/property-resolver' into testerra2

Author: Mike Reiche

core/src/main/java/eu/tsystems/mms/tic/testframework/common/PropertyManager.java

@@ -66,8 +66,8 @@ public final class PropertyManager {
                     (propertyResolvers != null?propertyResolvers.stream():Stream.empty()),
                     Stream.of(
                             threadLocalPropertyResolver,
-                            filePropertyResolver,
-                            systemPropertyResolver
+                            systemPropertyResolver,
+                            filePropertyResolver
                     )
             );
         });

integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/common/PropertyManagerTest.java

@@ -433,6 +433,19 @@ public void testT51_ClearAllProperties() {
         Assert.assertNull(PropertyManager.getProperty("thread.property"));
     }
 
+    @Test
+    public void test_priority() {
+
+        String property = "test";
+        String expected = "huhu";
+
+        Assert.assertEquals(PropertyManager.getProperty(property), expected);
+
+        System.setProperty("test", "haha");
+
+        Assert.assertNotEquals(PropertyManager.getProperty(property), expected);
+    }
+
     @Test
     public void test_resolvePriorityProperty() {
         final String propertyKey = "any-property";