bryan-ash-wx-nobbie 0.0.3.5 → 0.0.4

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

@@ -4,15 +4,15 @@ module Nobbie
 
       class SelectCommand < ComponentAwareCommand #:nodoc:
         def initialize(path, value)
-          super(path) 
+          super(path)
           @value = value
         end
-        
+
         def execute
           if component.is_a?(Menu)
             return handle_menu
           end
-          
+
           ensure_enabled
 
           if component.is_a?(Notebook)
@@ -26,7 +26,7 @@ module Nobbie
           end
           nil
         end
-        
+
         def describe
           "Select '#{@value}' in #{@path}"
         end
@@ -39,8 +39,7 @@ module Nobbie
           ensure_enabled(id)
 
           #todo: should this be a MenuEvent?
-          #todo: find a way to avoid using APPLICATION_UNDER_TEST
-          APPLICATION_UNDER_TEST.get_top_window.process_event(CommandEvent.new(EVT_COMMAND_MENU_SELECTED, id))
+          TOP_WINDOW.process_event(CommandEvent.new(EVT_COMMAND_MENU_SELECTED, id))
 
           return ''
         end
@@ -63,11 +62,11 @@ module Nobbie
           highlight {
             index = component.find_string(@value)
             handle_value_not_found unless index > -1
-  
+
             event = CommandEvent.new(EVT_COMMAND_COMBOBOX_SELECTED, component.get_id)
             component.selection = index
             event.event_object = component
-  
+
             #todo: should this use process_event
             component.command(event)
           }
@@ -78,20 +77,20 @@ module Nobbie
           highlight {
             index = component.find_string(@value)
             handle_value_not_found unless index > -1
-  
+
             event_type = (component.is_a?(ListBox) ? EVT_COMMAND_LISTBOX_SELECTED : EVT_COMMAND_CHOICE_SELECTED)
-  
+
             event = CommandEvent.new(event_type, component.get_id)
             event.int = 1 #no idea why this works .. but it is needed
             event.string = @value
             component.selection = index
             event.event_object = component
-  
+
             component.process_event(event)
           }
         end
       end
 
-    end    
+    end
   end
-end  
+end

data/lib/nobbie/wx/command_factory.rb

@@ -1,43 +1,41 @@
 require 'nobbie/wx/command'
 
-command = File.dirname(__FILE__) + File::SEPARATOR + 'command'
-Dir.glob("#{command}/**/*.rb") {|f| require "#{f}" }
-
-require 'nobbie/wx/command_executor'
+command = File.dirname(__FILE__) + '/command'
+Dir.glob("#{command}/**/*.rb") {|file| require "#{file}" }
 
 module Nobbie
   module Wx
-    module Command  
+    module Command
 
       class Factory
         def create_type_into_command(path, value)
           TypeIntoCommand.new(path, value)
         end
-        
+
         def create_get_component_command(path)
           GetComponentCommand.new(path)
         end
-        
+
         def create_click_on_command(path)
           ClickOnCommand.new(path)
         end
-        
+
         def create_get_selected_values_command(path)
           GetSelectedValuesCommand.new(path)
         end
-        
+
         def create_select_command(path, value)
           SelectCommand.new(path, value)
         end
-        
+
         def create_is_chosen_command(path)
           IsChosenCommand.new(path)
         end
-        
+
         def create_choose_command(path)
           ChooseCommand.new(path)
         end
-        
+
         def create_is_enabled_command(path)
           IsEnabledCommand.new(path)
         end
@@ -47,6 +45,6 @@ module Nobbie
         end
       end
 
-    end    
+    end
   end
-end
+end

data/lib/nobbie/wx/impl/element/element_path_builder.rb

@@ -8,6 +8,7 @@ module Nobbie
     class ComponentReadOnlyException < RuntimeError; end
 
     class ElementPathBuilder
+
       def initialize(name)
         @name = name
       end
@@ -18,25 +19,25 @@ module Nobbie
         #todo: make me properly navigate component tree
         #todo: I should blow up if multiple windows with the same name are found ....
 
