redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/edit_view/features/step_definitions/grammar_steps.rb

@@ -1,4 +1,8 @@
+
 When /^I switch the language to (.*)$/ do |language|
-  Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.grammar = language
+  puts "this should use menus rather than setting it directly"
+  Swt.sync_exec do
+    Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.grammar = language
+  end
 end
 

data/plugins/edit_view/features/step_definitions/notebook_steps.rb

@@ -1,13 +1,13 @@
 
 module NotebookSwtHelper
-  def notebook_sash
+  def notebook_sash(shell=active_shell)
     Redcar.app.show_toolbar = false
     Redcar.app.refresh_toolbar!
-    active_shell.children.to_a.last.children.to_a[0]
+    shell.children.to_a[2].children.to_a[0]
   end
   
-  def ctab_folders
-    notebook_sash.children.to_a.select do |c| 
+  def ctab_folders(shell=active_shell)
+    notebook_sash(shell).children.to_a.select do |c| 
       c.class == Java::OrgEclipseSwtCustom::CTabFolder
     end
   end
@@ -16,44 +16,58 @@ end
 World(NotebookSwtHelper)
 
 When /^I make a new notebook$/ do
-  Redcar::Application::OpenNewNotebookCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::OpenNewNotebookCommand.new.run
+  end
 end
 
 When /^I move the tab to the other notebook$/ do
-  Redcar::Application::MoveTabToOtherNotebookCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::MoveTabToOtherNotebookCommand.new.run
+  end
 end
 
 When /^I close the current notebook$/ do
-  Redcar::Application::CloseNotebookCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::CloseNotebookCommand.new.run
+  end
 end
 
 When /^I switch notebooks$/ do
-  Redcar::Application::SwitchNotebookCommand.new.run
+  Swt.sync_exec do
+    Redcar::Application::SwitchNotebookCommand.new.run
+  end
 end
 
 Then /^there should be (one|two) notebooks?$/ do |count_str|
-  count = count_str == "one" ? 1 : 2
-  # in the model
-  Redcar.app.windows.first.notebooks.length.should == count
-  
-  # in the GUI
-  ctab_folders.length.should == count
+  Swt.sync_exec do
+    count = count_str == "one" ? 1 : 2
+    # in the model
+    Redcar.app.windows.first.notebooks.length.should == count
+    
+    # in the GUI
+    ctab_folders.length.should == count
+  end
 end
 
 
 Then /^notebook (\d) should have (\d) tabs?$/ do |index, tab_count|
-  index = index.to_i - 1
-  # in the model
-  Redcar.app.windows.first.notebooks[index].tabs.length.should == tab_count.to_i
-  
-  # in the GUI
-  ctab_folders[index].children.to_a.length.should == tab_count.to_i
+  Swt.sync_exec do
+    index = index.to_i - 1
+    # in the model
+    Redcar.app.windows.first.notebooks[index].tabs.length.should == tab_count.to_i
+    
+    # in the GUI
+    ctab_folders[index].children.to_a.length.should == tab_count.to_i
+  end
 end
 
 Then /^the tab in notebook (\d) should contain "([^\"]*)"$/ do |index, str|
-  index = index.to_i - 1
-  # in the model
-  tab = Redcar.app.windows.first.notebooks[index].focussed_tab
-  tab.edit_view.document.to_s.include?(str).should be_true
+  Swt.sync_exec do
+    index = index.to_i - 1
+    # in the model
+    tab = Redcar.app.windows.first.notebooks[index].focussed_tab
+    tab.edit_view.document.to_s.include?(str).should be_true
+  end
 end
 

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -3,51 +3,77 @@ When /^I do nothing$/ do
 end
 
 Given /^there is an edit tab containing "([^\"]*)"$/ do |contents|
