Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
12af242
Package change for Base module
Jan 28, 2022
f85546c
Package change for Selenium module
Jan 28, 2022
d995ec8
Package change for Utilities module
Jan 28, 2022
5c59ecb
Package change for Cucumber module
Jan 28, 2022
0959edb
Package change for Database module
Jan 28, 2022
5951640
Package change for Database module
Jan 28, 2022
8c4a62b
Package change for Appium module
Jan 28, 2022
30d6f29
Package change for WebService modules
Jan 28, 2022
c2fbfae
Module rename - Base
Jan 28, 2022
289bc51
Module rename - Utilities
Jan 28, 2022
80e2e34
Module rename - Appium
Jan 28, 2022
9bb6b19
Module rename - Selenium
Jan 28, 2022
db3b2ba
Module rename - Database
Jan 28, 2022
4a1a552
Module rename - Cucumber
Jan 28, 2022
572182c
Module rename - Accessibility
Jan 28, 2022
bd3cd50
Module rename - WebServices
Jan 28, 2022
ca5beac
Module rename - Jacoco
Jan 28, 2022
ced5980
Switched over POM module references
Jan 28, 2022
a6ae7cc
Copyright year and company changes
Jan 28, 2022
fae9fbe
Supporting config file changes
Jan 28, 2022
2609f5d
updated checkstyle docs
jredingcsv Jan 31, 2022
736f5bf
got rid of outdated import statement
jredingcsv Jan 31, 2022
51bcf1f
corrected order of import statements
jredingcsv Jan 31, 2022
97ed3cf
corrected order of import statements
jredingcsv Jan 31, 2022
8147472
updated base unit test output
jredingcsv Jan 31, 2022
14ea845
updated failing accessibility unit tests file path
jredingcsv Jan 31, 2022
2f865d5
updated imports on HtmlReporter.java
jredingcsv Jan 31, 2022
dc8cf46
updated database issues
jredingcsv Jan 31, 2022
283b360
updated configs MagenicMaqs tag to GlobalMaqs
jredingcsv Jan 31, 2022
4fde5aa
updated configs
jredingcsv Feb 1, 2022
be09656
CodeOwners modified for new repo
Feb 1, 2022
670b31a
docker components moved over from maqs-dotnet
Feb 1, 2022
ffdd54d
disabled Mail and Mongo set up until needed
Feb 1, 2022
13fbe4c
changed the connection string
Feb 1, 2022
3a89f69
unit test fixes
Feb 10, 2022
b571e19
temporarily disabled webservices to complete builds
Feb 18, 2022
235a656
made the version number static for new release
Feb 18, 2022
fda0d5e
starting to plan property paths
Feb 18, 2022
f743b7a
More properties added
Feb 18, 2022
7b904ad
Merge branch 'main' into feature/PropertyMapping
jredingcsv May 6, 2022
a4beb6c
added other config types
jredingcsv May 10, 2022
af7ba98
Merge branch 'main' into feature/PropertyMapping
jredingcsv Sep 12, 2022
cfb77f0
add config check
jredingcsv Sep 28, 2022
3990fb9
Merge branch 'main' into feature/PropertyMapping
jredingcsv Nov 2, 2022
b4d7816
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Feb 9, 2023
8eae3c4
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Feb 9, 2023
bae0fd2
delete FrameworkConfigurationException.java
jonreding2010 Feb 9, 2023
df09074
fixes for appium test resolution
jonreding2010 Feb 9, 2023
e769724
checkstyle fixes
jonreding2010 Feb 9, 2023
d8ed395
checkstyle fixes
jonreding2010 Feb 9, 2023
1d20092
checkstyle fixes
jonreding2010 Feb 9, 2023
6c8fc1b
checkstyle fixes
jonreding2010 Feb 9, 2023
6a866f7
unit test fixes
jonreding2010 Feb 9, 2023
66cfd5e
switch unit test back to what it was
jonreding2010 Feb 9, 2023
8a530a4
small updates to config.java
jonreding2010 Feb 11, 2023
7c0c564
checkstyle update
jonreding2010 Feb 11, 2023
687373a
made config unit tests not run in parallel
jonreding2010 Feb 14, 2023
dd67ee9
more edits to get some files working
jonreding2010 Feb 14, 2023
cf64eb7
more edits to get some unit test files working
jonreding2010 Feb 14, 2023
05e2999
more edits to get some unit test files working
jonreding2010 Feb 14, 2023
7bbcf86
checkstyle fixes
jonreding2010 Feb 14, 2023
ba3a4e0
checkstyle fixes
jonreding2010 Feb 14, 2023
dc282c5
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Feb 18, 2023
8538a4c
small changes
jonreding2010 Feb 23, 2023
af21de8
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Feb 23, 2023
edd9acf
Merge branch 'feature/PropertyMapping' of https://github.com/OpenMAQS…
jonreding2010 Feb 23, 2023
e024cea
checkstyle fixes
jonreding2010 Feb 23, 2023
2693ca4
checkstyle fixes
jonreding2010 Feb 23, 2023
7e38fb1
updated Config Validation comments
jonreding2010 Feb 27, 2023
a3e6673
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Mar 18, 2023
c6019b6
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Oct 31, 2023
ff1609b
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Oct 31, 2023
ec54787
Merge branch 'main' into feature/PropertyMapping
jonreding2010 Jun 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion openmaqs-appium/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@
<PlatformName>Android</PlatformName>
<PlatformVersion>11.0</PlatformVersion>
<DeviceName>Android GoogleAPI Emulator</DeviceName>
<BrowserName>Chrome</BrowserName>