-        #todo: shouldn''t need to pass AUT.gtw here ... nil should search all 
-        component = Window.find_window_by_name(@name, APPLICATION_UNDER_TEST.get_top_window)
+        #todo: shouldn't need to pass top_window here ... nil should search all
+        component = Window.find_window_by_name(@name, TOP_WINDOW)
         return component unless component.nil?
 
-        menu_bar = APPLICATION_UNDER_TEST.get_top_window.get_menu_bar
+        menu_bar = TOP_WINDOW.get_menu_bar
         unless menu_bar.nil?
           component = menu_bar.get_menu(menu_bar.find_menu(@name))
         end
 
         #todo: pull this up ...
         Kernel.raise(ComponentNotFoundException, "cannot find component with name: #{to_s}") if component.nil?
-        
+
         component
       end
-      
+
       def to_s
         "'#{@name}'"
       end
     end
 
   end
-end  
+end

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

@@ -4,7 +4,7 @@ module Nobbie
     class ChoosableOperations
       def initialize(operations, path)
         @operations = operations
-        @path = path    
+        @path = path
       end
 
       # Chooses the component specified in the path.
@@ -18,14 +18,7 @@ module Nobbie
       def chosen?
         execute(@operations.command_factory.create_is_chosen_command(@path))
       end
-
-      private
-
-      #todo: pullup execute
-      def execute(command)
-        Command::Executor.new.execute(command)
-      end
     end
 
   end
-end  
+end

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

@@ -1,10 +1,10 @@
 module Nobbie
   module Wx
-    
+
     class SelectOperations
       def initialize(operations, path)
         @operations = operations
-        @path = path    
+        @path = path
       end
 
       # Retrieves the currently selected value for the component specified in the path.
@@ -24,14 +24,7 @@ module Nobbie
       def options
         execute(@operations.command_factory.create_get_options_command(@path))
       end
-
-      private
-      
-      #todo: pullup execute
-      def execute(command)
-        Command::Executor.new.execute(command)
-      end
     end
 
   end
-end  
+end

data/lib/nobbie/wx/operations.rb

@@ -1,6 +1,4 @@
-require 'nobbie/wx/platform'
 require 'nobbie/wx/command_factory'
-require 'nobbie/wx/application_launcher'
 
 impl = File.dirname(__FILE__) + File::SEPARATOR + 'impl'
 Dir.glob("#{impl}/**/*.rb") {|f| require "#{f}" }
@@ -10,12 +8,21 @@ module Nobbie
 
     module Operations
 
+      EXECUTOR = Command::Executor.new
+
       # Types text into the component specified in the path.
       #  Supported components: TextCtrl, ComboBox
       def type(text, path)
         execute(command_factory.create_type_into_command(coerce_path(path), text))
       end
 
+      # Returns the text in the component specified in the path.
+      #  Supported components: TextCtrl, ComboBox
+      def text(path)
+        component = component(path)
+        component.nil? ? nil : component.value
+      end
+
       # Clicks the component specified in the path.
       #  Supported components: Button
       def click(path)
@@ -60,6 +67,10 @@ module Nobbie
         Command::Factory.new
       end
 
+      def execute(command)
+        EXECUTOR.execute(command)
+      end
+
       private
 
       def coerce_path(path)
@@ -74,11 +85,6 @@ module Nobbie
 
         Kernel.raise("Unable to coerce path: #{path}")
       end
-
-      #todo: pull up
-      def execute(command)
-        Command::Executor.new.execute(command)
-      end
     end
 
   end

data/spec/application_launcher_spec.rb

@@ -1,6 +1,6 @@
 
 require File.join(File.dirname(__FILE__), 'spec_helper')
-require 'nobbie/wx/application_launcher'
+require 'nobbie/wx'
 
 describe Nobbie::Wx::ApplicationLauncher do
 
@@ -10,4 +10,10 @@ describe Nobbie::Wx::ApplicationLauncher do
     }.should raise_error(RuntimeError, /.*be a.*Wx::App.*/)
   end
 
