redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/application/features/step_definitions/speedbar_steps.rb

@@ -25,37 +25,49 @@ def get_speedbar_field(field_name, expected_klass, speedbar=nil)
 end
 
 When /^I type "([^"]*)" into the "([^"]*)" field in the speedbar$/ do |text, field_name|
-  get_speedbar_text_field(field_name).edit_view.document.text = text
+  Swt.sync_exec do
+    get_speedbar_text_field(field_name).edit_view.document.text = text
+  end
 end
 
 When /^I press "([^"]*)" in the speedbar$/ do |button_name|
-  speedbar = Redcar.app.focussed_window.speedbar
-  speedbar.controller.execute_listener_in_model(speedbar.__get_item_by_text_or_name(button_name))
+  Swt.sync_exec do
+    speedbar = Redcar.app.focussed_window.speedbar
+    speedbar.controller.execute_listener_in_model(speedbar.__get_item_by_text_or_name(button_name))
+  end
 end
 
 When /^I check "([^"]*)" in the speedbar$/ do |checkbox_name|
-  speedbar = Redcar.app.focussed_window.speedbar
-  item = speedbar.__get_item_by_text_or_name(checkbox_name)
-  item.set_value(true)
-  speedbar.controller.execute_listener_in_model(item, true)
+  Swt.sync_exec do
+    speedbar = Redcar.app.focussed_window.speedbar
+    item = speedbar.__get_item_by_text_or_name(checkbox_name)
+    item.set_value(true)
+    speedbar.controller.execute_listener_in_model(item, true)
+  end
 end
 
 When /^I uncheck "([^"]*)" in the speedbar$/ do |checkbox_name|
