test/template_set_test.rb in osheet-0.7.0 vs test/template_set_test.rb in osheet-0.8.0

@@ -1,95 +1,74 @@
-require "test/helper"
+require "assert"
 require "osheet/template_set"
 
 module Osheet
-  class TemplateSetTest < Test::Unit::TestCase
+  class TemplateSetTest < Assert::Context
+    desc "Osheet::TemplateSet"
+    before { @set = TemplateSet.new }
+    subject { @set }
 
-    context "Osheet::TemplateSet" do
-      subject { TemplateSet.new }
+    should "be a PartialSet" do
+      assert_kind_of PartialSet, subject
+    end
 
-      should "be a PartialSet" do
-        assert_kind_of PartialSet, subject
+    should "verify set objs are templates" do
+      assert_raises ArgumentError do
+        subject.send(:verify, {})
       end
-
-      should "verify set objs are templates" do
-        assert_raises ArgumentError do
-          subject.send(:verify, {})
-        end
-        assert_nothing_raised do
-          subject.send(:verify, Template.new(:row, :poo) {})
-        end
+      assert_nothing_raised do
+        subject.send(:verify, Template.new(:row, :poo) {})
       end
+    end
 
+    should "key templates using an array of their element and name" do
+      assert_equal ['row','poo'], subject.send(:key, :row, :poo)
     end
-  end
 
-  class TemplateSetKeyTest < Test::Unit::TestCase
-    context "A template set" do
-      subject { TemplateSet.new }
+    should "key on templates objs" do
+      assert_equal ['row', 'poo'], subject.send(:template_key, Template.new(:row, :poo) {})
+    end
 
-      should "key templates using an array of their element and name" do
-        assert_equal ['row','poo'], subject.send(:key, :row, :poo)
-      end
-
-      should "key on templates objs" do
-        assert_equal ['row', 'poo'], subject.send(:template_key, Template.new(:row, :poo) {})
-      end
-
-      should "init the key in the set when verifying" do
-        key = subject.send(:verify, Template.new(:row, :poo) {})
-        assert_equal ['row', 'poo'], key
-        assert_equal({
-          key.first => { key.last => nil }
-        }, subject)
-      end
-
+    should "init the key in the set when verifying" do
+      key = subject.send(:verify, Template.new(:row, :poo) {})
+      assert_equal ['row', 'poo'], key
+      assert_equal({
+        key.first => { key.last => nil }
+      }, subject)
     end
-  end
 
-  class TemplateSetPushTest < Test::Unit::TestCase
-    context "A template set" do
-      subject { TemplateSet.new }
-      should "push templates onto the set" do
-        assert_nothing_raised do
-          subject << Template.new(:row, :poo) {}
-          subject << Template.new(:row, :not_poo) {}
-          subject << Template.new(:column, :awesome) {}
-          subject << Template.new(:column, :not_awesome) {}
-        end
-
-        assert_equal 2, subject.keys.size
-        assert subject["row"]
-        assert_equal 2, subject["row"].keys.size
-        assert subject["row"]["poo"]
-        assert_kind_of Template, subject["row"]["poo"]
-        assert subject["row"]["not_poo"]
-        assert_kind_of Template, subject["row"]["not_poo"]
-        assert subject["column"]
-        assert_equal 2, subject["column"].keys.size
-        assert subject["column"]["awesome"]
-        assert_kind_of Template, subject["column"]["awesome"]
-        assert subject["column"]["not_awesome"]
-        assert_kind_of Template, subject["column"]["not_awesome"]
+    should "push templates onto the set" do
+      assert_nothing_raised do
+        subject << Template.new(:row, :poo) {}
+        subject << Template.new(:row, :not_poo) {}
+        subject << Template.new(:column, :awesome) {}
+        subject << Template.new(:column, :not_awesome) {}
       end
 
+      assert_equal 2, subject.keys.size
+      assert subject["row"]
+      assert_equal 2, subject["row"].keys.size
+      assert subject["row"]["poo"]
+      assert_kind_of Template, subject["row"]["poo"]
+      assert subject["row"]["not_poo"]
+      assert_kind_of Template, subject["row"]["not_poo"]
+      assert subject["column"]
+      assert_equal 2, subject["column"].keys.size
+      assert subject["column"]["awesome"]
+      assert_kind_of Template, subject["column"]["awesome"]
+      assert subject["column"]["not_awesome"]
+      assert_kind_of Template, subject["column"]["not_awesome"]
     end
-  end
 
-  class TemplateSetLookupTest < Test::Unit::TestCase
-    context "A template set" do
-      subject { TemplateSet.new }
+    should "lookup a template by element, name" do
+      t = Template.new(:row, :poo) {}
+      subject << t
+      assert_equal t, subject.get(:row, :poo)
+      assert_equal t, subject.get('row', 'poo')
 
-      should "lookup a template by element, name" do
-        t = Template.new(:row, :poo) {}
-        subject << t
-        assert_equal t, subject.get(:row, :poo)
-        assert_equal t, subject.get('row', 'poo')
-
-        assert_equal nil, subject.get(:row, :ugh)
-        assert_equal nil, subject.get(:col, :ugh)
-      end
-
+      assert_equal nil, subject.get(:row, :ugh)
+      assert_equal nil, subject.get(:col, :ugh)
     end
+
   end
 
 end