+  it "stops the application under test after running it" do
+    app_launcher = Nobbie::Wx::ApplicationLauncher.new(Wx::App.new)
+    app_launcher.should_receive(:stop)
+    app_launcher.run
+  end
+
 end

data/spec/console_reporter_spec.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'nobbie/wx'
+require 'nobbie/wx/command/console_reporter'
+
+module Nobbie
+  module Wx
+    module Command
+
+      describe "ConsoleReporter" do
+
+        it "behave like a Reporter" do
+          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')
+
+          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
+  end
+end

data/spec/executor_spec.rb

@@ -0,0 +1,54 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'nobbie/wx/command/executor'
+
+module Nobbie
+  module Wx
+    module Command
+
+      describe "Executor" do
+
+        before :each do
+          @command = mock("command")
+        end
+
+        describe "basic execution" do
+
+          it "executes a command" do
+            @command.should_receive(:execute)
+
+            @executor = Nobbie::Wx::Command::Executor.new
+
+            @executor.execute(@command)
+          end
+
+          it "calls 'before' and 'after' hooks" do
+            reporter = mock('SilentReporter')
+            Reporter.should_receive(:new).and_return(reporter)
+            reporter.should_receive(:before_executing_command)
+            reporter.should_receive(:after_executing_command)
+
+            @command.should_receive(:execute)
+
+            @executor = Nobbie::Wx::Command::Executor.new
+
+            @executor.execute(@command)
+          end
+
+          it "calls 'before' and 'after' hooks on supplied Reporter" do
+            reporter = mock('Reporter')
+            reporter.should_receive(:before_executing_command)
+            reporter.should_receive(:after_executing_command)
+
+            @command.should_receive(:execute)
+
+            @executor = Nobbie::Wx::Command::Executor.new(reporter)
+
+            @executor.execute(@command)
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/spec/reporter_spec.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'nobbie/wx'
+require 'nobbie/wx/command/reporter'
+
+module Nobbie
+  module Wx
+    module Command
+
+      describe "Reporter" do
+
+        it "provides a reporter interface for use by executor" do
+          Reporter.method_defined?(:before_executing_command).should be_true
+          Reporter.method_defined?(:after_executing_command).should be_true
+        end
+
+      end
+
+    end
+  end
+end

data/test/all_tests.rb

@@ -1,8 +1,15 @@
 
-$LOAD_PATH.unshift '../lib'
+TEST = File.dirname(__FILE__)
+
+$LOAD_PATH.unshift "#{TEST}/../lib"
 
 require 'rubygems'
-require 'nobbie/wx/acceptance_test'
-require_all_in_directory [File.dirname(__FILE__), 'suite'].join(File::SEPARATOR)
+require 'nobbie/wx'
+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)
 
-APPLICATION_UNDER_TEST = ExampleApp.new
+Nobbie::Wx::ApplicationLauncher.new(ExampleApp.new).run

data/test/suite/example_app.rb

@@ -5,110 +5,108 @@ require 'wx_sugar'
 include Wx
 
 class TestFrame < Frame
