shoes-swt 4.0.0.pre2 → 4.0.0.pre3

data/spec/{swt_shoes → shoes/swt}/color_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::ColorFactory do
   let(:blue)     { Shoes::COLORS[:blue] }

data/spec/{swt_shoes → shoes/swt}/color_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Color do
   subject(:color) { Shoes::Swt::Color.create(Shoes::COLORS[:salmon]) }

data/spec/{swt_shoes → shoes/swt}/common/painter_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Common::Painter do
   let(:object) {double 'object', dsl: dsl}

data/spec/{swt_shoes → shoes/swt}/common/remove_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Common::Remove do
   let(:clazz)  {
@@ -15,22 +15,15 @@ describe Shoes::Swt::Common::Remove do
     end
   }
 
-  let(:app)  { double("app", clickable_elements: clickable_elements) }
+  let(:app)  { double("app", click_listener: click_listener) }
   let(:dsl)  { double("dsl") }
-  let(:clickable_elements) { [dsl] }
+  let(:click_listener) { double("click listener") }
 
   subject { clazz.new(app, dsl) }
 
   before do
     expect(app).to receive(:remove_paint_listener)
-    expect(app).to receive(:remove_listener).at_least(:once)
-  end
-
-  describe "remove" do
-    it "cleans up clickable element" do
-      subject.remove
-      expect(clickable_elements).to be_empty
-    end
+    expect(click_listener).to receive(:remove_listeners_for).at_least(:once)
   end
 
   describe "real disposal" do

data/spec/{swt_shoes → shoes/swt}/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Configuration do
   context ":swt" do

data/spec/{swt_shoes → shoes/swt}/dialog_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 main_object = self
 
@@ -69,12 +69,6 @@ describe Shoes::Swt::Dialog do
     end
   end
 
-  describe 'ask' do
-    it 'responds to it' do
-      expect(@dialog).to respond_to :ask
-    end
-  end
-
   describe 'ask_color' do
     it 'responds to it' do
       expect(@dialog).to respond_to :ask_color

data/spec/{swt_shoes → shoes/swt}/flow_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Flow do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/font_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Font do
 

data/spec/{swt_shoes → shoes/swt}/gradient_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Gradient do
   let(:color1) { Shoes::Color.create(Shoes::COLORS[:honeydew]) }

data/spec/{swt_shoes → shoes/swt}/image_pattern_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::ImagePattern do
   let(:dsl)         { Shoes::ImagePattern.new("some/path/to") }

data/spec/{swt_shoes → shoes/swt}/image_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Image do
   include_context "swt app"
@@ -13,7 +13,8 @@ describe Shoes::Swt::Image do
   let(:top) { 200 }
   let(:height) { nil }
   let(:width) {nil}
-  let(:image) { "spec/swt_shoes/minimal.png" }
+  let(:image_path) { File.dirname(__FILE__) + '/minimal.png' }
+  let(:image) { image_path }
 
   subject {
     allow(dsl).to receive(:file_path) { image }
@@ -41,7 +42,7 @@ describe Shoes::Swt::Image do
   end
 
   describe "painting raw images" do
-    let(:image) { File.read("spec/swt_shoes/minimal.png", :mode => "rb") }
+    let(:image) { File.read(image_path, :mode => "rb") }
 
     specify "loads image from raw data" do
       subject.real.image_data.width = 3

data/spec/{swt_shoes → shoes/swt}/input_box_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::InputBox do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/integration_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::App do
   before :each do

data/spec/{swt_shoes → shoes/swt}/key_listener_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Keypress do
   let(:app) { double('app', add_key_listener: nil, remove_key_listener: nil) }

data/spec/{swt_shoes → shoes/swt}/line_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Line do
   include_context "swt app"
@@ -17,11 +17,6 @@ describe Shoes::Swt::Line do
     its(:dsl) { is_expected.to be(dsl) }
   end
 
-  it "properly disposes" do
-    expect(subject.transform).to receive(:dispose)
-    subject.dispose
-  end
-
   it_behaves_like "paintable"
   it_behaves_like "updating visibility"
   it_behaves_like "clickable backend"
@@ -35,14 +30,15 @@ describe Shoes::Swt::Line do
     subject { Shoes::Swt::Line::Painter.new(shape) }
 
     before(:each) do
+      dsl.absolute_left = point_a.x
+      dsl.absolute_top  = point_a.y
       allow(dsl).to receive_messages(positioned?: true)
     end
 
     it_behaves_like "stroke painter"
 
     specify "draws line" do
-      # coords as if drawn in box at (0,0)
-      expect(gc).to receive(:draw_line).with(0, 90, 290, 0)
+      expect(gc).to receive(:draw_line).with(10, 100, 300, 10)
       subject.paint_control(event)
     end
   end

data/spec/{swt_shoes → shoes/swt}/link_segment_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::LinkSegment do
   let(:range)         { (2..10) }

data/spec/{swt_shoes → shoes/swt}/link_spec.rb

@@ -1,9 +1,9 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Link do
   include_context "swt app"
 
-  let(:dsl) { Shoes::Link.new shoes_app, parent, ["linky"] }
+  let(:dsl) { Shoes::Link.new shoes_app, ["linky"] }
 
   subject { Shoes::Swt::Link.new(dsl, swt_app) }
 
@@ -21,13 +21,6 @@ describe Shoes::Swt::Link do
                                 element_left: 0, element_top: 0,
                                 layout: inner_layout) }
 