<WebSiteBase>https://openmaqs.github.io/TestingSite/Automation/</WebSiteBase>

<!-- Appium or grid connection -->
<MobileHubUrl>http://ondemand.saucelabs.com:80/wd/hub</MobileHubUrl>
<MobileHubUrl>https://ondemand.saucelabs.com:80/wd/hub</MobileHubUrl>

<!-- Command time-out in milliseconds -->
<MobileCommandTimeout>122000</MobileCommandTimeout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
import io.github.openmaqs.appium.exceptions.AppiumConfigException;
import io.github.openmaqs.utilities.helper.Config;
import io.github.openmaqs.utilities.helper.ConfigSection;
import io.github.openmaqs.utilities.helper.ConfigValidation;
import io.github.openmaqs.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;

Expand All @@ -31,7 +33,22 @@ public class AppiumConfig {
private static final ConfigSection APPIUM_CAPS_SECTION = ConfigSection.APPIUM_CAPS_MAQS;

private AppiumConfig() {
}

/*
Loads when class is loaded.
*/
static {
checkConfig();
}

/**
* Ensure required fields are in the config.
*/
private static void checkConfig() {
ConfigValidation validator = new ConfigValidation();
validator.setRequiredOneOfFields(Arrays.asList("App", "BrowserName"));
Config.validate(ConfigSection.APPIUM_MAQS, validator);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,32 @@
import io.github.openmaqs.database.providers.SQLiteProvider;
import io.github.openmaqs.utilities.helper.Config;
import io.github.openmaqs.utilities.helper.ConfigSection;
import io.github.openmaqs.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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

import io.github.openmaqs.utilities.helper.Config;
import io.github.openmaqs.utilities.helper.ConfigSection;
import io.github.openmaqs.utilities.helper.ConfigValidation;
import java.awt.Dimension;
import java.util.Collections;

/**
* The Playwright Config class.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
import io.github.openmaqs.selenium.constants.RemoteBrowserType;
import io.github.openmaqs.utilities.helper.Config;
import io.github.openmaqs.utilities.helper.ConfigSection;
import io.github.openmaqs.utilities.helper.ConfigValidation;
import io.github.openmaqs.utilities.helper.StringProcessor;
import java.time.Duration;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -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);
}

/**
Expand Down
53 changes: 53 additions & 0 deletions openmaqs-utilities/appsettings.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
32 changes: 32 additions & 0 deletions openmaqs-utilities/config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
;
[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/"

[WebServiceMaqs]
url=http://localhost:8080/maqs/services/


[AppiumCapsMaqs]
url=http://localhost:4723/wd/hub

[DatabaseMaqs]
url=jdbc:mysql://localhost:3306/maqs
30 changes: 30 additions & 0 deletions openmaqs-utilities/config.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
GlobalMaqs.WaitTime=100
GlobalMaqs.Timeout=1000
GlobalMaqs.Log=OnFail
GlobalMaqs.LogLevel=INFORMATION
GlobalMaqs.LogType=TXT
GlobalMaqs.Grog=WillFailWithoutRunSettingOverride
GlobalMaqs.SectionOverrideCore=WillFailWithoutRunSettingOverride
GlobalMaqs.SimpleOverride=simple
GlobalMaqs.Override=base
GlobalMaqs.Override2=base2
GlobalMaqs.ConfigJsonEnvRunOverride=JSON
GlobalMaqs.ConfigJsonEnvRun=JSON
GlobalMaqs.ConfigJsonEnv=JSON
GlobalMaqs.ConfigJson=JSON
GlobalMaqs.JsonOnly=JSON
GlobalMaqs.low.JSON=lowerJson
GlobalMaqs.compound:key=compound
GlobalMaqs.compound:key:lower=compoundEvenLower
SeleniumMaqs.TestKey=testValueTwo
SeleniumMaqs.Browser=Internet Explorer
SeleniumMaqs.HubAddress=132.15.12
RemoteSeleniumCapsMaqs.MultiLevel.MoreLevels.seven=7
RemoteSeleniumCapsMaqs.MultiLevel.MoreLevels.lowest.nine=9
RemoteSeleniumCapsMaqs.MuliLevel.MoreLevels.four=4
RemoteSeleniumCapsMaqs.MuliLevel.MoreLevels.five=5
RemoteSeleniumCapsMaqs.MuliLevel.MoreLevels:six=6
TopTest.MidTest.0.LowerTest=A
TopTest.MidTest.0.Lower.LowestTest=Lowest
TopTest.MidTest.1.LowerTest=B
TopTest.AnotherMid.Lowerest=AnotherLow
40 changes: 40 additions & 0 deletions openmaqs-utilities/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
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
Loading