-  speedbar = Redcar.app.focussed_window.speedbar
-  item = speedbar.__get_item_by_text_or_name(checkbox_name)
-  item.set_value(false)
-  speedbar.controller.execute_listener_in_model(item, false)
+  Swt.sync_exec do
+    speedbar = Redcar.app.focussed_window.speedbar
+    item = speedbar.__get_item_by_text_or_name(checkbox_name)
+    item.set_value(false)
+    speedbar.controller.execute_listener_in_model(item, false)
+  end
 end
 
 When /^I choose "([^"]*)" in the "([^"]*)" field in the speedbar$/ do |value, combo_name|
-  speedbar = Redcar.app.focussed_window.speedbar
-  item = get_speedbar_field(combo_name, Redcar::Speedbar::ComboItem)
-  item.set_value(value)
-  speedbar.controller.execute_listener_in_model(item, value)
+  Swt.sync_exec do
+    speedbar = Redcar.app.focussed_window.speedbar
+    item = get_speedbar_field(combo_name, Redcar::Speedbar::ComboItem)
+    item.set_value(value)
+    speedbar.controller.execute_listener_in_model(item, value)
+  end
 end
 
 When /^I close the speedbar$/ do
-  Redcar.app.focussed_window.close_speedbar
+  Swt.sync_exec do
+    Redcar.app.focussed_window.close_speedbar
+  end
 end
 
 Then /^the "([^"]*)" field in the speedbar should have text "([^"]*)"$/ do |field_name, text|

data/plugins/application/features/step_definitions/tree_steps.rb

@@ -1,107 +1,131 @@
 
 When /^I expand the tree row "([^\"]*)"$/ do |row|
-  item = visible_tree_items(top_tree).detect {|item| item.getText == row }
-  viewer = focussed_tree.controller.viewer
-  node = viewer.getViewerRowFromItem(item).getElement
-  viewer.expandToLevel(node, 1)
+  Swt.sync_exec do
+    item = visible_tree_items(top_tree).detect {|item| item.getText == row }
+    viewer = focussed_tree.controller.viewer
+    node = viewer.getViewerRowFromItem(item).getElement
+    viewer.expandToLevel(node, 1)
+  end
 end
 
 When /^I toggle tree visibility$/ do
-  Redcar::Application::ToggleTreesCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::ToggleTreesCommand.new.run
+  end
 end
 
 When "I close the tree" do
-  Redcar::Application::CloseTreeCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::CloseTreeCommand.new.run
+  end
 end
 
 When /^I switch (up|down) a tree$/ do |type|
-  case type
-  when "down"
-    Redcar::Application::SwitchTreeDownCommand.new.run
-  when "up"
-    Redcar::Application::SwitchTreeUpCommand.new.run
+  Swt.sync_exec do
+    case type
+    when "down"
+      Redcar::Application::SwitchTreeDownCommand.new.run
+    when "up"
+      Redcar::Application::SwitchTreeUpCommand.new.run
+    end
   end
 end
 
 When "I click the close button" do
-  vtabitem = focussed_window.treebook.controller.tab_folder.selection
-  swtlabel = swt_label_for_item(vtabitem)
-
-  # Make sure the close icon is showing
-  FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
-
-  # Fire the click event
-  FakeEvent.new(Swt::SWT::MouseUp, swtlabel,
-    :x => Swt::Widgets::VTabLabel::ICON_PADDING + 1,
-    :y => Swt::Widgets::VTabLabel::ICON_PADDING + 1)
+  Swt.sync_exec do
+    vtabitem = focussed_window.treebook.controller.tab_folder.selection
+    swtlabel = swt_label_for_item(vtabitem)
+  
+    # Make sure the close icon is showing
+    FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
+  
+    # Fire the click event
+    FakeEvent.new(Swt::SWT::MouseUp, swtlabel,
+      :x => Swt::Widgets::VTabLabel::ICON_PADDING + 1,
+      :y => Swt::Widgets::VTabLabel::ICON_PADDING + 1)
+  end
 end
 
 When /^I (?:(left|right)-)?click the (project|directory|"[^\"]*") tree tab$/ do |button, target|
-  if target =~ /(project|directory)/
-    path  = Redcar::Project::Manager.in_window(Redcar.app.focussed_window).path
-    target = File.basename(path) + "/"
+  Swt.sync_exec do
+    if target =~ /(project|directory)/
+      path  = Redcar::Project::Manager.in_window(Redcar.app.focussed_window).path
+      target = File.basename(path) + "/"
+    end
+    target.gsub!('"', '')
+    vtabitem = focussed_window.treebook.controller.tab_folder.get_item(target)
+    swtlabel = swt_label_for_item(vtabitem)
+  
+    button = (button == "right" ? 2 : 1)
+    FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
+    FakeEvent.new(Swt::SWT::MouseUp, swtlabel, :x => 1, :y => 1, :button => button)
   end
-  target.gsub!('"', '')
-  vtabitem = focussed_window.treebook.controller.tab_folder.get_item(target)
-  swtlabel = swt_label_for_item(vtabitem)
-
-  button = (button == "right" ? 2 : 1)
-  FakeEvent.new(Swt::SWT::MouseEnter, swtlabel)
-  FakeEvent.new(Swt::SWT::MouseUp, swtlabel, :x => 1, :y => 1, :button => button)
 end
 
 Then /^I should (not )?see "([^\"]*)" in the tree$/ do |negate, rows|
-  item_names = visible_tree_items(top_tree).map(&:get_text)
-  rows.split(',').map(&:strip).each do |row|
-    if negate
-      item_names.should_not include row
-    else
-      item_names.should include row
+  Swt.sync_exec do
+    item_names = visible_tree_items(top_tree).map(&:get_text)
+    rows.split(',').map(&:strip).each do |row|
+      if negate
+        item_names.should_not include row
+      else
+        item_names.should include row
+      end
     end
   end
 end
 
 Then /^there should (not )?be a tree titled "([^\"]*)"$/ do |negate,title|
-  if negate
-    tree_with_title(title).should == nil
-  else
-    tree_with_title(title).should_not == nil
+  Swt.sync_exec do
+    if negate
+      tree_with_title(title).should == nil
+    else
+      tree_with_title(title).should_not == nil
+    end
   end
 end
 
 Then /^the focussed tree should be titled "([^\"]*)"$/ do |title|
-  focussed_tree.title.should == title
+  Swt.sync_exec do
+    focussed_tree.title.should == title
+  end
 end
 
 Then /^the tree width should be (the default|\d+ pixels|the minimum size)$/ do |w|
-  width = focussed_treebook_width
-  if w == "the default"
-    unless width == default_treebook_width
-      raise "The tree width was #{width}, expected #{default_treebook_width}"
+  Swt.sync_exec do
+    width = focussed_treebook_width
+    if w == "the default"
+      unless width == default_treebook_width
+        raise "The tree width was #{width}, expected #{default_treebook_width}"
+      end
+    elsif w == "the minimum size"
+      width.should == Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
+    else
+      width.should == w.split(" ")[0].to_i
     end
-  elsif w == "the minimum size"
-    width.should == Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
-  else
-    width.should == w.split(" ")[0].to_i
   end
 end
 
 When /^I activate the "([^"]*)" node in the tree$/ do |node_text|
