Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/nirvdrum/selenium-grid
Browse files Browse the repository at this point in the history
  • Loading branch information
@AutomatedTester
AutomatedTester committed Nov 21, 2010
2 parents 3ba1a38 + b238253 commit 8c302b7
Show file tree
Hide file tree
Showing 20 changed files with 502 additions and 180 deletions.
77 changes: 45 additions & 32 deletions Selenium Grid.ipr
View file
Expand Up @@ -53,6 +53,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
Expand All @@ -62,6 +63,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
<option name="INDENT_SIZE" value="4" />
Expand All @@ -71,6 +73,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
Expand Down Expand Up @@ -187,7 +190,7 @@
<inspection_tool class="ClassReferencesSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ClassUnconnectedToPackage" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ClassWithMultipleLoggers" enabled="true" level="WARNING" enabled_by_default="true">
<option name="loggerClassName" value="java.util.logging.Logger" />
<option name="loggerNamesString" value="java.util.logging.Logger,org.slf4j.Logger,org.apache.commons.logging.Log,org.apache.log4j.Logger" />
</inspection_tool>
<inspection_tool class="ClassWithTooManyDependencies" enabled="true" level="WARNING" enabled_by_default="true">
<option name="limit" value="10" />
Expand Down Expand Up @@ -282,14 +285,18 @@
</inspection_tool>
<inspection_tool class="MethodOnlyUsedFromInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreMethodsAccessedFromAnonymousClass" value="false" />
<option name="ignoreStaticMethodsFromNonStaticInnerClass" value="false" />
<option name="onlyReportStaticMethods" value="false" />
</inspection_tool>
<inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesPackageLocalMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesStaticMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodWithMultipleLoops" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MissingDeprecatedAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreObjectMethods" value="true" />
</inspection_tool>
<inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_requireAnnotationsFirst" value="true" />
</inspection_tool>
Expand Down Expand Up @@ -325,7 +332,7 @@
<inspection_tool class="NonThreadSafeLazyInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="NoopMethodInAbstractClass" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreLibraryArguments" value="false" />
<option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
</inspection_tool>
<inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreInMatchingInstanceof" value="false" />
Expand Down Expand Up @@ -439,7 +446,9 @@
<option name="m_ignoreStaticMethodCalls" value="false" />
<option name="m_ignoreStaticAccessFromStaticContext" value="false" />
</inspection_tool>
<inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreSwitchBranches" value="false" />
</inspection_tool>
<inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnnecessaryEnumModifier" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnnecessaryFinalOnParameter" enabled="true" level="WARNING" enabled_by_default="true">
Expand Down Expand Up @@ -638,6 +647,9 @@
<module fileurl="file://$PROJECT_DIR$/infrastructure/webserver/WebServer.iml" filepath="$PROJECT_DIR$/infrastructure/webserver/WebServer.iml" />
</modules>
</component>
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/target/classes" />
</component>
Expand Down Expand Up @@ -681,9 +693,10 @@
</component>
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="libraryTable">
<library name="Selenium Java Client Driver">
<library name="Commons">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand All @@ -697,19 +710,15 @@
<JAVADOC />
<SOURCES />
</library>
<library name="Unit Testing">
<library name="Hub Resources">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/jmock-junit4-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/objenesis-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jbehave-1.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jmock-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jmock-legacy-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/mockito-all-1.8.4.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/cglib-nodep-2.1_3.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/proxytoys-0.2.1.jar!/" />
<root url="file://$PROJECT_DIR$/hub/src/main/java" />
<root url="file://$PROJECT_DIR$/hub/src/test/unit/java" />
<root url="file://$PROJECT_DIR$/hub/src/main/java" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/hub/src/main/java" recursive="false" />
</library>
<library name="Jetty">
<CLASSES>
Expand All @@ -720,55 +729,59 @@
<JAVADOC />
<SOURCES />
</library>
<library name="Selenium Remote Control">
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Web">
<library name="Selenium Java Client Driver">
<CLASSES>
<root url="jar://$PROJECT_DIR$/hub/lib/freemarker-2.3.16.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Yaml">
<library name="Selenium Remote Control">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/jyaml-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Hub Resources">
<library name="TestNG">
<CLASSES>
<root url="file://$PROJECT_DIR$/hub/src/main/java" />
<root url="file://$PROJECT_DIR$/hub/src/test/unit/java" />
<root url="file://$PROJECT_DIR$/hub/src/main/java" />
<root url="jar://$PROJECT_DIR$/vendor/testng-5.7-jdk15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$PROJECT_DIR$/hub/src/main/java" recursive="false" />
</library>
<library name="Commons">
<library name="Unit Testing">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/jmock-junit4-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/objenesis-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jbehave-1.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jmock-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jmock-legacy-2.2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/mockito-all-1.8.4.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/cglib-nodep-2.1_3.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/proxytoys-0.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="TestNG">
<library name="Web">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/testng-5.7-jdk15.jar!/" />
<root url="jar://$PROJECT_DIR$/hub/lib/freemarker-2.3.16.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="JUnit">
<library name="Yaml">
<CLASSES>
<root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
<root url="jar://$PROJECT_DIR$/vendor/jyaml-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down
1 change: 1 addition & 0 deletions agent/Agent.iml
View file
Expand Up @@ -14,6 +14,7 @@
<orderEntry type="module" module-name="WebServer" />
<orderEntry type="library" name="Commons" level="project" />
<orderEntry type="module" module-name="Core" />
<orderEntry type="module" module-name="Remote Control" scope="TEST" />
</component>
<component name="RSpecModuleSettingsStorage">
<RSPEC_MODULE_SETTINGS_STORAGE_ID NAME="RSPEC_SUPPORT_TYPE" VALUE="NONE" />
Expand Down
7 changes: 5 additions & 2 deletions agent/src/test/functional/java/com/thoughtworks/selenium/grid/agent/JMVMLauncherTest.java
View file
Expand Up @@ -9,6 +9,10 @@
public class JMVMLauncherTest {
public static final int SECOND = 1000;

@Test
public void nullTest() {}

/*
@Test
public void canLaunchAnAgentAndStopIt() throws IOException, InterruptedException {
final Classpath classpath;
Expand Down Expand Up @@ -41,6 +45,5 @@ public void canCaptureProcessOutut() throws IOException {
assertTrue(handle.alive());
handle.waitForProg(System.out);
}


*/
}
2 changes: 1 addition & 1 deletion build.xml
View file
Expand Up @@ -22,7 +22,7 @@
<condition property="java-5">
<not><matches pattern="^1\.[0-4]" string="${ant.java.version}"/></not>
</condition>
<fail message="Your must use Java 1.5 or newer. You are currrenltly using '${ant.java.version}'." unless="java-5"/>
<fail message="Your must use Java 1.5 or newer. You are currrently using '${ant.java.version}'." unless="java-5"/>

