Add feature property mapping

config.properties

@@ -0,0 +1,35 @@
+maqs.global.timeout = 500
+maqs.global.waitTime = 100
+maqs.global.log = true
+maqs.global.log.level = VERBOSE
+maqs.global.log.type = TXT
+maqs.global.log.path = ./target/logs
+
+maqs.selenium.screenshot.softAssertOnFailure = true
+maqs.selenium.screenshot.format = jpeg
+maqs.selenium.pageSource.OnFailure = true
+
+
+maqs.selenium.browser = HEADLESSCHROME
+maqs.selenium.browser.waitTime = 1000
+maqs.selenium.browser.timeout = 20000
+maqs.selenium.browser.size = 1920x1080
+
+
+maqs.selenium.browser.remote = Chrome
+maqs.selenium.browser.remote.name = Chrome
+maqs.selenium.browser.remote.url = http://ondemand.saucelabs.com:80/wd/hub
+maqs.selenium.browser.remote.platform = OS X 10.11
+maqs.selenium.website.url = http://magenicautomation.azurewebsites.net/
+
+maqs.selenium.remote.capabilities
+
+maqs.webservices.url = http://localhost:8080/maqs/services/
+
+maqs.appium.url = http://localhost:4723/wd/hub
+
+maqs.database.url = jdbc:mysql://localhost:3306/maqs
+
+maqs.cucumber.features = features
+
+maqs.accessibility.url = http://localhost:8080/maqs/accessibility/

maqs-appium/src/main/java/com/cognizantsoftvision/maqs/appium/AppiumConfig.java

@@ -8,10 +8,12 @@
 import com.cognizantsoftvision.maqs.appium.exceptions.AppiumConfigException;
 import com.cognizantsoftvision.maqs.utilities.helper.Config;
 import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection;