-  controller = focussed_tree.tree_controller
-  model      = focussed_tree.controller.model
-  mirror     = focussed_tree.tree_mirror
-  node       = find_node_with_text(mirror.top, node_text)
-
-  node.should_not be_nil
-
-  controller.activated(model, node)
+  Swt.sync_exec do
+    controller = focussed_tree.tree_controller
+    model      = focussed_tree.controller.model
+    mirror     = focussed_tree.tree_mirror
+    node       = find_node_with_text(mirror.top, node_text)
+  
+    node.should_not be_nil
+  
+    controller.activated(model, node)
+  end
 end
 
 When /^I rename the "([^"]*)" node in the tree$/ do |node_text|
-  controller = focussed_tree.tree_controller
-  mirror     = focussed_tree.tree_mirror
-  node       = find_node_with_text(mirror.top, node_text)
-
-  node.should_not be_nil
-  controller.single_rename(focussed_tree, node)
+  Swt.sync_exec do
+    controller = focussed_tree.tree_controller
+    mirror     = focussed_tree.tree_mirror
+    node       = find_node_with_text(mirror.top, node_text)
+  
+    node.should_not be_nil
+    controller.single_rename(focussed_tree, node)
+  end
 end

data/plugins/application/features/step_definitions/window_steps.rb

@@ -1,17 +1,21 @@
 
 Then /^the window should have title "([^\"]*)"$/ do |expected_title|
-  active_shell.get_text.should == expected_title
+  Swt.sync_exec do
+    active_shell.get_text.should == expected_title
+  end
 end
 
 When /^I set the treebook width to (the default|only a few pixels|the minimum width|\d+ pixels)$/ do |w|
-  if w == "only a few pixels"
-    width = 10
-  elsif w == "the minimum width"
-    width = Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
-  elsif w == "the default"
-    width = default_treebook_width
-  else
-    width = w.split(" ")[0].to_i
+  Swt.sync_exec do
+    if w == "only a few pixels"
+      width = 10
+    elsif w == "the minimum width"
+      width = Redcar::ApplicationSWT::Window::MINIMUM_TREEBOOK_WIDTH
+    elsif w == "the default"
+      width = default_treebook_width
+    else
+      width = w.split(" ")[0].to_i
+    end
+    focussed_window.controller.send(:set_sash_widths, width)
   end
-  focussed_window.controller.send(:set_sash_widths, width)
 end

data/plugins/application/features/support/env.rb

@@ -1,3 +1,4 @@
+
 require File.expand_path("../fake_event", __FILE__)
 
 class TestingError < StandardError
@@ -7,89 +8,6 @@ def get_menu_name text
   Redcar::Menu.parse(text)
 end
 
