For report destination and new selenium version.

djangofan · Aug 18, 2013 · 7976235 · 7976235
1 parent 794e6a5
commit 7976235
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/.project b/.project
@@ -17,7 +17,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1375484924042</id>
+			<id>1376843160438</id>
 			<name></name>
 			<type>26</type>
 			<matcher>

diff --git a/google/build.gradle b/google/build.gradle
@@ -61,25 +61,25 @@ task runAllTestsInFirefox(type: Test) {
     maxParallelForks = 2
     systemProperties['browser'] = 'firefox'
     include '**/GoogleTest*.class'
-    testReportDir = file("${reporting.baseDir}/GoogleTestFF")
-    testResultsDir = file("${buildDir}/test-results/GoogleTestFF")
+    reports.junitXml.destination = "$buildDir/test-results/GoogleTestFF"  
+    reports.html.destination = "$buildDir/test-results/GoogleTestFF"
 }
 
 task runAllTestsInIE(type: Test) {
     maxParallelForks = 1
     systemProperties['browser'] = 'ie'
     include '**/GoogleTest*.class'
-    testReportDir = file("${reporting.baseDir}/GoogleTestIE")
-    testResultsDir = file("${buildDir}/test-results/GoogleTestIE")
+    reports.junitXml.destination = "$buildDir/test-results/GoogleTestIE"  
+    reports.html.destination = "$buildDir/test-results/GoogleTestIE"
 }
 
 task runAllTestsInChrome(type: Test) {
     maxParallelForks = 2
     systemProperties['browser'] = 'chrome'
 	systemProperties['webdriver.chrome.driver'] = 'chromedriver.exe'
     include '**/GoogleTest*.class'
-    testReportDir = file("${reporting.baseDir}/GoogleTestC")
-    testResultsDir = file("${buildDir}/test-results/GoogleTestC")
+    reports.junitXml.destination = "$buildDir/test-results/GoogleTestCH"  
+    reports.html.destination = "$buildDir/test-results/GoogleTestCH"
 }
 
 task runParameterizedExample(type: Test) {

diff --git a/node1Config.json b/node1Config.json
@@ -7,7 +7,7 @@
             "javascriptEnabled": true,
             "takesScreenshot": false,
             "firefox_profile": "",
-            "browser-version": "22.0",  
+            "browser-version": "23.0.1",  
             "platform": "WINDOWS",                     
             "maxInstances": 5
         },

diff --git a/node1ConfigLinux.json b/node1ConfigLinux.json
@@ -7,7 +7,7 @@
             "javascriptEnabled": true,
             "takesScreenshot": false,
             "firefox_profile": "",
-            "browser-version": "22.0",  
+            "browser-version": "23.0.1",  
             "platform": "LINUX",                     
             "maxInstances": 5
         },

diff --git a/parallelwebdriver/build.gradle b/parallelwebdriver/build.gradle
@@ -38,8 +38,8 @@ tasks.withType(Test) {
 task runParallelTestsInFirefox(type: Test) {
     description = 'Runs all JUnit test classes in parallel threads.'
     include '**/TestHandleCache*.class'
-    testReportDir = file("${reporting.baseDir}/ParallelTestsFF")
-    testResultsDir = file("${buildDir}/test-results/ParallelTestsFF")
+    reports.junitXml.destination = "$buildDir/test-results/ParallelTestsFF"  
+    reports.html.destination = "$buildDir/test-results/ParallelTestsFF"
 
     // System properties passed to tests
     systemProperties['browserType'] = 'firefox'
@@ -55,8 +55,8 @@ task runFrameTestInIE(type: Test) {
     description = 'Runs a test of handling iframes.'
     maxParallelForks = 1
     include '**/TestFrames.class'
-    testReportDir = file("${reporting.baseDir}/FrameTestIE")
-    testResultsDir = file("${buildDir}/test-results/FrameTestIE")
+    reports.junitXml.destination = "$buildDir/test-results/ParallelTestsIE"  
+    reports.html.destination = "$buildDir/test-results/ParallelTestsIE"
 
     // System properties passed to tests
     systemProperties['browserType'] = 'ie'

diff --git a/startWebDriverGridHub.bat b/startWebDriverGridHub.bat
@@ -12,7 +12,7 @@ ECHO *
 ECHO *********************************************
 ECHO.
 
-SET JAR=selenium-server-standalone-2.33.0.jar
+SET JAR=selenium-server-standalone-2.35.0.jar
 SET "WGET=C:\Program Files (x86)\GnuWin32\bin\wget.exe"
 
 IF NOT DEFINED JAVA_HOME (

diff --git a/startWebDriverGridHub.sh b/startWebDriverGridHub.sh
@@ -12,7 +12,7 @@ echo "*"
 echo "*********************************************"
 echo ""
 
-jarfile="selenium-server-standalone-2.33.0.jar"
+jarfile="selenium-server-standalone-2.35.0.jar"
 wgetbin="/usr/bin/wget"
 
 if [ -z "${JAVA_HOME+xxx}" ]; then

diff --git a/startWebDriverGridNode.bat b/startWebDriverGridNode.bat
@@ -6,10 +6,10 @@ TITLE %TITLETEXT%
 :: Proxy for Fiddler or for BrowserMob
 SET PROXY=false
 
-SET CHROMEDRIVERZIP=chromedriver_win_26.0.1383.0.zip
+SET CHROMEDRIVERZIP=chromedriver_win32_2.2.zip
 SET CHROMEDRIVER=chromedriver.exe
-SET JAR=selenium-server-standalone-2.33.0.jar
-SET IEDRIVERZIP=IEDriverServer_Win32_2.33.0.zip
+SET JAR=selenium-server-standalone-2.35.0.jar
+SET IEDRIVERZIP=IEDriverServer_Win32_2.35.1.zip
 SET IEDRIVER=IEDriverServer.exe
 SET "WGET=C:\Program Files (x86)\GnuWin32\bin\wget.exe"
 

diff --git a/startWebDriverGridNode.sh b/startWebDriverGridNode.sh
@@ -12,9 +12,9 @@ echo "*"
 echo "*********************************************"
 echo ""
 
-chromedriverzip=chromedriver_linux64_2.1.zip
+chromedriverzip=chromedriver_linux64_2.2.zip
 chromedriverbin=chromedriver
-jarfile="selenium-server-standalone-2.33.0.jar"
+jarfile="selenium-server-standalone-2.35.0.jar"
 wgetbin="/usr/bin/wget"
 
 if [ -z "${JAVA_HOME+xxx}" ]; then