<echo/>
<echo>******************************************************</echo>
Expand Down
33 changes: 5 additions & 28 deletions examples/ruby/Rakefile
View file
Expand Up @@ -8,24 +8,16 @@
#

require "rubygems"
gem "rspec", "=1.1.8"
gem "rspec", "=1.1.12"
require 'rake'
require 'spec/rake/spectask'
gem "deep_test_pre", "=2.0"
require "deep_test"

gem "selenium-client", "=1.2.7"
require "selenium/rake/tasks"
report_formatter_path = "lib/reporting/selenium_test_report_formatter"

# Make sure we pick up the reporter from the appropriate selenium-client
# install as RSpec runner --require does not discriminate between multiple
# selenium-client gems.
gem_executable = Config::CONFIG["host_os"] =~ /mswin/ ? "gem.bat" : "gem"
report_formatter_path = `#{gem_executable} which -q "selenium/rspec/reporting/selenium_test_report_formatter"`.chomp
report_formatter_path.gsub! /selenium-client-\d+\.\d+.\d+/, "selenium-client-1.2.7"


gem "deep_test", "=1.2.2"
require "deep_test/rake_tasks"

task :default => :'tests:run_in_parallel'

#
Expand All @@ -35,8 +27,7 @@ task :default => :'tests:run_in_parallel'
desc("Run all tests in parallel using DeepTest.")
Spec::Rake::SpecTask.new("tests:run_in_parallel") do |t|
t.spec_files = FileList['./**/*_spec.rb']
t.deep_test :number_of_workers => 6,
:timeout_in_seconds => 300
t.deep_test :number_of_agents => 6
t.spec_opts << '--color'
t.spec_opts << "--require 'rubygems,#{report_formatter_path}'"
t.spec_opts << "--format=Selenium::RSpec::SeleniumTestReportFormatter:./tmp/test_report.html"
Expand All @@ -61,20 +52,6 @@ Spec::Rake::SpecTask.new('tests:run_in_sequence') do |t|
end
task :'tests:run_in_sequence' => :create_report_dir