-module SwtHelper
-  def main_menu
-    display = Redcar::ApplicationSWT.display
-    shell   = display.get_shells.to_a.first
-    menu_bar = shell.get_menu_bar
-    menu_bar
-  end
-
-  def first_shell
-    Redcar::ApplicationSWT.display.get_shells.to_a.first
-  end
-
-  def active_shell
-    focussed_window.controller.shell
-  end
-
-  def focussed_window
-    Redcar.app.focussed_window
-  end
-
-  def focussed_treebook_width
-    Redcar.app.focussed_window.controller.treebook_width
-  end
-
-  def focussed_tree
-    focussed_window.treebook.focussed_tree
-  end
-
-  def default_treebook_width
-    Redcar.app.focussed_window.controller.default_treebook_width
-  end
-
-  def tree_with_title(title)
-    focussed_window.treebook.trees.detect {|t| t.tree_mirror.title == title }
-  end
-
-  def dialog(type)
-    dialogs.detect {|d| d.is_a?(type) }
-  end
-
-  def dialogs
-    Redcar::ApplicationSWT.display.get_shells.to_a.map do |s|
-      Redcar::ApplicationSWT.shell_dialogs[s]
-    end.compact
-  end
-
-  def visible_tree_items(tree, items = [])
-    tree.getItems.to_a.each do |item|
-      items << item
-      visible_tree_items(item, items) if item.expanded?
-    end
-    return items
-  end
-
-  def top_tree
-    tree = focussed_tree.controller.viewer.get_tree
-    tree.extend(TreeHelpers)
-    tree
-  end
-
-  def find_node_with_text(top, node_text)
-    node = top.detect { |node| node.text == node_text }
-    return node if node
-    all_children = top.map{ |node| node.children }.flatten
-    find_node_with_text(all_children, node_text) unless all_children.empty?
-  end
-
-  def swt_label_for_item(vtabitem)
-    vtablabel = vtabitem.instance_variable_get "@label"
-    vtablabel.instance_variable_get "@label"
-  end
-
-  module TreeHelpers
-    def items
-      getItems.to_a
-    end
-
-    def item_texts
-      getItems.to_a.map {|item| item.getText}
-    end
-  end
-end
-
 class FakeDialogAdapter
   def initialize
     @responses = {}
@@ -192,6 +110,90 @@ class FakeDialogAdapter
   end
 end
 
+module SwtHelper
+  
+  def main_menu
+    display = Redcar::ApplicationSWT.display
+    shell   = display.get_shells.to_a.first
+    menu_bar = shell.get_menu_bar
+    menu_bar
+  end
+
+  def first_shell
+    Redcar::ApplicationSWT.display.get_shells.to_a.first
+  end
+
+  def active_shell
+    focussed_window.controller.shell
+  end
+
+  def focussed_window
+    Redcar.app.focussed_window
+  end
+
+  def focussed_treebook_width
+    Redcar.app.focussed_window.controller.treebook_width
+  end
+
+  def focussed_tree
+    focussed_window.treebook.focussed_tree
+  end
+
+  def default_treebook_width
+    Redcar.app.focussed_window.controller.default_treebook_width
+  end
+
+  def tree_with_title(title)
+    focussed_window.treebook.trees.detect {|t| t.tree_mirror.title == title }
+  end
+
+  def dialog(type)
+    dialogs.detect {|d| d.is_a?(type) }
+  end
+
+  def dialogs
+    Redcar::ApplicationSWT.display.get_shells.to_a.map do |s|
+      Redcar::ApplicationSWT.shell_dialogs[s]
+    end.compact
+  end
+
+  def visible_tree_items(tree, items = [])
+    tree.getItems.to_a.each do |item|
+      items << item
+      visible_tree_items(item, items) if item.expanded?
+    end
+    return items
+  end
+
+  def top_tree
+    tree = focussed_tree.controller.viewer.get_tree
+    tree.extend(TreeHelpers)
+    tree
+  end
+
+  def find_node_with_text(top, node_text)
+    node = top.detect { |node| node.text == node_text }
+    return node if node
+    all_children = top.map{ |node| node.children }.flatten
+    find_node_with_text(all_children, node_text) unless all_children.empty?
+  end
+
+  def swt_label_for_item(vtabitem)
+    vtablabel = vtabitem.instance_variable_get "@label"
+    vtablabel.instance_variable_get "@label"
+  end
+
+  module TreeHelpers
+    def items
+      getItems.to_a
+    end
+
+    def item_texts
+      getItems.to_a.map {|item| item.getText}
+    end
+  end
+end
+
 World(SwtHelper)
 
 def close_everything