-  tab = Redcar::Top::OpenNewEditTabCommand.new.run
-  contents = eval(contents.inspect.gsub("\\\\", "\\"))
-  cursor_offset = (contents =~ /<c>/)
-  contents = contents.gsub("<c>", "")
-  tab.edit_view.document.text = contents
-  if cursor_offset
-    tab.edit_view.document.cursor_offset = cursor_offset
+  Swt.sync_exec do
+    tab = Redcar::Top::OpenNewEditTabCommand.new.run
+    contents = eval(contents.inspect.gsub("\\\\", "\\"))
+    cursor_offset = (contents =~ /<c>/)
+    contents = contents.gsub("<c>", "")
+    tab.edit_view.document.text = contents
+    if cursor_offset
+      tab.edit_view.document.cursor_offset = cursor_offset
+    end
   end
 end
 
 When /^I open a new edit tab$/ do
-  tab = Redcar::Top::OpenNewEditTabCommand.new.run
+  Swt.bot.menu("File").menu("New").click
 end
 
 When /^I open a new edit tab titled "(.*)"$/ do |title|
-  tab = Redcar::Top::OpenNewEditTabCommand.new.run
-  tab.title = title
+  Swt.sync_exec do
+    tab = Redcar::Top::OpenNewEditTabCommand.new.run
+    tab.title = title
+  end
 end
 
 When /^I close the focussed tab$/ do
-  Redcar::Application::CloseTabCommand.new.run
+  Swt.bot.menu("File").menu("Close Tab").click
 end
 
 When /^the edit tab updates its contents$/ do
-  implicit_edit_view.check_for_updated_document
+  Swt.sync_exec do
+    implicit_edit_view.check_for_updated_document
+  end
 end
 
 When /I switch (up|down) a tab/ do |type|
-  case type
-  when "down"
-    Redcar::Application::SwitchTabDownCommand.new.run
-  when "up"
-    Redcar::Application::SwitchTabUpCommand.new.run
+  Swt.sync_exec do
+    case type
+    when "down"
+      Redcar::Application::SwitchTabDownCommand.new.run
+    when "up"
+      Redcar::Application::SwitchTabUpCommand.new.run
+    end
   end
 end
 
 When /I move (up|down) a tab/ do |type|
-  case type
-  when "down"
-    Redcar::Application::MoveTabDownCommand.new.run
-  when "up"
-    Redcar::Application::MoveTabUpCommand.new.run
+  Swt.sync_exec do
+    case type
+    when "down"
+      Redcar::Application::MoveTabDownCommand.new.run
+    when "up"
+      Redcar::Application::MoveTabUpCommand.new.run
+    end
+  end
+end
+
+module SwtbotHelpers
+
+  def get_tab_folders(shell=active_shell)
+    tab_folders = notebook_sash(shell).children.to_a.select do |c|
+      c.class == Java::OrgEclipseSwtCustom::CTabFolder
+    end
+  end
+  
+  def get_tab_folder
+    get_tab_folders.length.should == 1
+    get_tab_folders.first
   end
 end
 
+World(SwtbotHelpers)
+
 Then /^there should be (one|\d+) (.*) tabs?$/ do |num, tab_type|
   if num == "one"
     num = 1
@@ -58,56 +84,68 @@ Then /^there should be (one|\d+) (.*) tabs?$/ do |num, tab_type|
   # in the model
   tabs = Redcar.app.focussed_window.notebooks.map {|nb| nb.tabs }.flatten
   tabs.length.should == num
-
+  
   # in the GUI
-  case tab_type
-  when "edit"
-    tab_class = Redcar::EditTab
+  Swt.sync_exec do
+    get_tab_folder.children.to_a.length.should == num
   end
-
-  tabs = get_tabs
-  tabs.length.should == num
 end
 
 Then /^the edit tab should have the focus$/ do
-  implicit_edit_view.controller.mate_text.get_text_widget.is_focus_control?.should be_true
+  Swt.sync_exec do
+    implicit_edit_view.controller.mate_text.get_text_widget.is_focus_control?.should be_true
+  end
 end
 
 Then /^there should be no open tabs$/ do
