test/sample.rb in ox-1.4.6 vs test/sample.rb in ox-1.5.0

@@ -6,41 +6,40 @@
   $: << '../lib'
   $: << '../ext'
 end
 
 require 'pp'
-require 'ox'
-require 'test/ox/doc'
+require 'sample/doc'
 
 
 def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
 
-  d = ::Test::Ox::Doc.new('Sample')
+  d = ::Sample::Doc.new('Sample')
 
   # add some history
   (0..size * 10).each do |i|
     d.add_change("Changed at t+#{i}.")
   end
 
   # add some layers
   (1..size).each do |i|
-    layer = ::Test::Ox::Layer.new("Layer-#{i}")
+    layer = ::Sample::Layer.new("Layer-#{i}")
     (1..size).each do |j|
-      g = ::Test::Ox::Group.new
+      g = ::Sample::Group.new
       (1..size).each do |k|
-        g2 = ::Test::Ox::Group.new
-        r = ::Test::Ox::Rect.new(j * 40 + 10.0, i * 10.0,
+        g2 = ::Sample::Group.new
+        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
                                  10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
         r.add_prop(:part_of, layer.name)
         g2 << r
-        g2 << ::Test::Ox::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
+        g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
         g << g2
       end
-      g2 = ::Test::Ox::Group.new
+      g2 = ::Sample::Group.new
       (1..size).each do |k|
-        o = ::Test::Ox::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
+        o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
                                  6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o
       end
       g << g2
@@ -50,13 +49,7 @@
   end
 
   # some properties
   d.add_prop(:purpose, 'an example')
 
-  #pp d
-  #Ox.dump(d, :indent => 0)
   d
-end
-
-if $0 == __FILE__
-  File.open('foo.xml', "w") { |f| f.write(Ox.dump(sample_doc(3), :indent => 2)) }
 end