updating local project

Author: Manish Goyal

config_default.yml

@@ -2,11 +2,11 @@
 # To localy override values, create config.yml file next to this one.
 # You can also override these values by specyfing a system property
 
-browser: FF # acceptable values: FF, CHROME, GHOST, ANDROID, CHROMEMOBILEMERCURY, HTMLUNIT
+browser: CHROME # acceptable values: FF, CHROME, GHOST, ANDROID, CHROMEMOBILEMERCURY, HTMLUNIT
 wikiName: mediawiki119 # default testing wiki
 env: prod # acceptable values: prod, preview, sandbox-number dev-name
-credentialsPath: /selenium-config/config.xml # Path to your config.xml file
-captchaPath: /selenium-config/captcha.txt # Path to your captcha.txt file
+credentialsPath: config.xml # Path to your config.xml file
+captchaPath: captcha.txt # Path to your captcha.txt file
 qs: null
 disableFlash: true
 jsErrorsEnabled: false

pom.xml

@@ -139,6 +139,11 @@
 			<artifactId>htmlunit</artifactId>
 			<version>2.18</version>
 		</dependency>
+		 <dependency>
+        <groupId>org.littleshoot</groupId>
+        <artifactId>littleproxy</artifactId>
+        <version>1.1.0-beta1</version>
+    	</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -160,7 +165,7 @@
 					<suiteXmlFiles>
 						<suiteXmlFile>${testSuite}</suiteXmlFile>
 					</suiteXmlFiles>
-					<argLine>-Xms800m -Xmx800m -XX:MaxPermSize=1024m</argLine>
+					<argLine>-Xms800m -Xmx800m -XX:MaxPermSize=1024m -Djava.awt.headless=true</argLine>
 				</configuration>
 			</plugin>
 			<plugin>

src/test/java/com/wikia/webdriver/common/core/XMLReader.java

@@ -5,8 +5,13 @@
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 public class XMLReader {
 
@@ -21,14 +26,45 @@ private XMLReader() {
    */
   public static String getValue(File file, String key) {
 
-    try {
+    /*try {
       XMLConfiguration xml = new XMLConfiguration(file);
       return xml.getString(key);
     } catch (ConfigurationException e) {
       PageObjectLogging.log("Error while reading XML config", e, false);
 
       return e.getMessage();
+    }*/
+
+    Properties prop = new Properties();
+    InputStream input = null;
+
+    try {
+
+      input = new FileInputStream(file);
+
+      // load a properties file
+      prop.load(input);
+
+      // get the property value and print it out
+      System.out.println("value for " + key + " = " + prop.getProperty(key));
+      if(StringUtils.isEmpty(prop.getProperty(key)) ) {
+        System.out.println("Can not find value for " + key);
+      }
+      return prop.getProperty(key);
+
+    } catch (IOException ex) {
+      ex.printStackTrace();
+    } finally {
+      if (input != null) {
+        try {
+          input.close();
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
     }
+    System.out.println("Can not find value for " + key);
+    return "";
   }
 
   public static String getValue(String key) {

src/test/java/com/wikia/webdriver/testcases/interactivemapstests/PinMapTests.java

@@ -82,8 +82,9 @@ public void PinMapTests_003_VerifyPinCreationErrors() {
   @RelatedIssue(issueID = " ",
       comment = "This maps test should not fail")
   @DontRun(env = {"dev", "sandbox", "preview"})
-  @Test(groups = {"PinMapTests_004", "PinMapTests", "InteractiveMaps"},
-      dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  @Test(groups = {"PinMapTests_004", "PinMapTests", "InteractiveMaps"}
+  //,dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  )
   @Execute(asUser = User.USER)
   public void PinMapTests_004_VerifyPopUpAfterClickPin() {
     WikiBasePageObject base = new WikiBasePageObject(driver);
@@ -97,8 +98,9 @@ public void PinMapTests_004_VerifyPopUpAfterClickPin() {
   }
 
   @DontRun(env = {"dev", "sandbox", "preview"})
-  @Test(enabled = false, groups = {"PinMapTests_005", "PinMapTests", "InteractiveMaps"},
-      dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  @Test(enabled = false, groups = {"PinMapTests_005", "PinMapTests", "InteractiveMaps"}
+  //,dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  )
   @Execute(asUser = User.USER)
   public void PinMapTests_005_VerifyDeletePin() {
     WikiBasePageObject base = new WikiBasePageObject(driver);

src/test/java/com/wikia/webdriver/testsuites/testSuite.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Wikia test suite" configfailurepolicy="continue">
+<suite name="Wikia test suite" configfailurepolicy="continue" allow-return-values="true">
     <listeners>
         <listener class-name="com.wikia.webdriver.common.testnglisteners.InvokeMethodAdapter"/>
     </listeners>