-    before(:each) do
-      allow(shoes_app).to receive(:add_listener)
-      allow(shoes_app).to receive(:add_clickable_element)
-
-      allow(swt_app).to receive(:clickable_elements) { [] }
-    end
-
     it "clears existing" do
       subject.link_segments << double("segment")
       subject.create_links_in([])
@@ -43,7 +36,7 @@ describe Shoes::Swt::Link do
     end
 
     it "clears links" do
-      expect(swt_app).to receive(:remove_listener)
+      expect(swt_app.click_listener).to receive(:remove_listeners_for).with(subject)
 
       subject.create_links_in([[layout, 0..10]])
       subject.remove

data/spec/{swt_shoes → shoes/swt}/list_box_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::ListBox do
   include_context "swt app"
@@ -26,8 +26,10 @@ describe Shoes::Swt::ListBox do
   end
 
   it "should call 'items' when updating values" do
-    expect(real).to receive(:items=).with(["hello"])
-    subject.update_items(["hello"])
+    subject # creation already calls update_items once
+    allow(dsl).to receive(:items).and_return ["hello"]
+    subject.update_items
+    expect(real).to have_received(:items=).with(["hello"])
   end
 
   it "should respond to choose" do

data/spec/{swt_shoes → shoes/swt}/mouse_move_listener_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::MouseMoveListener do
   let(:app) {double 'SWT App', dsl: dsl_app, shell: shell,

data/spec/{swt_shoes → shoes/swt}/oval_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Oval do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/progress_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Progress do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/radio_group_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::RadioGroup do
   let(:name) { "Group Name" }

data/spec/{swt_shoes → shoes/swt}/radio_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Radio do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/rect_painter_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::RectPainter do
   include_context "painter context"

data/spec/{swt_shoes → shoes/swt}/rect_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Rect do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/shape_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Shape do
   include_context "swt app"

data/spec/shoes/swt/shared_examples/clickable.rb

@@ -0,0 +1,13 @@
+shared_examples 'clickable backend' do
+  describe 'interaction with the swt app object' do
+    it 'adds a listener for the MouseDown event when click is called' do
+      subject.click Proc.new {}
+      expect(click_listener).to have_received(:add_click_listener).at_least(1)
+    end
+
+    it 'adds a listener for the MouseUp event when release is called' do
+      subject.release Proc.new {}
+      expect(click_listener).to have_received(:add_release_listener).at_least(1)
+    end
+  end
+end

data/spec/{swt_shoes → shoes/swt}/shared_examples/removable.rb

@@ -5,7 +5,7 @@ shared_examples_for "removable" do
 
   it "should remove paint listener" do
     expect(swt_app).to receive(:remove_paint_listener)
-    expect(swt_app).to receive(:remove_listener).at_least(2).times
+    expect(click_listener).to receive(:remove_listeners_for)
     subject.remove
   end
 
@@ -26,14 +26,12 @@ shared_examples_for "removable native element" do
   end
 
   it "should dispose real when real is not disposed" do
-    allow(swt_app).to receive(:remove_listener)
     allow(real).to receive(:disposed?) { false }
     expect(real).to receive(:dispose)
     subject.remove
   end
 
   it "should not dispose real when real is already disposed" do
-    allow(swt_app).to receive(:remove_listener)
     allow(real).to receive(:disposed?) { true }
     expect(real).not_to receive(:dispose)
     subject.remove

data/spec/{swt_shoes → shoes/swt}/shared_examples/swt_app_context.rb

@@ -5,15 +5,23 @@
 shared_context "swt app" do
   let(:swt_app_real) { double('swt app real', disposed?: false,
                               set_visible: true) }
+
   let(:clickable_element) { double("clickable_element", delete: nil) }
+  let(:click_listener)    { double("click listener",
+                                   add_click_listener: nil,
+                                   add_release_listener: nil,
+                                   remove_listeners_for: nil) }
   let(:swt_app) do
     swt_double = double('swt app', real: swt_app_real, disposed?: false,
-                         add_paint_listener: true, remove_paint_listener: true,
-                         add_clickable_element: true, add_listener: true, remove_listener: true,
-                         flush: true, redraw: true, clickable_elements: clickable_element)
+                        add_paint_listener: true, remove_paint_listener: true,
+                        add_clickable_element: true, add_listener: true,
+                        remove_listener: true, flush: true, redraw: true,
+                        click_listener: click_listener,
+                        clickable_elements: clickable_element)
     allow(swt_double).to receive(:app).and_return(swt_double)
     swt_double
   end
+
   let(:shoes_app) { double('shoes app', gui: swt_app, rotate: 0, style: {}, element_styles: {}) }
   let(:parent) { double('parent', app: swt_app, add_child: true, real: true) }
   let(:parent_dsl) {double("parent dsl", add_child: true, contents: [],

data/spec/{swt_shoes → shoes/swt}/shell_control_listener_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::ShellControlListener do
   let(:app) {double 'SWT App', dsl: dsl_app, shell: shell, real: real}

data/spec/{swt_shoes → shoes/swt}/slot_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Slot do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'code_coverage'
 require "shoes/swt"
 require "spec_helper"
 

data/spec/{swt_shoes → shoes/swt}/star_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Star do
   include_context "swt app"

data/spec/{swt_shoes → shoes/swt}/text_block/centered_text_segment_spec.rb

@@ -1,4 +1,4 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::TextBlock::CenteredTextSegment do
   let(:width) { 200 }

data/spec/{swt_shoes → shoes/swt}/text_block/cursor_painter_spec.rb

@@ -1,10 +1,10 @@
-require 'swt_shoes/spec_helper'
+require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::TextBlock::CursorPainter do
   include_context "swt app"
 
   let(:dsl) { double("dsl", app: shoes_app, textcursor: textcursor, has_textcursor?: true) }
-  let(:textcursor) { double("textcursor", left:0, top: 0) }
+  let(:textcursor) { double("textcursor", left:0, top: 0, height: 10) }
   let(:segment_collection) { double('segment collection',
                                    cursor_height: 12,
                                    relative_text_position: 0)}
@@ -64,7 +64,9 @@ describe Shoes::Swt::TextBlock::CursorPainter do
           it "moves" do
             subject.draw
             expect(textcursor).to have_received(:move).with(left + position.x,
-                                                            top + position.y)
+                                                            top + position.y,
+                                                            left + position.x,
+                                                            top + position.y + textcursor.height)
             expect(textcursor).to have_received(:show)
           end
 
@@ -88,7 +90,9 @@ describe Shoes::Swt::TextBlock::CursorPainter do
           it "moves" do
             subject.draw
             expect(textcursor).to have_received(:move).with(left + position.x,
-                                                            top + 100 + position.y)
+                                                            top + 100 + position.y,
+                                                            left + position.x,
+                                                            top + 100 + position.y + textcursor.height)
             expect(textcursor).to have_received(:show)
           end