-  get_tab_folder.getItems.to_a.length.should == 0
+  Swt.sync_exec { get_tab_folder.getItems.to_a.length.should == 0 }
 end
 
 Then /^the tab should be focussed within the notebook$/ do
-  tab_folder = get_tab_folder
-  tab_folder.get_selection.should == tab_folder.getItems.to_a.first
+  Swt.sync_exec do
+    tab_folder = get_tab_folder
+    tab_folder.get_selection.should == tab_folder.getItems.to_a.first
+  end
 end
 
 Then /^the tab should have the keyboard focus$/ do
-  tab = get_tab(get_tab_folder)
-  implicit_edit_view.controller.is_current?.should be_true
+  Swt.sync_exec do
+    tab = get_tab(get_tab_folder)
+    implicit_edit_view.controller.is_current?.should be_true
+  end
 end
 
 Then /^I should (not )?see "(.*)" in the edit tab$/ do |bool, content|
-  content = content.gsub("\\n", "\n")
-  bool = !bool
-  matcher = bool ? be_true : be_false
-  implicit_edit_view.document.to_s.include?(content).should matcher
+  Swt.sync_exec do
+    content = content.gsub("\\n", "\n")
+    bool = !bool
+    matcher = bool ? be_true : be_false
+    implicit_edit_view.document.to_s.include?(content).should matcher
+  end
 end
 
 Then /^my active tab should be "([^"]*)"$/ do |name|
-  focussed_tab.title.should == name
+  Swt.sync_exec do
+    focussed_tab.title.should == name
+  end
 end
 
 Then /^my active tab should have an "([^"]*)" icon$/ do |arg1|
-  focussed_tab.icon.should == :"#{arg1}"
+  Swt.sync_exec do
+    focussed_tab.icon.should == :"#{arg1}"
+  end
 end
 
 Then /^the tab should (not )?have annotations$/ do |negated|
-  annotations = implicit_edit_view.annotations
-  negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+  Swt.sync_exec do
+    annotations = implicit_edit_view.annotations
+    negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+  end
 end
 
 Then /^the tab should (not )?have an annotation on line (\d+)$/ do |negated, num|
-  annotations = implicit_edit_view.annotations(:line => num.to_i)
-  negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+  Swt.sync_exec do
+    annotations = implicit_edit_view.annotations(:line => num.to_i)
+    negated ? (annotations.should be_empty) : (annotations.should_not be_empty)
+  end
 end

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

@@ -1,59 +1,73 @@
 Then /^there should be (no|one|\d+) windows?$/ do |num|
-  case num
-  when "no"
-    num = 0
-  when "one"
-    num = 1
-  else
-    num = num.to_i
+  Swt.sync_exec do
+    case num
+    when "no"
+      num = 0
+    when "one"
+      num = 1
+    else
+      num = num.to_i
+    end
+    
+    # in the model
+    Redcar.app.windows.length.should == num
+    
+    # in the gui
+    display = Swt::Widgets::Display.get_current
+    shells  = display.get_shells.to_a
+    
+    # on OSX there is always an invisible window
+    diff = Redcar.platform == :osx ? 1 : 0
+    
+    shells.length.should == num + diff
   end
-  
-  # in the model
-  Redcar.app.windows.length.should == num
-  
-  # in the gui
-  display = Swt::Widgets::Display.get_current
-  shells  = display.get_shells.to_a
-  
-  # on OSX there is always an invisible window
-  diff = Redcar.platform == :osx ? 1 : 0
-  
-  shells.length.should == num + diff
 end
 
 When /I open a new window(?: with title "(.*)")?/ do |title|
-  Redcar::Application::OpenNewWindowCommand.new(title).run
+  Swt.sync_exec do
+    Redcar::Application::OpenNewWindowCommand.new(title).run
+  end
 end
 
 When /^I maximize the window size$/ do