+import com.cognizantsoftvision.maqs.utilities.helper.ConfigValidation;
 import com.cognizantsoftvision.maqs.utilities.helper.StringProcessor;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,7 +33,19 @@ public class AppiumConfig {
   private static final ConfigSection APPIUM_CAPS_SECTION = ConfigSection.APPIUM_CAPS_MAQS;
 
   private AppiumConfig() {
+  }
+
+  static {
+    checkConfig();
+  }
 
+  /**
+   * Ensure required fields are in the config
+   */
+  private static void checkConfig() {
+    var validator = new ConfigValidation();
+    validator.setRequiredOneOfFields(Arrays.asList("App", "BrowserName"));
+    Config.validate(ConfigSection.APPIUM_MAQS, validator);
   }
 
   /**

maqs-database/src/main/java/com/cognizantsoftvision/maqs/database/DatabaseConfig.java

@@ -10,17 +10,32 @@
 import com.cognizantsoftvision.maqs.database.providers.SQLiteProvider;
 import com.cognizantsoftvision.maqs.utilities.helper.Config;
 import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection;
+import com.cognizantsoftvision.maqs.utilities.helper.ConfigValidation;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The type Database config.
+ * The Database Config class.
  */
 public class DatabaseConfig {
 
   private DatabaseConfig() {
   }
 
+  static {
+    checkConfig();
+  }
+
+  /**
+   * Ensure required fields are in the config
+   */
+  private static void checkConfig() {
+    var validator = new ConfigValidation();
+    validator.setRequiredOneOfFields(Arrays.asList("DataBaseConnectionString", "DataBaseProviderType"));
+    Config.validate(ConfigSection.DATABASE_MAQS, validator);
+  }
+
   /**
    * The Database section.
    */

maqs-database/src/test/java/com/cognizantsoftvision/maqs/database/DatabaseConfigUnitTest.java

@@ -4,7 +4,6 @@
 
 package com.cognizantsoftvision.maqs.database;
 
-import com.cognizantsoftvision.maqs.base.BaseGenericTest;
 import com.cognizantsoftvision.maqs.database.constants.DataProviderType;
 import com.cognizantsoftvision.maqs.database.providers.IDataSourceProvider;
 import com.cognizantsoftvision.maqs.database.providers.SQLProvider;

maqs-database/src/test/java/com/cognizantsoftvision/maqs/database/DatabaseDriverUnitTest.java

@@ -4,7 +4,6 @@
 
 package com.cognizantsoftvision.maqs.database;
 
-import com.cognizantsoftvision.maqs.base.BaseGenericTest;
 import com.cognizantsoftvision.maqs.database.entities.StatesEntity;
 import com.cognizantsoftvision.maqs.utilities.helper.TestCategories;
 import java.util.List;

maqs-database/src/test/java/com/cognizantsoftvision/maqs/database/DatabaseTestObjectUnitTest.java

@@ -4,7 +4,6 @@
 
 package com.cognizantsoftvision.maqs.database;
 
-import com.cognizantsoftvision.maqs.base.BaseGenericTest;
 import com.cognizantsoftvision.maqs.utilities.helper.TestCategories;
 import org.testng.Assert;
 import org.testng.annotations.Test;

maqs-playwright/src/main/java/com/cognizantsoftvision/maqs/playwright/PlaywrightConfig.java

@@ -6,7 +6,9 @@
 
 import com.cognizantsoftvision.maqs.utilities.helper.Config;
 import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection;
+import com.cognizantsoftvision.maqs.utilities.helper.ConfigValidation;
 import java.awt.Dimension;
+import java.util.Collections;
 
 /**
  * The Playwright Config class.
@@ -19,6 +21,19 @@ public class PlaywrightConfig {
   protected PlaywrightConfig() {
   }
 
+  static {
+    checkConfig();
+  }
+
+  /**
+   * Ensure required fields are in the config.
+   */
+  private static void checkConfig() {
+    var validator = new ConfigValidation();
+    validator.setRequiredOneOfFields(Collections.singletonList("Timeout"));
+    Config.validate(ConfigSection.PLAYWRIGHT_MAQS, validator);
+  }
+
   /**
    * Get the website base url.
    * @return The website base url

maqs-selenium/src/main/java/com/cognizantsoftvision/maqs/selenium/SeleniumConfig.java

@@ -8,8 +8,10 @@
 import com.cognizantsoftvision.maqs.selenium.constants.RemoteBrowserType;
 import com.cognizantsoftvision.maqs.utilities.helper.Config;
 import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection;
+import com.cognizantsoftvision.maqs.utilities.helper.ConfigValidation;
 import com.cognizantsoftvision.maqs.utilities.helper.StringProcessor;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,7 +24,19 @@ public final class SeleniumConfig {
    * Private constructor.
    */
   private SeleniumConfig() {
+  }
+
+  static {
+    checkConfig();
+  }
 
+  /**
+   * Ensure required fields are in the config.
+   */
+  private static void checkConfig() {
+    ConfigValidation validator = new ConfigValidation();
+    validator.setRequiredFields(Collections.singletonList("BrowserTimeout"));
+    Config.validate(ConfigSection.SELENIUM_MAQS, validator);
   }
 
   /**

maqs-utilities/appsettings.json

@@ -0,0 +1,53 @@
+{
+  "GlobalMaqs": {
+    "WaitTime": "100",
+    "Timeout": "1000",
+    "Log": "OnFail",
+    "LogLevel": "INFORMATION",
+    "LogType": "TXT",
+    "Grog": "WillFailWithoutRunSettingOverride",
+    "SectionOverrideCore": "WillFailWithoutRunSettingOverride",
+    "SimpleOverride": "simple",
+    "Override": "base",
+    "Override2": "base2",
+    "ConfigJsonEnvRunOverride": "JSON",
+    "ConfigJsonEnvRun": "JSON",
+    "ConfigJsonEnv": "JSON",
+    "ConfigJson": "JSON",
+    "JsonOnly": "JSON",
+    "low": { "JSON": "lowerJson" },
+    "compound:key": "compound",
+    "compound:key:lower": "compoundEvenLower"
+  },
+  "RemoteSeleniumCapsMaqs": {
+    "MultiLevel": {
+      "MoreLevels": {
+        "seven": "7",
+        "lowest": {
+          "nine": "9"
+        }
+      }
+    },
+    "MuliLevel:MoreLevels": {
+      "four": "4",
+      "five": "5"
+    },
+    "MuliLevel:MoreLevels:six": "6"
+  },
+  "TopTest": {
+    "MidTest": [
+      {
+        "LowerTest": "A",
+        "Lower": {
+          "LowestTest": "Lowest"
+        }
+      },
+      {
+        "LowerTest": "B"
+      }
+    ],
+    "AnotherMid": {
+      "Lowerest": "AnotherLow"
+    }
+  }
+}

maqs-utilities/config.properties

@@ -0,0 +1,35 @@
+maqs.global.timeout = 500
+maqs.global.waitTime = 100
+maqs.global.log = true
+maqs.global.log.level = VERBOSE
+maqs.global.log.type = TXT
+maqs.global.log.path = ./target/logs
+
+maqs.selenium.screenshot.softAssertOnFailure = true
+maqs.selenium.screenshot.format = jpeg
+maqs.selenium.pageSource.OnFailure = true
+
+
+maqs.selenium.browser = HEADLESSCHROME
+maqs.selenium.browser.waitTime = 1000
+maqs.selenium.browser.timeout = 20000
+maqs.selenium.browser.size = 1920x1080
+
+
+maqs.selenium.browser.remote = Chrome
+maqs.selenium.browser.remote.name = Chrome
+maqs.selenium.browser.remote.url = http://ondemand.saucelabs.com:80/wd/hub
+maqs.selenium.browser.remote.platform = OS X 10.11
+maqs.selenium.website.url = https://cognizantopensource.github.io/maqs-dotnet-templates/Static/Automation/
+
+maqs.selenium.remote.capabilities
+
+maqs.webservices.url = http://localhost:8080/maqs/services/
+
+maqs.appium.url = http://localhost:4723/wd/hub
+
+maqs.database.url = jdbc:mysql://localhost:3306/maqs
+
+maqs.cucumber.features = features
+
+maqs.accessibility.url = http://localhost:8080/maqs/accessibility/

maqs-utilities/config.yml

@@ -0,0 +1,34 @@
+
+GlobalMaqs:
+  timeout: 500
+  waitTime: 100
+  log: true
+  level: "VERBOSE"
+  type: "TXT"
+  path: "./target/logs"
+
+SeleniumMaqs:
+  softAssertOnFailure: true
+  format: "jpeg"
+  OnFailure: true
+  browser: "HEADLESSCHROME"
+  waitTime: 1000
+  browser.timeout: 20000
+  browser.size: 1920x1080
+  remote: "Chrome"
+  remote.name: "Chrome"
+  remote.url: "http://ondemand.saucelabs.com:80/wd/hub"
+  remote.platform: "OS X 10.11"
+  website.url: "https://cognizantopensource.github.io/maqs-dotnet-templates/Static/Automation/"
+
+#maqs.selenium.remote.capabilities
+
+WebServiceMaqs:
+  url: http://localhost:8080/maqs/services/
+
+
+AppiumCapsMaqs:
+  url: http://localhost:4723/wd/hub
+
+DatabaseMaqs:
+  url: jdbc:mysql://localhost:3306/maqs

maqs-utilities/src/main/java/com/cognizantsoftvision/maqs/utilities/helper/Config.java

@@ -4,11 +4,10 @@
 
 package com.cognizantsoftvision.maqs.utilities.helper;
 
-import com.cognizantsoftvision.maqs.utilities.helper.exceptions.FrameworkConfigurationException;
+import com.cognizantsoftvision.maqs.utilities.helper.exceptions.MaqsConfigException;
 import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
+
 import org.apache.commons.configuration2.XMLConfiguration;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
 import org.apache.commons.configuration2.builder.fluent.Configurations;
@@ -61,11 +60,56 @@ private Config() {
       overrideConfig = new XMLConfiguration();
       overrideConfig.setSynchronizer(new ReadWriteSynchronizer());
     } catch (ConfigurationException exception) {
-      throw new FrameworkConfigurationException(StringProcessor.safeFormatter(
+      throw new MaqsConfigException(StringProcessor.safeFormatter(
           "Exception creating the xml configuration object from the file : %s", exception));
     }
   }
 
+  /**
+   * Validates the app config section by ensuring required values are present.
+   * @param configSection The config section to be validated
+   * @param configValidation A list of strings containing the required field names
+   */
+  public static void validate(ConfigSection configSection, ConfigValidation configValidation) {
+    // Don't run the validation if the user has decided to skip the validation
+    if (getGeneralValue("SkipConfigValidation").equals("Yes")) {
+      return;
+    }
+
+    if (configValidation == null) {
+      throw new MaqsConfigException("The value passed in for configValidation (required fields in a config) is null");
+    }
+
+    var configSectionPassed = getSection(configSection);
+    List<String> exceptions = new ArrayList<>();
+
+    // Check if we have any required fields
+    if (configValidation.getRequiredFields() != null && !configValidation.getRequiredFields().isEmpty()) {
+      for(var requiredField : configValidation.getRequiredFields()) {
+        if (!configSectionPassed.containsKey(requiredField)) {
+          exceptions.add("Key missing: " + requiredField);
+        }
+      }
+    }
+
+    // Check if we have any one of required fields
+    if (configValidation.getRequiredOneOfFields() != null && configValidation.getRequiredOneOfFields().size() > 0) {
+        // && !configValidation.getRequiredOneOfFields().Any(x -> configSectionPassed.containsKey(x))){
+      // We have one of fields and didn't find any of them
+      exceptions.add("Need at least one of the following keys: " + String.join(", ", configValidation.getRequiredOneOfFields()));
+    }
+
+    if (!exceptions.isEmpty()) {
+      StringBuilder message = new StringBuilder();
+      for (var exception : exceptions) {
+        message.append(exception);
+      }
+
+      message.append("*This check can be skipped by setting the 'SkipConfigValidation' configuration value to 'Yes'.");
+      throw new MaqsConfigException(message.toString());
+    }
+  }
+
   /**
    * Gets a section from the configuration.
    *
@@ -276,4 +320,8 @@ public static boolean doesKeyExist(String key, String section) {
   public static boolean doesGeneralKeyExist(String key) {
     return doesKeyExist(key, DEFAULT_MAQS_SECTION);
   }
+
+  private static String getConfigFile() {
+    PropertyManager.get("maqs.config.location", "config.xml");
+  }
 }