bryan-ash-wx-nobbie 0.0.4 → 0.1.0

data/README.rdoc

@@ -55,17 +55,17 @@ A quick overview with examples:
 
 * Selecting ...
 
-   selection(path).choose(value)
+   select value, path
 
   e.g.
 
-   selection(in_('title')).choose('Mr')
+   select 'Mr', in_('title')
 
   ...or
 
-   selection(:in => 'title').choose 'Mr'
-   selection('title').choose 'Mr'
-   selection(:title).choose 'Mr'
+   select 'Mr', :in => 'title'
+   select 'Mr', 'title'
+   select 'Mr', :title
 
   This will find the component named 'title' and select 'Mr'.
   ...this works for anything where you can make a selection from a number of options
@@ -73,7 +73,7 @@ A quick overview with examples:
 
   You can get the value of the current selection using:
 
-   selection(path).selected_value
+   selected_value path
 
 
 * Clicking ...
@@ -96,34 +96,34 @@ A quick overview with examples:
 
 * Choosing ...
 
-   choosable(path).choose
+   choose path
 
   e.g.
 
-   choosable(in_('female')).choose
+   choose in_('female')
 
   ...or
 
-   choosable(:in => 'female').choose
-   choosable('female').choose
-   choosable(:female).choose
+   choose :in => 'female'
+   choose 'female'
+   choose :female
 
   This will find the component named 'female' and choose it
   ...this works for anything that has a chosen/non-chosen state.
 
   You can determine if a component is currently chosen using:
 
-   choosable(path).chosen?
+   chosen? path
 
 Hopefully that makes some degree of sense, there are a few other operations available, that should be self
 explanatory from the documentation.
 
 * Writing that first test ...
 
-  By default Nobbie hooks into test/unit.  However, due to a Wx limitation its not possible to launch a new
-  instance of your application for every test run (this would also be very slow anyway).  So, instead Nobbie
-  will launch your application, run all the tests in your suite and then close down the application. (Note: If
-  anyone has a better solution to this ... please let me know).
+  Nobbie can drive a Wx application from Cucumber or test/unit.  However, due to a Wx limitation its not
+  possible to launch a new instance of your application for every test run (this would also be very slow
+  anyway).  So, instead Nobbie will launch your application, run all the tests in your suite and then close
+  down the application. (Note: If anyone has a better solution to this ... please let us know).
 
   In order for this to happen, you must advise Nobbie which application you wish to test by setting the constant
   APPLICATION_UNDER_TEST to an instance of your application, i.e.:
@@ -143,7 +143,5 @@ explanatory from the documentation.
 
 * More examples ...
 
-  Nobbie has a suite of tests which are installed as part of the gem.  Take a look at the 'test' directory.
-
-
-
+  Nobbie's features are described by a set of Cucumber features which are installed as part of the gem.  Take a look at the 'features' directory.
+  There's also a Test::Unit suite to be found in the 'test' directory.

data/Rakefile

@@ -18,20 +18,26 @@ Spec::Rake::SpecTask.new do |t|
     t.rcov = true
     t.rcov_opts << '--text-report'
     t.rcov_opts << '--exclude features\/,spec\/'
+    t.rcov_opts << '--aggregate coverage\coverage.data'
     t.rcov_opts << '--sort coverage'
   end
 end
 
 desc "Run Cucumber features"
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = '--format pretty'
+  t.cucumber_opts = '--no-source'
   t.rcov = true
   t.rcov_opts << '-o coverage'
   t.rcov_opts << '--text-report'
   t.rcov_opts << '--exclude features\/,spec\/'
+  t.rcov_opts << '--aggregate coverage\coverage.data'
   t.rcov_opts << '--sort coverage'
 end
 
+directory 'coverage'
+task :features => 'coverage'
+task :spec     => 'coverage'
+
 desc "Run unit tests"
 Rcov::RcovTask.new(:test) do |t|
   t.pattern = FileList['test/all_tests.rb']

data/features/acceptance_test.feature

@@ -2,28 +2,73 @@ In order to test drive a WxRuby application
 As a developer
 I want Nobbie to provide acceptance test access to the application
 
