-
Notifications
You must be signed in to change notification settings - Fork 235
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Updated DriverFactoryHelper to support "HTTPS" via configurable parameter "SELENIUM_PROTOCOL". - Added Tests to complement previous commit concerning protocol capability. - Bump chromedriver-version to 2.42 to work with the latest stable chrome
- Loading branch information
1 parent
248163c
commit 614302b
Showing
5 changed files
with
98 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
client/src/test/java/com/paypal/selion/configuration/ProtocolConfigTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /*-------------------------------------------------------------------------------------------------------------------*\ | ||
| | Copyright (C) 2018 PayPal | | ||
| | | | ||
| | Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance | | ||
| | with the License. | | ||
| | | | ||
| | You may obtain a copy of the License at | | ||
| | | | ||
| | http://www.apache.org/licenses/LICENSE-2.0 | | ||
| | | | ||
| | Unless required by applicable law or agreed to in writing, software distributed under the License is distributed | | ||
| | on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for | | ||
| | the specific language governing permissions and limitations under the License. | | ||
| \*-------------------------------------------------------------------------------------------------------------------*/ | ||
|
|
||
| package com.paypal.selion.configuration; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.testng.Assert; | ||
| import org.testng.ITestContext; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import com.paypal.selion.configuration.Config.ConfigProperty; | ||
|
|
||
| // Test requires execution with SeLionProtocolConfig-Suite.xml | ||
| public class ProtocolConfigTest { | ||
|
|
||
| @Test(groups = { "protocol" }, priority = 1) | ||
| public void testGetProtocalProperty() { | ||
| Assert.assertNotNull(Config.getConfigProperty(ConfigProperty.SELENIUM_PROTOCOL), "Get config property should not be null"); | ||
| } | ||
|
|
||
| @Test(groups = { "protocol" }, priority = 2) | ||
| public void testInitProtocalConfig(ITestContext context) { | ||
| Config.initConfig(context); | ||
| Assert.assertNotNull(Config.getConfigProperty(ConfigProperty.SELENIUM_PROTOCOL), "Config should not be null"); | ||
| } | ||
|
|
||
| @Test(groups = { "protocol" }, priority = 3) | ||
| public void testInitProtocalConfigNegative() { | ||
| Assert.assertFalse(Config.getConfigProperty(ConfigProperty.SELENIUM_PROTOCOL).contentEquals("http"), | ||
| "Negative-TC: PROTOCOL should match the suite-file. (https) is set in suite file -> not (http)"); | ||
|
|
||
| } | ||
|
|
||
| @Test(groups = { "protocol" }, priority = 4) | ||
| public void testInitProtocalConfigChangeOption() { | ||
| Assert.assertEquals(Config.getConfigProperty(ConfigProperty.SELENIUM_PROTOCOL), "https", | ||
| "PROTOCOL should be (https)"); | ||
| Map<ConfigProperty, String> initValues = new HashMap<ConfigProperty, String>(); | ||
| initValues.put(ConfigProperty.SELENIUM_PROTOCOL, "http"); | ||
| Config.initConfig(initValues); | ||
| Assert.assertEquals(Config.getConfigProperty(ConfigProperty.SELENIUM_PROTOCOL), "http", | ||
| "PROTOCOL should be (http)"); | ||
| } | ||
|
|
||
|
|
||
| } |
23 changes: 23 additions & 0 deletions
23
client/src/test/resources/suites/SeLionProtocolConfig-Suite.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> | ||
| <suite thread-count="100" verbose="1" name="SeLion Protocol Config Test Suite" skipfailedinvocationcounts="false" junit="false" | ||
| parallel="false" data-provider-thread-count="50" annotations="JDK"> | ||
|
|
||
| <parameter name="protocol" value="https" /> | ||
|
|
||
| <listeners> | ||
| <listener class-name="com.paypal.selion.reports.runtime.DebugListener" /> | ||
| </listeners> | ||
|
|
||
|
|
||
| <test verbose="2" name="Test1" annotations="JDK"> | ||
| <groups> | ||
| <run> | ||
| <include name="protocol" /> | ||
| </run> | ||
| </groups> | ||
| <classes> | ||
| <class name="com.paypal.selion.configuration.ProtocolConfigTest" /> | ||
| </classes> | ||
| </test> | ||
| </suite> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters