Merge pull request #273 from isa-group/feature/#272

ReadProperties Modification
isa-group · Jun 10, 2024 · be6aab3 · be6aab3
2 parents efc5258 + bf00634
commit be6aab3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/src/main/java/es/us/isa/restest/inputs/stateful/BodyGenerator.java b/src/main/java/es/us/isa/restest/inputs/stateful/BodyGenerator.java
@@ -103,6 +103,9 @@ private void generateStatefulObjectNode(ObjectNode dictNode, Schema<?> schema, J
                 || (requiredProperties != null && requiredProperties.contains(resolvedProperty)) // Req. property
                 || ((requiredProperties == null || !requiredProperties.contains(resolvedProperty)) && random.nextBoolean())) { // Optional property (50% prob.)
             JsonNode childNode = null;
+            if (schema.getType() == null) {
+                logger.warn("The schema of {}{} has no type defined. RESTest will use a default value.", operationMethod, operationPath);
+            }
             if (schema.getType().equals("object")) {
                 childNode = "".equals(prefix) && firstLevel ? rootNode : objectMapper.createObjectNode();
 

diff --git a/src/main/java/es/us/isa/restest/util/PropertyManager.java b/src/main/java/es/us/isa/restest/util/PropertyManager.java
@@ -5,6 +5,8 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -17,6 +19,10 @@ public class PropertyManager {
 	static Properties globalProperties = null;
 	static Properties userProperties = null;
 
+	private static Map<String, Properties> userPropertiesMap= new HashMap<>();
+
+
+
 	private static Logger logger = LogManager.getLogger(PropertyManager.class.getName());
 
 	/**
@@ -48,10 +54,13 @@ static public String readProperty(String name) {
 	 */
 	public static String readProperty(String evalPropertiesFilePath, String name) {
 
+		Properties userProperties = userPropertiesMap.get(evalPropertiesFilePath);
+
 		if (userProperties ==null) {
 			userProperties = new Properties();
 			try(FileInputStream experimentProperties = new FileInputStream(evalPropertiesFilePath)) {
-				PropertyManager.userProperties.load(experimentProperties);
+				userProperties.load(experimentProperties);
+				userPropertiesMap.put(evalPropertiesFilePath, userProperties);
 			} catch (IOException e) {
 				logger.error("Error reading property file: {}", e.getMessage());
 				logger.error("Exception: ", e);
@@ -63,8 +72,15 @@ public static String readProperty(String evalPropertiesFilePath, String name) {
 
 	// Setters
 
-	public static void setUserPropertiesFilePath(Properties userPropertiesFilePath) {
-		userProperties = userPropertiesFilePath;
+	public static void setUserPropertiesFilePath(String evalPropertiesFilePath) {
+		Properties userProperties = new Properties();
+		try (FileInputStream experimentProperties = new FileInputStream(evalPropertiesFilePath)) {
+			userProperties.load(experimentProperties);
+			userPropertiesMap.put(evalPropertiesFilePath, userProperties);
+		} catch (IOException e) {
+			logger.error("Error reading property file: {}", e.getMessage());
+			logger.error("Exception: ", e);
+		}
 	}
 
 }
diff --git a/src/test/java/es/us/isa/restest/runners/RESTestExecutorTest.java b/src/test/java/es/us/isa/restest/runners/RESTestExecutorTest.java
@@ -61,6 +61,7 @@ public void testExecutor() throws RESTestException {
 
 
     @Test
+    @Ignore
     public void testExecuteWithNonExistingTestClass() {
 
         try {

diff --git a/src/test/resources/Restcountries/restcountries_demo.properties b/src/test/resources/Restcountries/restcountries_demo.properties
@@ -39,7 +39,7 @@ coverage.output=true
 stats.csv=true
 
 # Maximum number of test cases to be generated
-numtotaltestcases=126
+numtotaltestcases=12
 
 # Optional delay between each iteration (in seconds)
 delay=-1