-  Scenario: Choosing a radio button
-    Then "radio_button" is not chosen
-    When I choose "radio_button"
-    Then "radio_button" is chosen
+  Scenario Outline: Choosing things
+    Given "<control>" is not chosen
+    When  I choose "<control>"
+    Then  "<control>" is chosen
 
-  Scenario: Choosing a check box
-    Then "check_box" is not chosen
-    When I choose "check_box"
-    Then "check_box" is chosen
+  Examples: 
+    | control      |
+    | check_box    |
+    | radio_button |
 
-  Scenario: Type into a text control
-    When I type "123" into "text_ctrl"
-    Then I should see "123" in "text_ctrl"
 
-  Scenario: Type into a combo box
-    When I type "456" into "combo_box"
-    Then I should see "456" in "combo_box"
+  Scenario Outline: Things that can't be chosen
+    When I choose "<control>"
+    Then I expect an exception with the message "cannot: Choose '<control>'"
+    When "<control>" is chosen
+    Then I expect an exception with the message "cannot: Is chosen '<control>'"
+    
+  Examples:
+    | control   |
+    | button    |
+    | combo_box |
+    | text_ctrl |
+
+
+  Scenario Outline: Typing into things
+    When I type "<something>" into "<control>"
+    Then I should see "<something>" in "<control>"
+
+  Examples:
+    | something | control   |
+    | 123       | combo_box |
+    | 456       | text_ctrl |
+
+
+  Scenario Outline: Things that can't be typed into
+    When I type "<something>" into "<control>"
+    Then I expect an exception with the message "cannot: Type '<something>' into '<control>'"
+
+  Examples:
+    | something | control       |
+    | 123       | button        |
+    | 456       | check_box     |
+    | 789       | radio_button  |
+    | 012       | test_notebook |
+
 
   Scenario: Click on a button
     When I click on "button"
 
-  Scenario Outline: Working with selectables
+
+  Scenario: Invalid path format
+    When I use an invalid path
+    Then I expect an exception with the message "Unable to coerce path"
+
+
+  Scenario Outline: Things that can't be clicked
+    When I click on "<control>"
+    Then I expect an exception with the message "cannot: Click on '<control>'"
+
+  Examples:
+    | control       |
+    | combo_box     |
+    | text_ctrl     |
+    | test_notebook |
+
+
+  Scenario Outline: Selecting things
     Given "<selectable>" includes "<value>"
     When I select "<value>" on the "<selectable>"
     Then "<value>" on the "<selectable>" should be selected
@@ -33,11 +78,37 @@ I want Nobbie to provide acceptance test access to the application
     | combo_box_with_items | combo_box_item |
     | list_box_with_items  | list_box_item  |
     | test_notebook        | click          |
+    | &File                | &New...        |
+
+
+  Scenario Outline: Selecting things that aren't there
+    When I select "<value>" on the "<selectable>"
+    Then I expect an exception with the message "cannot: Select '<value>' in '<selectable>'"
+
+  Examples:
+    | selectable           | value        |
+    | combo_box_with_items | Ghost        |
+    | list_box_with_items  | Tooth Fairy  |
+    | test_notebook        | Easter Bunny |
+
+
+  Scenario Outline: Things that can't be selected
+    Given "<control>" includes "<value>"
+    Then I expect an exception with the message "cannot: Get options '<control>'"
+    When I select "<value>" on the "<control>"
+    Then I expect an exception with the message "cannot: Select '<value>' in '<control>'"
+    When "<value>" on the "<control>" should be selected
+    Then I expect an exception with the message "cannot: Get selected values '<control>'"
+
+  Examples:
+    | value | control      |
+    | 123   | button       |
+    | 456   | check_box    |
+    | 789   | radio_button |
+
 
   Scenario: Enabled controls
     Then "text_ctrl" is enabled
     Then "disabled_text_ctrl" is not enabled
 
-  Scenario: Working with menus
-    When I select "&New..." on the "&File"
 

data/features/step_definitions/acceptance_test_steps.rb

@@ -1,41 +1,50 @@
+def execute_and_catch_exception
+  @raised_exception = nil
+  begin
+    yield
+  rescue StandardError => exception
+    @raised_exception = exception
+  end
+end
+
 When /^I choose "(.*)"$/ do |item|
-  choosable(item).choose
+  execute_and_catch_exception { choose item }
 end
 
 When /^I type "(.*)" into "(.*)"$/ do |value, item|
-  type value, :in => item
+  execute_and_catch_exception { type value, :in => item }
 end
 
 When /^I click on "(.*)"$/ do |item|
-  click item
+  execute_and_catch_exception { click item }
+end
+
+When /^I use an invalid path$/ do 
+  execute_and_catch_exception { click ["Array is not a valid path"] }
 end
 
 When /^I select "(.*)" on the "(.*)"$/ do |value, selectable|
-  selection(:in => selectable).choose value
+  execute_and_catch_exception { select value, :in => selectable }
 end
 
 Then /^I should see "(.*)" in "(.*)"$/ do |value, item|
   text(item).should == value
 end
 
-Then /^the application is running$/ do
-  @app.is_main_loop_running.should be_true
-end
-
 Then /^"(.*)" is chosen$/ do |item|
-  choosable(item).should be_chosen
+  execute_and_catch_exception { chosen?(item).should be_true }
 end
 
 Then /^"(.*)" is not chosen$/ do |item|
-  choosable(item).should_not be_chosen
+  chosen?(item).should be_false
 end
 
 Then /^"(.*)" on the "(.*)" should be selected$/ do |value, selectable|
-  selection(:in => selectable).selected_value.should == value
+  execute_and_catch_exception { selected_value(:in => selectable).should == value }
 end
 
 Then /^"(.*)" includes "(.*)"$/ do |selectable, value|
-  selection(:in => selectable).options.should include(value)
+  execute_and_catch_exception { options(:in => selectable).should include(value) }
 end
 
 Then /^"(.*)" is enabled$/ do |item|
@@ -46,3 +55,6 @@ Then /^"(.*)" is not enabled$/ do |item|
   enabled?(item).should_not be_true
 end
 
+Then /^I expect an exception with the message "(.*)"$/ do |message|
+  @raised_exception.to_s.should =~ Regexp.new(message)
+end

data/features/support/env.rb

@@ -2,8 +2,14 @@ require 'rubygems'
 require 'spec'
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-require 'nobbie/wx'
 
 require File.dirname(__FILE__) + '/../../test/suite/example_app'
 
-Nobbie::Wx::ApplicationLauncher.new(ExampleApp.new(false)).run
+require 'nobbie/wx'
+include Nobbie::Wx
+
+silent_reporter = Command::ConsoleReporter.new(StringIO.new)
+  
+Command::Executor.reporter = silent_reporter
+
+ApplicationLauncher.new(ExampleApp.new(false)).run

data/lib/nobbie/wx/command/console_reporter.rb

@@ -7,12 +7,16 @@ module Nobbie
 
       class ConsoleReporter < Reporter #:nodoc:
 
+        def initialize(output_stream = STDOUT)
+          @output_stream = output_stream
+        end
+
         def before_executing_command(command)
-          STDOUT.puts "\n> #{command.describe}"
+          @output_stream.puts "\n> #{command.describe}"
         end
 
         def after_executing_command(result)
-          STDOUT.puts "< #{render(result)}"
+          @output_stream.puts "< #{render(result)}"
         end
 
         private

data/lib/nobbie/wx/command/executor.rb

@@ -7,6 +7,18 @@ module Nobbie
 
       class Executor #:nodoc:
 
+        def self.execute(command)
+          executor.execute(command)
+        end
+
+        def self.executor
+          @executor ||= new
+        end
+
+        def self.reporter= reporter
+          executor.reporter = reporter
+        end
+        
         def initialize(reporter = Reporter.new)
           @reporter = reporter
         end
@@ -18,6 +30,10 @@ module Nobbie
           result
         end
 
+        def reporter= reporter
+          @reporter = reporter
+        end
+
       end
 
     end

data/lib/nobbie/wx/operations.rb

@@ -1,15 +1,12 @@
 require 'nobbie/wx/command_factory'
 
-impl = File.dirname(__FILE__) + File::SEPARATOR + 'impl'
-Dir.glob("#{impl}/**/*.rb") {|f| require "#{f}" }
+require "nobbie/wx/impl/element/element_path_builder"
 
 module Nobbie
   module Wx
 
     module Operations
 
-      EXECUTOR = Command::Executor.new
-
       # Types text into the component specified in the path.
       #  Supported components: TextCtrl, ComboBox
       def type(text, path)
@@ -36,16 +33,34 @@ module Nobbie
         execute(command_factory.create_get_component_command(coerce_path(path)))
       end
 
-      # Returns a SelectionOperations[link:classes/Nobbie/Wx/SelectOperations.html] for interacting with
-      # the component specified in the path
-      def selection(path)
-        SelectOperations.new(self, coerce_path(path))
+      # Selects the given value for the component specified in the path.
+      #  Supported components: Notebook, Menu, ComboBox, ListBox, Choice
+      def select(value, path)
+        execute(command_factory.create_select_command(coerce_path(path), value))
+      end
+
+      # Retrieves the currently selected value for the component specified in the path.
+      #  Supported components: Notebook, ComboBox, ListBox, Choice
+      def selected_value(path)
+        execute(command_factory.create_get_selected_values_command(coerce_path(path)))
+      end
+
+      # Retrieves available options for the component specified in the path.
+      #  Supported components: Notebook, ComboBox, ListBox, Choice
+      def options(path)
+        execute(command_factory.create_get_options_command(coerce_path(path)))
+      end
+
+      # Chooses the component specified in the path.
+      #  Supported components: RadioButton, CheckBox
+      def choose(path)
+        execute(command_factory.create_choose_command(coerce_path(path)))
       end
 
-      # Returns a ChoosableOperations[link:classes/Nobbie/Wx/ChoosableOperations.html] for interacting with
-      # the component specified in the path
-      def choosable(path)
-        ChoosableOperations.new(self, coerce_path((path)))
+      # Determines if the component specified in the path is chosen.
+      #  Supported components: RadioButton, CheckBox
+      def chosen?(path)
+        execute(command_factory.create_is_chosen_command(coerce_path(path)))
       end
 
       # Determines if the component specified in the path is currently enabled.
@@ -68,7 +83,7 @@ module Nobbie
       end
 
       def execute(command)
-        EXECUTOR.execute(command)
+        Command::Executor.execute(command)
       end
 
       private

data/lib/nobbie/wx/platform.rb

@@ -1,31 +1,46 @@
 require 'rubygems'
 require 'wx'
 
-#todo: move this into Nobbie::Wx namespace ... once name clash is fixed
-class Platform #:nodoc:
-  include Wx
-
-  WINDOWS = 'WXMSW'
-  MAC = 'WXMAC'
-  SUPPORTED_PLATFORMS = [WINDOWS, MAC]
-
-  def self.windows?
-    name == WINDOWS
-  end
-
-  def self.ensure_supported
-    Kernel.raise "Sorry '#{name}' is not currently supported, Nobbie-Wx is only available for the following platforms: [#{SUPPORTED_PLATFORMS.join(',')}]" unless supported?
-  end
-
-  private
-
-  def self.supported?
-    SUPPORTED_PLATFORMS.include?(name)
-  end
-
-  def self.name
-    Wx::PLATFORM
+module Nobbie
+
+  module Wx
+    
+    class Platform #:nodoc:
+
+      include Wx
+      
+      WINDOWS = 'WXMSW'
+      MAC = 'WXMAC'
+      SUPPORTED_PLATFORMS = [WINDOWS, MAC]
+
+      def self.windows?
+        name == WINDOWS
+      end
+      
+      def self.ensure_supported
+        raise unsupported_message unless supported?
+      end
+      
+      private
+      
+      def self.supported?
+        SUPPORTED_PLATFORMS.include?(name)
+      end
+      
+      def self.unsupported_message
+        "Sorry '#{name}' is not currently supported, " +
+          "Nobbie-Wx is only available for the following platforms: " +
+          "[#{SUPPORTED_PLATFORMS.join(',')}]"
+      end
+      
+      def self.name
+        Wxruby2::PLATFORM
+      end
+      
+    end
+    
   end
+  
 end
 
-Platform.ensure_supported
+Nobbie::Wx::Platform.ensure_supported

data/spec/console_reporter_spec.rb

@@ -12,19 +12,36 @@ module Nobbie
           ConsoleReporter.new.should be_kind_of(Reporter)
         end
 
-        it "outputs to STDOUT by default" do
-          command = mock('command')
-          command.should_receive(:describe).and_return('description')
-          command.should_receive(:execute).and_return('result')
+        describe "outputs" do
+
+          before :each do
+            @command = mock('command')
+            @command.should_receive(:describe).and_return('description')
+            @command.should_receive(:execute).and_return('result')
+          end
+          
+          it "to STDOUT by default" do
+            STDOUT.should_receive(:puts).with(/description/)
+            STDOUT.should_receive(:puts).with(/result/)
+            
+            reporter = ConsoleReporter.new
+            executor = Executor.new(reporter)
+            executor.execute(@command)
+          end
+
+          it "to a specified IO stream" do
+            @io = StringIO.new
+            
+            @io.should_receive(:puts).with(/description/)
+            @io.should_receive(:puts).with(/result/)
+            
+            reporter = ConsoleReporter.new(@io)
+            executor = Executor.new(reporter)
+            executor.execute(@command)
+          end        
 
-          STDOUT.should_receive(:puts).with(/.*description.*/)
-          STDOUT.should_receive(:puts).with(/.*result.*/)
-
-          reporter = ConsoleReporter.new
-          executor = Executor.new(reporter)
-          executor.execute(command)
         end
-
+        
       end
 
     end

data/spec/executor_spec.rb

@@ -16,9 +16,7 @@ module Nobbie
           it "executes a command" do
             @command.should_receive(:execute)
 
-            @executor = Nobbie::Wx::Command::Executor.new
-
-            @executor.execute(@command)
+            Nobbie::Wx::Command::Executor.execute(@command)
           end
 
           it "calls 'before' and 'after' hooks" do
@@ -29,9 +27,9 @@ module Nobbie
 
             @command.should_receive(:execute)
 
-            @executor = Nobbie::Wx::Command::Executor.new
+            executor = Nobbie::Wx::Command::Executor.new
 
-            @executor.execute(@command)
+            executor.execute(@command)
           end
 
           it "calls 'before' and 'after' hooks on supplied Reporter" do
@@ -41,9 +39,8 @@ module Nobbie
 
             @command.should_receive(:execute)
 
-            @executor = Nobbie::Wx::Command::Executor.new(reporter)
-
-            @executor.execute(@command)
+            Nobbie::Wx::Command::Executor.reporter = reporter
+            Nobbie::Wx::Command::Executor.execute(@command)
           end
 
         end

data/spec/platform_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'nobbie/wx/platform'
+
+module Nobbie
+  module Wx
+
+    describe "Platform" do
+
+      describe "basic execution" do
+        
+        it "Raises a pleasant exception on unsupported platform" do
+          Wxruby2.send(:remove_const, :PLATFORM)
+          Wxruby2::PLATFORM = "unsupported"
+
+          lambda{ Nobbie::Wx::Platform.ensure_supported }.
+            should raise_error("Sorry 'unsupported' is not currently supported, Nobbie-Wx is only available for the following platforms: [WXMSW,WXMAC]")
+        end
+        
+      end
+
+    end
+    
+  end
+end

data/test/all_tests.rb

@@ -9,7 +9,6 @@ require 'test/unit'
 
 Dir.glob("#{TEST}/suite/**/*.rb") { |file| require file }
 
-Nobbie::Wx::Operations::EXECUTOR =
-  Nobbie::Wx::Command::Executor.new(Nobbie::Wx::Command::ConsoleReporter.new)
+Nobbie::Wx::Command::Executor.reporter = Nobbie::Wx::Command::ConsoleReporter.new
 
 Nobbie::Wx::ApplicationLauncher.new(ExampleApp.new).run

data/test/suite/nobbie_test_case.rb

@@ -12,8 +12,8 @@ module NobbieTestCase
   def select_tab_for_test
     clear_events
     tab = self.class.name.gsub('Test', '').downcase
-    selection(:in => 'test_notebook').choose tab
-    assert_equal tab, selection(:in => 'test_notebook').selected_value
+    select tab,:in => 'test_notebook'
+    assert_equal tab, selected_value(:in => 'test_notebook')
   end
 
   def clear_events

data/test/suite/test_choose.rb

@@ -4,49 +4,49 @@ class TestChoose < Test::Unit::TestCase
   #todo: rename file to choosable
   #todo: should be TestChoosable
   def test_choose_with_radio_button
-    assert !choosable('radio_button').chosen?
-    choosable('radio_button').choose
-    assert choosable('radio_button').chosen?
+    assert !chosen?('radio_button')
+    choose('radio_button')
+    assert chosen?('radio_button')
     assert_events 'radio_button: '
   end
 
   def test_choose_with_check_box
-    assert !choosable('check_box').chosen?
-    choosable('check_box').choose
-    assert choosable('check_box').chosen?
+    assert !chosen?('check_box')
+    choose('check_box')
+    assert chosen?('check_box')
     assert_events 'check_box: '
   end
 
   def test_choose_with_component_disabled_radio_button
-    assert_exception ComponentDisabledException do choosable('disabled_radio_button').choose end
+    assert_exception ComponentDisabledException do choose('disabled_radio_button') end
   end
 
   def test_choose_with_component_disabled_check_box
-    assert_exception ComponentDisabledException do choosable('disabled_check_box').choose end
+    assert_exception ComponentDisabledException do choose('disabled_check_box') end
   end
 
   def test_choose_with_unsupported_operation_for_component
-    assert_exception UnsupportedOperationForComponentException do choosable('button').choose end
+    assert_exception UnsupportedOperationForComponentException do choose('button') end
   end
 
   def test_choose_with_component_not_found
-    assert_exception ComponentNotFoundException do choosable('missing').choose end
+    assert_exception ComponentNotFoundException do choose('missing') end
   end
 
   def test_chosen_with_unsupported_operation_for_component
-    assert_exception UnsupportedOperationForComponentException do choosable('button').chosen? end
+    assert_exception UnsupportedOperationForComponentException do chosen?('button') end
   end
 
   def test_chosen_with_component_not_found
-    assert_exception ComponentNotFoundException do choosable('missing').chosen? end
+    assert_exception ComponentNotFoundException do chosen?('missing') end
   end
 
   def test_chosen_with_component_disabled_radio_button
-    assert !choosable('disabled_radio_button').chosen?
+    assert !chosen?('disabled_radio_button')
   end
 
   def test_chosen_with_component_disabled_check_box
-    assert !choosable('disabled_check_box').chosen?
+    assert !chosen?('disabled_check_box')
   end
 end
 

data/test/suite/test_selection.rb

@@ -2,54 +2,54 @@ class TestSelection < Test::Unit::TestCase
   include NobbieTestCase
 
   def test_choose_with_notebook_page
-    assert_equal 'notebook_page1', selection('notebook').selected_value
-    selection('notebook').choose 'notebook_page2'
-    assert_equal 'notebook_page2', selection('notebook').selected_value
+    assert_equal 'notebook_page1', selected_value('notebook')
+    select 'notebook_page2', :in => 'notebook'
+    assert_equal 'notebook_page2', selected_value('notebook')
     #todo: improve event detail
     assert_events 'notebook: '
   end
 
   def test_choose_with_menu_item
-    selection('&File').choose '&New...'
+    select  '&New...', :in => '&File'
     #todo: improve event detail
     assert_events 'file_new'
   end
 
   def test_choose_with_combo_box
-    assert_equal '', selection('combo_box_with_items').selected_value
-    selection('combo_box_with_items').choose 'combo_box_item'
-    assert_equal 'combo_box_item', selection('combo_box_with_items').selected_value
+    assert_equal '', selected_value('combo_box_with_items')
+    select 'combo_box_item', :in => 'combo_box_with_items'
+    assert_equal 'combo_box_item', selected_value('combo_box_with_items')
     assert_events 'combo_box_with_items: '
   end
 
   def test_choose_with_list_box
-    assert_equal '', selection('list_box_with_items').selected_value
-    selection('list_box_with_items').choose 'list_box_item'
-    assert_equal 'list_box_item', selection('list_box_with_items').selected_value
+    assert_equal '', selected_value('list_box_with_items')
+    select 'list_box_item', :in => 'list_box_with_items'
+    assert_equal 'list_box_item', selected_value('list_box_with_items')
     assert_events 'list_box_with_items: list_box_item'
   end
 
   def test_choose_with_choice
-    assert_equal '', selection('choice_with_items').selected_value
-    selection('choice_with_items').choose 'choice_item'
-    assert_equal 'choice_item', selection('choice_with_items').selected_value
+    assert_equal '', selected_value('choice_with_items')
+    select 'choice_item', :in => 'choice_with_items'
+    assert_equal 'choice_item', selected_value('choice_with_items')
     assert_events 'choice_with_items: choice_item'
   end
 
   def test_options_with_notebook
-    assert_equal ['notebook_page1', 'notebook_page2'] , selection('notebook').options
+    assert_equal ['notebook_page1', 'notebook_page2'] , options('notebook')
   end
 
   def test_options_with_combo_box
-    assert_equal ["combo_box_item"], selection('combo_box_with_items').options
+    assert_equal ["combo_box_item"], options('combo_box_with_items')
   end
 
   def test_options_with_list_box
-    assert_equal ["list_box_item"], selection('list_box_with_items').options
+    assert_equal ["list_box_item"], options('list_box_with_items')
   end
 
   def test_options_with_choice
-    assert_equal ["choice_item"], selection('choice_with_items').options
+    assert_equal ["choice_item"], options('choice_with_items')
   end
 
   #todo: options with component not found
@@ -58,81 +58,81 @@ class TestSelection < Test::Unit::TestCase
   #not found
 
   def test_choose_with_value_not_found_notebook
-    assert_exception ValueNotFoundException do selection('notebook').choose 'missing' end
+    assert_exception ValueNotFoundException do select('missing', :in => 'notebook') end
   end
 
   def test_choose_with_value_not_found_menu
-    assert_exception ValueNotFoundException do selection('&File').choose 'missing' end
+    assert_exception ValueNotFoundException do select('missing', :in => '&File') end
   end
 
   def test_choose_with_value_not_found_list_box
-    assert_exception ValueNotFoundException do selection('list_box_with_items').choose 'missing' end
+    assert_exception ValueNotFoundException do select('missing', :in => 'list_box_with_items') end
   end
 
   def test_choose_with_value_not_found_combo_box
-    assert_exception ValueNotFoundException do selection('combo_box_with_items').choose 'missing' end
+    assert_exception ValueNotFoundException do select('missing', :in => 'combo_box_with_items') end
   end
 
   def test_choose_with_value_not_found_combo_box
-    assert_exception ValueNotFoundException do selection('choice_with_items').choose 'missing' end
+    assert_exception ValueNotFoundException do select('missing', :in => 'choice_with_items') end
   end
 
   #disabled
 
   def test_choose_with_component_disabled_menu
-    assert_exception ComponentDisabledException do selection('&File').choose '&disabled' end
+    assert_exception ComponentDisabledException do select('&disabled', :in => '&File') end
   end
   
   def test_choose_with_component_disabled_notebook
-    assert_equal 'disabled_notebook_page1', selection('disabled_notebook').selected_value
-    assert_exception ComponentDisabledException do selection('disabled_notebook').choose 'disabled_notebook_page2' end
-    assert_equal 'disabled_notebook_page1', selection('disabled_notebook').selected_value
+    assert_equal 'disabled_notebook_page1', selected_value('disabled_notebook')
+    assert_exception ComponentDisabledException do select('disabled_notebook_page2', :in => 'disabled_notebook') end
+    assert_equal 'disabled_notebook_page1', selected_value('disabled_notebook')
   end
 
   def test_choose_with_component_disabled_list_box
-    assert_exception ComponentDisabledException do selection('disabled_list_box_with_items').choose 'disabled_list_box_item2' end
+    assert_exception ComponentDisabledException do select('disabled_list_box_item2', :in => 'disabled_list_box_with_items') end
   end
 
   def test_choose_with_component_disabled_combo_box
-    assert_exception ComponentDisabledException do selection('disabled_combo_box_with_items').choose 'disabled_combo_box_item2' end
+    assert_exception ComponentDisabledException do select('disabled_combo_box_item2', :in => 'disabled_combo_box_with_items')  end
   end
 
   def test_choose_with_component_disabled_choice
-    assert_exception ComponentDisabledException do selection('disabled_choice_with_items').choose 'disabled_choice_item2' end
+    assert_exception ComponentDisabledException do select('disabled_choice_item2', :in => 'disabled_choice_with_items') end
   end
 
   #not found etc ...
 
   def test_choose_with_component_not_found
