Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Demo: Fixing Demo and adding a dedicated continuous integration loop.

git-svn-id: http://svn.openqa.org/svn/selenium-grid/trunk@294 22590ab4-ef3b-0410-9bef-a9f5a1089f47
  • Loading branch information...
commit baf8700c1144bab779dde95827e229d7d6383fce 1 parent dff92ad
ph7 authored
View
435 Selenium Grid.iws
@@ -40,8 +40,11 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/build/common-build.xml" afterPath="$PROJECT_DIR$/lib/build/common-build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/java/src/com/thoughtworks/selenium/grid/examples/java/BookTest.java" afterPath="$PROJECT_DIR$/examples/java/src/com/thoughtworks/selenium/grid/examples/java/BookTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Selenium Grid.iws" afterPath="$PROJECT_DIR$/Selenium Grid.iws" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/AmazonCommentTestBase.java" afterPath="$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/AmazonCommentTestBase.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.properties" afterPath="$PROJECT_DIR$/project.properties" />
</list>
<list name="Failed commit: Default" comment="Renamed to com.thoughtworks.selenium.grid" />
<list name="Failed commit: Failed commit: Default" comment="Renamed to com.thoughtworks.selenium.grid" />
@@ -109,19 +112,19 @@
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.setAcceptsArbitraryObjectsAsValue$PageTest.setAcceptsArbitraryObjectsAsValue.es" NAME="PageTest.setAcceptsArbitraryObjectsAsValue" MODIFIED="1189727071140" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$com.thoughtworks.selenium.grid.remotecontrol$com.thoughtworks.selenium.grid.remotecontrol.es" NAME="com.thoughtworks.selenium.grid.remotecontrol" MODIFIED="1201935517638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$EnvironmentTest$EnvironmentTest.es" NAME="EnvironmentTest" MODIFIED="1209565181911" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself$EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself.es" NAME="EnvironmentConfigurationTest.anEnvironmentInstanceIsEqualToItself" MODIFIED="1190156189543" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.configuration.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$ServletParameterAdapterTest$ServletParameterAdapterTest.es" NAME="ServletParameterAdapterTest" MODIFIED="1202022522221" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$EnvironmentTest$EnvironmentTest.es" NAME="EnvironmentTest" MODIFIED="1209565181911" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$com.thoughtworks.selenium.grid.remotecontrol$com.thoughtworks.selenium.grid.remotecontrol.es" NAME="com.thoughtworks.selenium.grid.remotecontrol" MODIFIED="1201935517638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$RemoteControlProxyTest$RemoteControlProxyTest.es" NAME="RemoteControlProxyTest" MODIFIED="1202008928391" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.remotecontrol.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$ServletParameterAdapterTest$ServletParameterAdapterTest.es" NAME="ServletParameterAdapterTest" MODIFIED="1202022522221" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
+ </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HubServletTest$HubServletTest.es" NAME="HubServletTest" MODIFIED="1202009256141" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.*</FILTER>
</SUITE>
@@ -197,25 +200,25 @@
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$RegistrationRequestTest.postToHubUsingURLProvidedInConstructor$RegistrationRequestTest.postToHubUsingURLProvidedInConstructor.es" NAME="RegistrationRequestTest.postToHubUsingURLProvidedInConstructor" MODIFIED="1214270073663" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.remotecontrol.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$MartinOnAmazonSeleniumTest.testAmazonOnFirefox$MartinOnAmazonSeleniumTest.testAmazonOnFirefox.es" NAME="MartinOnAmazonSeleniumTest.testAmazonOnFirefox" MODIFIED="1195772044439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.demo.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$IOHelperTest$IOHelperTest.es" NAME="IOHelperTest" MODIFIED="1190156015024" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$MartinOnAmazonSeleniumTest.testAmazonOnFirefox$MartinOnAmazonSeleniumTest.testAmazonOnFirefox.es" NAME="MartinOnAmazonSeleniumTest.testAmazonOnFirefox" MODIFIED="1195772044439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.demo.*</FILTER>
+ </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HttpClientTest.buildPostMethodSetTimeoutsAsParameter$HttpClientTest.buildPostMethodSetTimeoutsAsParameter.es" NAME="HttpClientTest.buildPostMethodSetTimeoutsAsParameter" MODIFIED="1203757360853" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
<SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound$ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound.es" NAME="ResourceLocatorTest.throwAnIllegalStateExceptionWhenResourceCannotBeFound" MODIFIED="1190156618965" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.configuration.*</FILTER>
</SUITE>
- <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$com.thoughtworks.selenium.grid.hub$com.thoughtworks.selenium.grid.hub.es" NAME="com.thoughtworks.selenium.grid.hub" MODIFIED="1209565599875" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
- <SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.templateIsTheOneProvidedInTheConstructor$PageTest.templateIsTheOneProvidedInTheConstructor.es" NAME="PageTest.templateIsTheOneProvidedInTheConstructor" MODIFIED="1189726413204" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
- <FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
- </SUITE>
<SUITE FILE_PATH="/Users/ph7/Library/Caches/IntelliJIDEA70/coverage/Selenium Grid$HttpClientTest$HttpClientTest.es" NAME="HttpClientTest" MODIFIED="1203758832799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.*</FILTER>
</SUITE>
+ <SUITE FILE_PATH="\Local\Users\Philippe\.IntelliJIdea70\system\coverage\Selenium Grid$PageTest.templateIsTheOneProvidedInTheConstructor$PageTest.templateIsTheOneProvidedInTheConstructor.es" NAME="PageTest.templateIsTheOneProvidedInTheConstructor" MODIFIED="1189726413204" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
+ <FILTER>com.thoughtworks.selenium.grid.hub.management.console.mvc.*</FILTER>
+ </SUITE>
+ <SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$com.thoughtworks.selenium.grid.hub$com.thoughtworks.selenium.grid.hub.es" NAME="com.thoughtworks.selenium.grid.hub" MODIFIED="1209565599875" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" />
<SUITE FILE_PATH="/Local/Users/Philippe/.IntelliJIdea70/system/coverage/Selenium Grid$NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID$NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID.es" NAME="NewBrowserSessionCommandTest.parseSessionIdReturnsTheSessionIdWhenSessionIdIsAGUID" MODIFIED="1197830937264" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider">
<FILTER>com.thoughtworks.selenium.grid.hub.remotecontrol.commands.*</FILTER>
</SUITE>
@@ -300,46 +303,46 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="37" selection-start="352" selection-end="352" vertical-scroll-proportion="-2.3142858">
+ <state line="193" column="0" selection-start="7760" selection-end="7760" vertical-scroll-proportion="0.7156398">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/core/build.xml">
+ <file leaf-file-name="BookTest.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/examples/java/src/com/thoughtworks/selenium/grid/examples/java/BookTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="464" selection-end="464" vertical-scroll-proportion="0.22325581">
+ <state line="43" column="5" selection-start="1827" selection-end="1827" vertical-scroll-proportion="0.66210043">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/demo/build.xml">
+ <file leaf-file-name="AmazonCommentTestBase.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/AmazonCommentTestBase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="37" selection-start="476" selection-end="476" vertical-scroll-proportion="0.01904762">
+ <state line="19" column="28" selection-start="873" selection-end="873" vertical-scroll-proportion="0.5205479">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/hub/build.xml">
+ <file leaf-file-name="WebTestForASingleBrowser.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/WebTestForASingleBrowser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="37" selection-start="419" selection-end="419" vertical-scroll-proportion="0.18571429">
+ <state line="33" column="34" selection-start="1483" selection-end="1483" vertical-scroll-proportion="0.5525114">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ThreadSafeSeleniumSessionStorage.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
+ <file leaf-file-name="project.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/project.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.65015477">
+ <state line="2" column="9" selection-start="53" selection-end="53" vertical-scroll-proportion="0.052980132">
<folding />
</state>
</provider>
@@ -348,7 +351,7 @@
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/examples/java/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.01904762">
+ <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.028436018">
<folding />
</state>
</provider>
@@ -357,7 +360,7 @@
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/regression-tests/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.033333335">
+ <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.049763035">
<folding />
</state>
</provider>
@@ -366,7 +369,7 @@
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/remote-control/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.01904762">
+ <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.028436018">
<folding />
</state>
</provider>
@@ -375,7 +378,7 @@
<file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tools/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="0" selection-start="1162" selection-end="1162" vertical-scroll-proportion="0.62857145">
+ <state line="33" column="0" selection-start="1162" selection-end="1162" vertical-scroll-proportion="0.93838865">
<folding />
</state>
</provider>
@@ -384,7 +387,7 @@
<file leaf-file-name="common-build.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/build/common-build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="187" column="15" selection-start="6711" selection-end="6711" vertical-scroll-proportion="0.6">
+ <state line="187" column="15" selection-start="6711" selection-end="6711" vertical-scroll-proportion="0.049763035">
<folding />
</state>
</provider>
@@ -502,9 +505,41 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="All" />
+ <option name="myItemId" value="Java Example" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com/thoughtworks" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com/thoughtworks/selenium" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com/thoughtworks/selenium/grid" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com/thoughtworks/selenium/grid/examples" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/examples/java/src/com/thoughtworks/selenium/grid/examples/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -512,14 +547,80 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="All" />
+ <option name="myItemId" value="Demo" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Selenium Grid" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Demo" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Selenium Grid" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Demo" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk" />
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java/com" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java/com/thoughtworks" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java/com/thoughtworks/selenium" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java/com/thoughtworks/selenium/grid" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/ph7/Projects/Selenium Grid/trunk/demo/src/main/java/com/thoughtworks/selenium/grid/demo" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Selenium Grid" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="All" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -533,7 +634,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="true" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" Scope="false" Favorites="false" ProjectPane="false" />
+ <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -579,26 +680,40 @@
<RUBY_DOC NAME="DEFAULTS" VALUE="true" />
<RUBY_DOC NAME="NUMBER" VALUE="0" />
</component>
- <component name="RunManager" selected="JUnit.SelfRegisteringRemoteControlTest">
- <tempConfiguration default="false" name="SelfRegisteringRemoteControlTest" type="JUnit" factoryName="JUnit" enabled="true" merge="false">
- <pattern value="com.thoughtworks.selenium.grid.remotecontrol.*" />
- <module name="Remote Control" />
+ <component name="RunManager" selected="TestNG.WebTestForASingleBrowser">
+ <tempConfiguration default="false" name="WebTestForASingleBrowser" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+ <module name="Demo" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" value="com.thoughtworks.selenium.grid.remotecontrol" />
- <option name="MAIN_CLASS_NAME" value="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlTest" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" value="com.thoughtworks.selenium.grid.demo" />
+ <option name="MAIN_CLASS_NAME" value="com.thoughtworks.selenium.grid.demo.WebTestForASingleBrowser" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <option name="PROPERTIES_FILE" />
<envs />
+ <properties>
+ <property name="firstEnvironment" value="*chrome" />
+ <property name="seleniumPort" value="4444" />
+ <property name="webSite" value="http://amazon.com" />
+ <property name="browser" value="*chrome" />
+ <property name="secondEnvironmnet" value="*chrome" />
+ <property name="thirdEnvironment" value="*chrome" />
+ <property name="seleniumHost" value="localhost" />
+ </properties>
+ <listeners />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
<method>
@@ -610,61 +725,6 @@
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby test">
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="MODULE_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="true" merge="false">
- <module name="All" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <envs />
- <method>
- <option name="Make" value="true" />
- </method>
- </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -702,21 +762,24 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
<option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method>
- <option name="Make" value="true" />
- </method>
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
<MavenSettings>
@@ -760,6 +823,36 @@
</option>
</MavenSettings>
</configuration>
+ <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby test">
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="MODULE_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby script">
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
@@ -769,6 +862,28 @@
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
</configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="true" merge="false">
+ <module name="All" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" value="" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <envs />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration default="false" name="http_client_test" type="RubyRunConfigurationType" factoryName="Ruby test">
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$PROJECT_DIR$/hub/src/test/unit/com/thoughtworks/selenium/grid/hub/http_client_test.rb" />
@@ -1085,19 +1200,19 @@
</method>
</configuration>
<list size="13">
- <item index="0" class="java.lang.String" itemvalue="JUnit.SelfRegisteringRemoteControlTest" />
- <item index="1" class="java.lang.String" itemvalue="RubyOnRails.http_client_test" />
- <item index="2" class="java.lang.String" itemvalue="RubyOnRails.HttpCommandParserTest" />
- <item index="3" class="java.lang.String" itemvalue="RubyOnRails.http_command_parser_test" />
- <item index="4" class="java.lang.String" itemvalue="Application.SelfRegisteringRemoteControlLauncher" />
- <item index="5" class="java.lang.String" itemvalue="Application.TestDriver" />
- <item index="6" class="java.lang.String" itemvalue="JUnit.PageTest" />
- <item index="7" class="java.lang.String" itemvalue="JUnit.TemplateTest" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.ControllerTest" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.com.thoughtworks.selenium.grid.configuration in Core" />
- <item index="10" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.amazonOnFirefox" />
- <item index="11" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.secondTest" />
- <item index="12" class="java.lang.String" itemvalue="TestNG.WebTestInvolvingMultiEnvironments" />
+ <item index="0" class="java.lang.String" itemvalue="RubyOnRails.http_client_test" />
+ <item index="1" class="java.lang.String" itemvalue="RubyOnRails.HttpCommandParserTest" />
+ <item index="2" class="java.lang.String" itemvalue="RubyOnRails.http_command_parser_test" />
+ <item index="3" class="java.lang.String" itemvalue="Application.SelfRegisteringRemoteControlLauncher" />
+ <item index="4" class="java.lang.String" itemvalue="Application.TestDriver" />
+ <item index="5" class="java.lang.String" itemvalue="JUnit.PageTest" />
+ <item index="6" class="java.lang.String" itemvalue="JUnit.TemplateTest" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.ControllerTest" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.com.thoughtworks.selenium.grid.configuration in Core" />
+ <item index="9" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.amazonOnFirefox" />
+ <item index="10" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser.secondTest" />
+ <item index="11" class="java.lang.String" itemvalue="TestNG.WebTestInvolvingMultiEnvironments" />
+ <item index="12" class="java.lang.String" itemvalue="TestNG.WebTestForASingleBrowser" />
</list>
<configuration default="true" type="RUBY_RUN_CONFIGURATION_TYPE" factoryName="Ruby test">
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
@@ -1210,7 +1325,7 @@
<window_info id="TeamCity" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32994923" order="4" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32436472" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28410688" order="2" x="25" y="383" width="1379" height="169" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28270042" order="2" x="25" y="383" width="1379" height="169" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945612" order="2" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39657632" order="3" />
@@ -1357,114 +1472,114 @@
</buildFile>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/lib/build/pmd-ruleset.xml">
+ <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequestTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="0" selection-start="759" selection-end="759" vertical-scroll-proportion="0.0">
+ <state line="38" column="0" selection-start="305" selection-end="1427" vertical-scroll-proportion="0.7058824">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="273" selection-end="273" vertical-scroll-proportion="0.20433436">
+ <state line="19" column="20" selection-start="517" selection-end="517" vertical-scroll-proportion="0.31013617">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/SelfRegisteringRemoteControlTest.java">
+ <entry file="file://$PROJECT_DIR$/core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="36" selection-start="332" selection-end="332" vertical-scroll-proportion="0.20433436">
+ <state line="12" column="37" selection-start="464" selection-end="464" vertical-scroll-proportion="0.22325581">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/demo/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="94" selection-start="333" selection-end="333" vertical-scroll-proportion="0.18575852">
+ <state line="11" column="37" selection-start="476" selection-end="476" vertical-scroll-proportion="0.01904762">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequestTest.java">
+ <entry file="file://$PROJECT_DIR$/hub/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="305" selection-end="1427" vertical-scroll-proportion="0.7058824">
+ <state line="10" column="37" selection-start="419" selection-end="419" vertical-scroll-proportion="0.18571429">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/src/main/com/thoughtworks/selenium/grid/ClasspathHelper.java">
+ <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="20" selection-start="517" selection-end="517" vertical-scroll-proportion="0.31013617">
+ <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.9589041">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/build.xml">
+ <entry file="file://$PROJECT_DIR$/examples/java/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="464" selection-end="464" vertical-scroll-proportion="0.22325581">
+ <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.028436018">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/demo/build.xml">
+ <entry file="file://$PROJECT_DIR$/regression-tests/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="37" selection-start="476" selection-end="476" vertical-scroll-proportion="0.01904762">
+ <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.049763035">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/hub/build.xml">
+ <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="37" selection-start="419" selection-end="419" vertical-scroll-proportion="0.18571429">
+ <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.028436018">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tools/src/main/com/thoughtworks/selenium/grid/tools/ThreadSafeSeleniumSessionStorage.java">
+ <entry file="file://$PROJECT_DIR$/tools/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.65015477">
+ <state line="33" column="0" selection-start="1162" selection-end="1162" vertical-scroll-proportion="0.93838865">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/java/build.xml">
+ <entry file="file://$PROJECT_DIR$/lib/build/common-build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="37" selection-start="527" selection-end="527" vertical-scroll-proportion="0.01904762">
+ <state line="187" column="15" selection-start="6711" selection-end="6711" vertical-scroll-proportion="0.049763035">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/regression-tests/build.xml">
+ <entry file="file://$PROJECT_DIR$/project.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="532" selection-end="532" vertical-scroll-proportion="0.033333335">
+ <state line="2" column="9" selection-start="53" selection-end="53" vertical-scroll-proportion="0.052980132">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/remote-control/build.xml">
+ <entry file="file://$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/WebTestForASingleBrowser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="37" selection-start="519" selection-end="519" vertical-scroll-proportion="0.01904762">
+ <state line="33" column="34" selection-start="1483" selection-end="1483" vertical-scroll-proportion="0.5525114">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tools/build.xml">
+ <entry file="file://$PROJECT_DIR$/demo/src/main/java/com/thoughtworks/selenium/grid/demo/AmazonCommentTestBase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="0" selection-start="1162" selection-end="1162" vertical-scroll-proportion="0.62857145">
+ <state line="19" column="28" selection-start="873" selection-end="873" vertical-scroll-proportion="0.5205479">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/build/common-build.xml">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="187" column="15" selection-start="6711" selection-end="6711" vertical-scroll-proportion="0.6">
+ <state line="193" column="0" selection-start="7760" selection-end="7760" vertical-scroll-proportion="0.7156398">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/examples/java/src/com/thoughtworks/selenium/grid/examples/java/BookTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="37" selection-start="352" selection-end="352" vertical-scroll-proportion="-2.3142858">
+ <state line="43" column="5" selection-start="1827" selection-end="1827" vertical-scroll-proportion="0.66210043">
<folding />
</state>
</provider>
View
28 build.xml
@@ -46,7 +46,9 @@
</target>
- <target name="ci" depends="dist" description="Continuous Integration Loop"/>
+ <target name="ci:core" depends="dist" description="Continuous Integration : Build and Unit Tests"/>
+ <target name="ci:demo" depends="dist, automated-demo" description="Continuous Integration : Demo"/>
+ <target name="ci:functionals" depends="dist, automated-demo" description="Continuous Integration : Functional Tests"/>
<target name="clean" description="clean all generated artifacts">
<build-subprojects target="clean"/>
@@ -70,7 +72,7 @@
<fileset dir="${basedir}/remote-control/target/dist/lib"/>
<fileset dir="${basedir}/remote-control/lib"/>
<fileset dir="${basedir}/tools/target/dist/lib"/>
- <fileset dir="${basedir}/vendor" includes="ruby/**/*.rb"/>
+ <fileset dir="${basedir}/lib" includes="ruby/**/*.rb"/>
<fileset dir="${basedir}/demo/target/dist/lib"/>
<fileset file="${basedir}/lib/testng.policy"/>
<fileset file="${basedir}/vendor/testng-5.7-jdk15.jar"/>
@@ -174,4 +176,26 @@
</copy>
</target>
+ <target name="automated-demo" description="Fully Automated Demo (for continuous integration)">
+ <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+ <arg value="all:restart"/>
+ </exec>
+ <ant dir="${dist}/selenium-grid-${version}" target="run-demo-in-sequence" />
+ <ant dir="${dist}/selenium-grid-${version}" target="run-demo-in-parallel" />
+ <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+ <arg value="all:stop"/>
+ </exec>
+ </target>
+
+ <target name="automated-java-example">
+ <!--<exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">-->
+ <!--<arg value="all:restart"/>-->
+ <!--</exec>-->
+ <ant dir="${dist}/selenium-grid-${version}/examples/java" target="run" />
+ <ant dir="${dist}/selenium-grid-${version}/examples/java" target="run-in-sequence" />
+ <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+ <arg value="all:stop"/>
+ </exec>
+ </target>
+
</project>
View
2  demo/src/main/java/com/thoughtworks/selenium/grid/demo/AmazonCommentTestBase.java
@@ -15,7 +15,7 @@ protected void runAmazonScenario() throws Exception {
session().click("navGoButtonPanel");
session().waitForPageToLoad("60000");
assertTrue(session().getLocation().startsWith("http://www.amazon.com/s/ref="));
- session().click("//img[@alt='Refactoring: Improving the Design of Existing Code (The Addison-Wesley Object Technology Series)']");
+ session().click("link=Refactoring: Improving the Design of Existing Code (The Addison-Wesley Object Technology Series)");
session().waitForPageToLoad("60000");
assertEquals("1", session().getValue("name=quantity"));
assertTrue(session().isTextPresent("excellent"));
View
2  examples/java/src/com/thoughtworks/selenium/grid/examples/java/BookTest.java
@@ -34,7 +34,7 @@ protected void checkBook(String title, String thumbnail, String keywords, String
session().click("navGoButtonPanel");
session().waitForPageToLoad(TIMEOUT);
assertTrue(session().isTextPresent(title));
- session().click("//img[@alt=\"" + thumbnail + "\"]");
+ session().click("link=" + thumbnail);
session().waitForPageToLoad(TIMEOUT);
assertEquals("1", session().getValue("name=quantity"));
assertTrue(session().isTextPresent("ISBN-10: " + isbn));
View
1  project.properties
@@ -1,3 +1,4 @@
version=1.0.1
selenium.version=1.0-SNAPSHOT
+rake=rake
Please sign in to comment.
Something went wrong with that request. Please try again.