-    def initialize(*args)
-      super
-
-      #todo: sort out all this :minsize => true stuff out .. need some way to specify defaults
-
-      panel = add(Panel, :proportion => 1)
-      panel.arrange_vertically(:padding => 4)
-
-      test_notebook = name('test_notebook', panel.add(Notebook, :minsize => true, :proportion => 2))
-
-      test_notebook.add_page(name('type', test_notebook.add(Panel) {|p| p.arrange_vertically
-        listen(:text, name('text_ctrl', p.add(TextCtrl[:value => 'text_ctrl'], :minsize => true)), :update)
-        listen(:text, name('readonly_text_ctrl', p.add(TextCtrl[:value => 'readonly_text_ctrl', :style => TE_READONLY], :minsize => true)), :update)
-        listen(:text, disable(name('disabled_text_ctrl', p.add(TextCtrl[:value => 'disabled_text_ctrl'], :minsize => true))), :update)
-
-        listen(:text, name('combo_box', p.add(ComboBox[:value => 'combo_box'], :minsize => true)), :update)
-        readonly_combo_box = name('readonly_combo_box', p.add(ComboBox[:style => CB_READONLY], :minsize => true))
-        readonly_combo_box.append('readonly_combo_box')
-        readonly_combo_box.selection = 0
-        listen(:text, readonly_combo_box, :update)
-        listen(:text, disable(name('disabled_combo_box', p.add(ComboBox[:value => 'disabled_combo_box'], :minsize => true))), :update)
-      }), 'type')
-
-      test_notebook.add_page(name('click', test_notebook.add(Panel, :minsize => true) {|p| p.arrange_vertically
-        listen(:button, name('button', p.add(Button[:label => 'regular_button'], :minsize => true)), :update)
-        listen(:button, name('labelled_button_name', p.add(Button[:label => 'labelled_button'], :minsize => true)), :update)
-        listen(:button, disable(name('disabled_button', p.add(Button[:label => 'disabled_button'], :minsize => true))), :update)
-        name('static_text', p.add(StaticText[:label => 'static_text'], :minsize => true))
-      }), 'click')
-
-      test_notebook.add_page(name('selection', test_notebook.add(Panel) {|p| p.arrange_vertically
-        notebook = name('notebook', p.add(Notebook, :minsize => true))
-        notebook.add_page(name('notebook_page1', notebook.add(Panel)), 'notebook_page1')
-        notebook.add_page(name('notebook_page2', notebook.add(Panel)), 'notebook_page2')
-        notebook.evt_notebook_page_changing(notebook.get_id()) {|e| update(e) }
-
-        disabled_notebook = disable(name('disabled_notebook', p.add(Notebook, :minsize => true)))
-        disabled_notebook.add_page(name('disabled_notebook_page1', disabled_notebook.add(Panel)), 'disabled_notebook_page1')
-        disabled_notebook.add_page(name('disabled_notebook_page2', disabled_notebook.add(Panel)), 'disabled_notebook_page2')
-        disabled_notebook.evt_notebook_page_changing(disabled_notebook.get_id()) {|e| update(e) }
-
-        #todo: make me have a visible name on screen
-        combo_box_with_items = name('combo_box_with_items', p.add(ComboBox, :minsize => true))
-        combo_box_with_items.append('combo_box_item')
-        listen(:combobox, combo_box_with_items, :update)
-
-        disabled_combo_box_with_items = disable(name('disabled_combo_box_with_items', p.add(ComboBox, :minsize => true)))
-        disabled_combo_box_with_items.append('disabled_combo_box_item1')
-        disabled_combo_box_with_items.append('disabled_combo_box_item2')
-        listen(:combobox, disabled_combo_box_with_items, :update)
-
-        list_box_with_items = name('list_box_with_items', p.add(ListBox, :minsize => true))
-        list_box_with_items.append('list_box_item')
-        listen(:listbox, list_box_with_items, :update)
-
-        disabled_list_box_with_items = disable(name('disabled_list_box_with_items', p.add(ListBox, :minsize => true)))
-        disabled_list_box_with_items.append('disabled_list_box_item1')
-        disabled_list_box_with_items.append('disabled_list_box_item2')
-        listen(:listbox, disabled_list_box_with_items, :update)
-
-        choice_with_items = name('choice_with_items', p.add(Choice, :minsize => true))
-        choice_with_items.append('choice_item')
-        listen(:choice, choice_with_items, :update)
-
-        disabled_choice_with_items = disable(name('disabled_choice_with_items', p.add(Choice, :minsize => true)))
-        disabled_choice_with_items.append('disabled_choice_item1')
-        disabled_choice_with_items.append('disabled_choice_item2')
-        listen(:choice, disabled_choice_with_items, :update)
-
-      }), 'selection')
-
-      test_notebook.add_page(name('choose', test_notebook.add(Panel) {|p| p.arrange_vertically
-        #todo: make me have a visible name on screen
-        listen(:radiobutton, name('radio_button', p.add(RadioButton, :minsize => true)), :update)
-
-        #todo: make me have a visible name on screen
-        listen(:radiobutton, disable(name('disabled_radio_button', p.add(RadioButton, :minsize => true))), :update)
-
-        #todo: make me have a visible name on screen
-        listen(:checkbox, name('check_box', p.add(CheckBox, :minsize => true)), :update)
-
-        #todo: make me have a visible name on screen
-        listen(:checkbox, disable(name('disabled_check_box', p.add(CheckBox, :minsize => true))), :update)
-
-      }), 'choose')
-
-      @log = name('log', panel.add(TextCtrl[:style => TE_READONLY | TE_MULTILINE], :minsize => true, :proportion => 1))
-
-      menu_bar = MenuBar.new
-      file_menu = Menu.new
-
-      #todo: remove these crappy id's ... there must be a nice sugary way to build menu's
-      file_new = file_menu.append(101, "&New...\tCtrl+N")
-      file_disabled = file_menu.append(102, "&disabled")
-
-      menu_bar.append(file_menu, '&File')
-      set_menu_bar(menu_bar)
-
-      #todo: make disable() handle menus ...
-      menu_bar.enable(102, false)
-
-      #todo: make update() handle menus ...
-      listen(:menu, @file_new) {|e| log('file_new') }
-   end
+  def initialize(*args)
+    super
+
+    #todo: sort out all this :minsize => true stuff out .. need some way to specify defaults
+
+    panel = add(Panel, :proportion => 1)
+    panel.arrange_vertically(:padding => 4)
+
+    test_notebook = name('test_notebook', panel.add(Notebook, :minsize => true, :proportion => 2))
+
+    test_notebook.add_page(name('type', test_notebook.add(Panel) {|p| p.arrange_vertically
+      evt_text(name('text_ctrl', p.add(TextCtrl[:value => 'text_ctrl'], :minsize => true)), :update)
+      evt_text(name('readonly_text_ctrl', p.add(TextCtrl[:value => 'readonly_text_ctrl', :style => TE_READONLY], :minsize => true)), :update)
+      evt_text(disable(name('disabled_text_ctrl', p.add(TextCtrl[:value => 'disabled_text_ctrl'], :minsize => true))), :update)
+
+      evt_text(name('combo_box', p.add(ComboBox[:value => 'combo_box'], :minsize => true)), :update)
+      readonly_combo_box = name('readonly_combo_box', p.add(ComboBox[:style => CB_READONLY], :minsize => true))
+      readonly_combo_box.append('readonly_combo_box')
+      readonly_combo_box.selection = 0
+      evt_text(readonly_combo_box, :update)
+      evt_text(disable(name('disabled_combo_box', p.add(ComboBox[:value => 'disabled_combo_box'], :minsize => true))), :update)
+    }), 'type')
+
+    test_notebook.add_page(name('click', test_notebook.add(Panel, :minsize => true) {|p| p.arrange_vertically
+      evt_button(name('button', p.add(Button[:label => 'regular_button'], :minsize => true)), :update)
+      evt_button(name('labelled_button_name', p.add(Button[:label => 'labelled_button'], :minsize => true)), :update)
+      evt_button(disable(name('disabled_button', p.add(Button[:label => 'disabled_button'], :minsize => true))), :update)
+      name('static_text', p.add(StaticText[:label => 'static_text'], :minsize => true))
+    }), 'click')
+
+    test_notebook.add_page(name('selection', test_notebook.add(Panel) {|p| p.arrange_vertically
+      notebook = name('notebook', p.add(Notebook, :minsize => true))
+      notebook.add_page(name('notebook_page1', notebook.add(Panel)), 'notebook_page1')
+      notebook.add_page(name('notebook_page2', notebook.add(Panel)), 'notebook_page2')
+      notebook.evt_notebook_page_changing(notebook.get_id()) {|e| update(e) }
+
+      disabled_notebook = disable(name('disabled_notebook', p.add(Notebook, :minsize => true)))
+      disabled_notebook.add_page(name('disabled_notebook_page1', disabled_notebook.add(Panel)), 'disabled_notebook_page1')
+      disabled_notebook.add_page(name('disabled_notebook_page2', disabled_notebook.add(Panel)), 'disabled_notebook_page2')
+      disabled_notebook.evt_notebook_page_changing(disabled_notebook.get_id()) {|e| update(e) }
+
+      #todo: make me have a visible name on screen
+      combo_box_with_items = name('combo_box_with_items', p.add(ComboBox, :minsize => true))
+      combo_box_with_items.append('combo_box_item')
+      evt_combobox(combo_box_with_items, :update)
+
+      disabled_combo_box_with_items = disable(name('disabled_combo_box_with_items', p.add(ComboBox, :minsize => true)))
+      disabled_combo_box_with_items.append('disabled_combo_box_item1')
+      disabled_combo_box_with_items.append('disabled_combo_box_item2')
+      evt_combobox(disabled_combo_box_with_items, :update)
+
+      list_box_with_items = name('list_box_with_items', p.add(ListBox, :minsize => true))
+      list_box_with_items.append('list_box_item')
+      evt_listbox(list_box_with_items, :update)
+
+      disabled_list_box_with_items = disable(name('disabled_list_box_with_items', p.add(ListBox, :minsize => true)))
+      disabled_list_box_with_items.append('disabled_list_box_item1')
+      disabled_list_box_with_items.append('disabled_list_box_item2')
+      evt_listbox(disabled_list_box_with_items, :update)
+
+      choice_with_items = name('choice_with_items', p.add(Choice, :minsize => true))
+      choice_with_items.append('choice_item')
+      evt_choice(choice_with_items, :update)
+
+      disabled_choice_with_items = disable(name('disabled_choice_with_items', p.add(Choice, :minsize => true)))
+      disabled_choice_with_items.append('disabled_choice_item1')
+      disabled_choice_with_items.append('disabled_choice_item2')
+      evt_choice(disabled_choice_with_items, :update)
+    }), 'selection')
+
+    test_notebook.add_page(name('choose', test_notebook.add(Panel) {|p| p.arrange_vertically
+      #todo: make me have a visible name on screen
+      evt_radiobutton(name('radio_button', p.add(RadioButton, :minsize => true)), :update)
+
+      #todo: make me have a visible name on screen
+      evt_radiobutton(disable(name('disabled_radio_button', p.add(RadioButton, :minsize => true))), :update)
+
+      #todo: make me have a visible name on screen
+      evt_checkbox(name('check_box', p.add(CheckBox, :minsize => true)), :update)
+
+      #todo: make me have a visible name on screen
+      evt_checkbox(disable(name('disabled_check_box', p.add(CheckBox, :minsize => true))), :update)
+    }), 'choose')
+
+    @log = name('log', panel.add(TextCtrl[:style => TE_READONLY | TE_MULTILINE], :minsize => true, :proportion => 1))
+
+    menu_bar = MenuBar.new
+    file_menu = Menu.new
+
+    #todo: remove these crappy id's ... there must be a nice sugary way to build menu's
+    file_new = file_menu.append(101, "&New...\tCtrl+N")
+    file_disabled = file_menu.append(102, "&disabled")
+
+    menu_bar.append(file_menu, '&File')
+    set_menu_bar(menu_bar)
+
+    #todo: make disable() handle menus ...
+    menu_bar.enable(102, false)
+
+    #todo: make update() handle menus ...
+    evt_menu(file_new) {|e| log('file_new') }
+  end
 
   def on_init
     self.update
@@ -136,8 +134,16 @@ class TestFrame < Frame
 end
 
 class ExampleApp < App
+
+  def initialize(visible = true)
+    super()
+    @visible = visible
+  end
+
   def on_init
-    TestFrame.new(nil, :title => 'test', :size => [1024, 768])
+    test_frame = TestFrame.new(nil, :title => 'test', :size => [1024, 768])
+    test_frame.show if @visible
+    self
   end
 end