-    assert_exception ComponentNotFoundException do selection('missing').choose 'missing' end
+    assert_exception ComponentNotFoundException do select('missing', :in => 'missing') end
   end
   
   def test_choose_with_unsupported_operation_for_component
-    assert_exception UnsupportedOperationForComponentException do selection('button').choose 'value' end
+    assert_exception UnsupportedOperationForComponentException do select('value', :in => 'button') end
   end
 
   def test_selected_value_unsupported_operation_for_menu
-    assert_exception UnsupportedOperationForComponentException do selection('&File').selected_value end
+    assert_exception UnsupportedOperationForComponentException do selected_value('&File') end
   end
 
   def test_selected_value_with_unsupported_operation_for_component
-    assert_exception UnsupportedOperationForComponentException do selection('button').selected_value end
+    assert_exception UnsupportedOperationForComponentException do selected_value('button') end
   end
   
   def test_selected_value_with_component_not_found
-    assert_exception ComponentNotFoundException do selection('missing').selected_value end
+    assert_exception ComponentNotFoundException do selected_value('missing') end
   end
 
   def test_options_with_component_not_found
-    assert_exception ComponentNotFoundException do selection('missing').options end
+    assert_exception ComponentNotFoundException do options('missing') end
   end
 
   def test_options_unsupported_operation_for_menu
-    assert_exception UnsupportedOperationForComponentException do selection('&File').options end
+    assert_exception UnsupportedOperationForComponentException do options('&File') end
   end
 
   def test_options_with_unsupported_operation_for_component
-    assert_exception UnsupportedOperationForComponentException do selection('button').options end
+    assert_exception UnsupportedOperationForComponentException do options('button') end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bryan-ash-wx-nobbie
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Paul Alton
@@ -64,8 +64,6 @@ files:
 - lib/nobbie/wx/command/select.rb
 - lib/nobbie/wx/command/type_into.rb
 - lib/nobbie/wx/impl/element/element_path_builder.rb
-- lib/nobbie/wx/impl/operation/choosable.rb
-- lib/nobbie/wx/impl/operation/select.rb
 - features/step_definitions
 - features/support
 - features/acceptance_test.feature
@@ -74,6 +72,7 @@ files:
 - spec/application_launcher_spec.rb
 - spec/console_reporter_spec.rb
 - spec/executor_spec.rb
+- spec/platform_spec.rb
 - spec/reporter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -92,7 +91,7 @@ homepage: http://github.com/bryan-ash/wx-nobbie
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 - --inline-source
 - --charset=UTF-8
 require_paths: 

data/lib/nobbie/wx/impl/operation/choosable.rb

@@ -1,24 +0,0 @@
-module Nobbie
-  module Wx
-
-    class ChoosableOperations
-      def initialize(operations, path)
-        @operations = operations
-        @path = path
-      end
-
-      # Chooses the component specified in the path.
-      #  Supported components: RadioButton, CheckBox
-      def choose
-        execute(@operations.command_factory.create_choose_command(@path))
-      end
-
-      # Determines if the component specified in the path is chosen.
-      #  Supported components: RadioButton, CheckBox
-      def chosen?
-        execute(@operations.command_factory.create_is_chosen_command(@path))
-      end
-    end
-
-  end
-end

data/lib/nobbie/wx/impl/operation/select.rb

@@ -1,30 +0,0 @@
-module Nobbie
-  module Wx
-
-    class SelectOperations
-      def initialize(operations, path)
-        @operations = operations
-        @path = path
-      end
-
-      # Retrieves the currently selected value for the component specified in the path.
-      #  Supported components: Notebook, ComboBox, ListBox, Choice
-      def selected_value
-        execute(@operations.command_factory.create_get_selected_values_command(@path))
-      end
-
-      # Selects the given value for the component specified in the path.
-      #  Supported components: Notebook, Menu, ComboBox, ListBox, Choice
-      def choose(value)
-        execute(@operations.command_factory.create_select_command(@path, value))
-      end
-
-      # Retrieves available options for the component specified in the path.
-      #  Supported components: Notebook, ComboBox, ListBox, Choice
-      def options
-        execute(@operations.command_factory.create_get_options_command(@path))
-      end
-    end
-
-  end
-end