-  Redcar.app.focussed_window.controller.shell.maximized = true
+  Swt.sync_exec do
+    Redcar.app.focussed_window.controller.shell.maximized = true
+  end
 end
 
 When /^I restore the window size$/ do
-  Redcar.app.focussed_window.controller.shell.maximized = false
+  Swt.sync_exec do
+    Redcar.app.focussed_window.controller.shell.maximized = false
+  end
 end
 
 When /I close the window(?: "(.*)")?( with a command| through the gui)?/ do |title, how|
-  if title
-    win = Redcar.app.windows.detect{|win| win.title == title }
-  else
-    win = Redcar.app.focussed_window
-  end
-  if how =~ /command/
-    Redcar::Application::CloseWindowCommand.new(win).run
-  else
-    FakeEvent.new(Swt::SWT::Close, win.controller.shell)
+  Swt.sync_exec do
+    if title
+      win = Redcar.app.windows.detect{|win| win.title == title }
+    else
+      win = Redcar.app.focussed_window
+    end
+    if how =~ /command/
+      Redcar::Application::CloseWindowCommand.new(win).run
+    else
+      FakeEvent.new(Swt::SWT::Close, win.controller.shell)
+    end
   end
 end
 
 When /^I focus the window "([^\"]*)" with a command$/ do |title|
-  win = Redcar.app.windows.detect{|win| win.title == title }
-  win.focus
+  Swt.sync_exec do
+    win = Redcar.app.windows.detect{|win| win.title == title }
+    win.focus
+  end
 end
 
 When /^I focus the window "([^\"]*)" through the gui$/ do |title|
-  win = Redcar.app.windows.detect{|win| win.title == title }
-  FakeEvent.new(Swt::SWT::Activate, win.controller.shell)
+  Swt.sync_exec do
+    win = Redcar.app.windows.detect{|win| win.title == title }
+    FakeEvent.new(Swt::SWT::Activate, win.controller.shell)
+  end
 end
 
 When /^I focus the working directory window through the gui$/ do
@@ -61,26 +75,33 @@ When /^I focus the working directory window through the gui$/ do
 end
 
 Then /^the window should be titled "([^\"]*)"$/ do |title|
-  windows = Redcar.app.windows
-  windows.length.should == 1
-  
-  # in the model
-  windows.first.title.should == title
-  # in the gui
-  windows.first.controller.shell.text.should == title
+  Swt.sync_exec do
+    windows = Redcar.app.windows
+    windows.length.should == 1
+    
+    # in the model
+    windows.first.title.should == title
+    # in the gui
+    windows.first.controller.shell.text.should == title
+  end
 end
 
 Then /the window "(.*)" should have (\d+) tabs?/ do |win_title, tab_num|
-  tab_num = tab_num.to_i
-
-  # in the model
-  Redcar.app.windows.detect{|win| win.title == win_title }.notebooks.map{|nb| nb.tabs}.flatten.length.should == tab_num
-  
-  # in the GUI
-  display = Swt::Widgets::Display.get_current
-  shells = display.get_shells.to_a
-  shell = shells.detect {|s| s.text == win_title }
-  items = get_tab_folders(shell).map{|f| f.getItems.to_a}.flatten
+  Swt.sync_exec do
+    tab_num = tab_num.to_i
   
-  items.map {|i| model_tab_for_item(i)}.length.should == tab_num
-end
+    # in the model
+    Redcar.app.windows.detect{|win| win.title == win_title }.notebooks.map{|nb| nb.tabs}.flatten.length.should == tab_num
+    
+    # in the GUI
+    display = Swt::Widgets::Display.get_current
+    shells = display.get_shells.to_a
+    shell = shells.detect {|s| s.text == win_title }
+    items = get_tab_folders(shell).map{|f| f.getItems.to_a}.flatten
+    
+    items.map {|i| model_tab_for_item(i)}.length.should == tab_num
+  end
+end
+
+
+