summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/ecore_evas_spec.rb17
-rw-r--r--spec/evas_spec.rb5
-rw-r--r--spec/helper.rb9
3 files changed, 17 insertions, 14 deletions
diff --git a/spec/ecore_evas_spec.rb b/spec/ecore_evas_spec.rb
index 17ab9ea..859e282 100644
--- a/spec/ecore_evas_spec.rb
+++ b/spec/ecore_evas_spec.rb
@@ -52,16 +52,17 @@ describe 'Efl::EcoreEvas' do
EcoreEvas.init.should == 2
end
before(:each) do
- @e = EcoreEvas::REcoreEvas.new :engine_name=>"software_x11", :x=>10, :y=>10, :w=>100, :h=>120
+ @e = EcoreEvas::REcoreEvas.new :engine_name=>"software_x11", :x=>10, :y=>10, :w=>100, :h=>120 do
+ move 10, 10
+ show
+ end
@canvas = @e.evas
- @bg = @canvas.object_rectangle_add { |o|
- o.color = 100, 100, 255, 255
- o.size = @e.size
- }
- @bg.show
+ @bg = @canvas.object_rectangle_add do
+ color_set 100, 100, 255, 255
+ show
+ end
+ @bg.size = @e.size
@e.object_associate @bg, :ecore_evas_object_associate_base
- @e.move 10, 10
- @e.show
end
after(:each) do
@e.free
diff --git a/spec/evas_spec.rb b/spec/evas_spec.rb
index f5f5859..e7dbdf9 100644
--- a/spec/evas_spec.rb
+++ b/spec/evas_spec.rb
@@ -73,8 +73,9 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do
end
#
it "should be able to create and destroy evas" do
- e1 = Evas::REvas.new
- e1.address.should_not == 0
+ e1 = Evas::REvas.new do
+ address.should_not == 0
+ end
e2 = Evas::REvas.new e1.to_ptr
e1.address.should == e2.address
(e1==e2).should be_false
diff --git a/spec/helper.rb b/spec/helper.rb
index e641c92..9bfab78 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -9,10 +9,11 @@ def realize_evas
width = 300
height = 200
@pixels = FFI::MemoryPointer.new :int, width*height
- @e = Efl::Evas::REvas.new
- @e.output_method_set Efl::Evas::render_method_lookup("buffer")
- @e.output_viewport_set 0, 0, width, height
- @e.output_size_set width, height
+ @e = Efl::Evas::REvas.new do
+ output_method_set Efl::Evas::render_method_lookup("buffer")
+ output_viewport_set 0, 0, width, height
+ output_size_set width, height
+ end
einfo = Efl::Native::EngineInfoBufferStruct.new @e.engine_info
einfo[:info][:depth_type] = Efl::Evas::EVAS_ENGINE_BUFFER_DEPTH_ARGB32
einfo[:info][:dest_buffer] = @pixels