#
# Legacy way to drive tests in parallel before DeepTest RSpec support.
# Kept to document a simple way to run the tests in parallel for non-Ruby
# platforms.
#

desc("[DEPRECATED] Run all behaviors in parallel spawing multiple processes. DeepTest offers a better alternative.")
task :'tests:run_in_parallel:multiprocess' => :create_report_dir do
require File.expand_path(File.dirname(__FILE__) + '/lib/multi_process_behaviour_runner')
runner = MultiProcessSpecRunner.new(10)
runner.run(Dir['*_spec.rb'])
end

task :create_report_dir do
rm_f File.expand_path(File.dirname(__FILE__) + "/tmp/rspec_report")
mkdir_p File.expand_path(File.dirname(__FILE__) + "/tmp/rspec_report")
Expand Down
21 changes: 21 additions & 0 deletions examples/ruby/create_browser_driver.rb
View file
@@ -0,0 +1,21 @@
gem "selenium-client", ">=1.2.18"
require "selenium/client"
module CreateBrowserDriver
def browser
return @browser
end

def page
return @browser
end

def create_selenium_driver(url)

@browser = Selenium::Client::Driver.new(
:host => ENV['HOST'] || "localhost",
:port => 4444,
:browser => ENV['SELENIUM_RC_BROWSER'] || "*firefox",
:url => url,
:timeout_in_second => 60)
end
end
32 changes: 21 additions & 11 deletions examples/ruby/google_image_example.rb
View file
@@ -1,15 +1,25 @@
module GoogleImageExample

require File.dirname(__FILE__) + "/create_browser_driver"

include CreateBrowserDriver
def run_scenario(options)
create_selenium_driver("http://images.google.com")
browser.start_new_browser_session
puts "Testing #{browser.browser_url} on #{browser.browser_string} "
browser.open "/"
page.location.should match(%r{http://images.google.com/})
page.type "q", options[:search_string]
page.click "btnG", :wait_for => :page
page.click "rptgl"
page.click "imgsz_l"
page.click "imgtype_photo"
page.click "btnG", :wait_for => :page
page.text?(options[:search_string].split(/ /).first).should be_true
browser.location.should match(%r{http://images.google.com/})
puts "Typing the search string #{options[:search_string]} into the search images text field"
browser.type "q", options[:search_string]
puts "Clicking the search button and waiting for the page to load"
browser.click "btnG"
browser.wait_for_page_to_load "30000"
puts "Click the link to refine the search to large images"
browser.click "css=a:contains(\"Large\")"
browser.wait_for_element("css=li:contains(\"Large\")")
puts "Verify that the size of large is now selected"
browser.element?("css=li:contains(\"Large\")").should == true
puts "Verifying that #{options[:search_string].split(/ /).first} is on the page"
browser.text?(options[:search_string].split(/ /).first).should be_true
browser.close_current_browser_session
end

end

13 changes: 0 additions & 13 deletions examples/ruby/lib/array_extension.rb
View file

This file was deleted.

28 changes: 0 additions & 28 deletions examples/ruby/lib/multi_process_behaviour_runner.rb
View file

This file was deleted.

0 comments on commit 8c302b7

Please sign in to comment.