lizarb 1.0.2 → 1.0.4

data/lib/liza/test/test_test.rb

@@ -1,201 +1,204 @@
-module Liza
-  class TestTest < Test
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :white
+class Liza::TestTest < Liza::Test
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :white
+  end
+
+  group :basics do
+    test :truths do
+      assert true
+      assert true
+      assert true
     end
 
-    group :basics do
-      test :truths do
-        assert true
-        assert true
-        assert true
-      end
+    test :falsehoods do
+      refute false
+      refute false
+      refute false
+    end
 
-      test :falsehoods do
-        refute false
-        refute false
-        refute false
-      end
+    test :assertions do
+      assert assertions == 0
+      refute assertions != 1
+      assert assertions == 2
+    end
+  end
 
-      test :assertions do
-        assert assertions == 0
-        refute assertions != 1
-        assert assertions == 2
-      end
+  group :assertions do
+    test :assert do
+      assert 0
+      assert 1
+      assert :a
+      assert "a"
+      assert ""
+      assert []
+      assert [1]
+      assert({})
+      assert({a: 1})
+      assert true
+      refute false
+      refute nil
     end
 
-    group :assertions do
-      test :assert do
-        assert 0
-        assert 1
-        assert :a
-        assert "a"
-        assert ""
-        assert []
-        assert [1]
-        assert({})
-        assert({a: 1})
-        assert true
-        refute false
-        refute nil
+    test :assert_equality do
+      assert_equality 0, 0
+      assert_equality 1, 1
+      assert_equality :a, :a
+      assert_equality "a", "a"
+      assert_equality "", ""
+      assert_equality [], []
+      assert_equality [1], [1]
+      assert_equality({}, {})
+      assert_equality({a: 1}, {a: 1})
+      assert_equality true, true
+      refute_equality false, true
+      refute_equality nil, true
+    end
+    
+    test :assert_raises do
+      assert_raises StandardError do
+        raise RuntimeError
       end
 
-      test :assert_equality do
-        assert_equality 0, 0
-        assert_equality 1, 1
-        assert_equality :a, :a
-        assert_equality "a", "a"
-        assert_equality "", ""
-        assert_equality [], []
-        assert_equality [1], [1]
-        assert_equality({}, {})
-        assert_equality({a: 1}, {a: 1})
-        assert_equality true, true
-        refute_equality false, true
-        refute_equality nil, true
+      assert_raises RuntimeError do
+        raise RuntimeError
       end
-      
-      test :assert_raises do
-        assert_raises StandardError do
-          raise RuntimeError
-        end
-
-        assert_raises RuntimeError do
-          raise RuntimeError
-        end
-
-        refute_raises RuntimeError do
-          raise StandardError
-        end
+
+      refute_raises RuntimeError do
+        raise StandardError
       end
     end
-    
-    group :instance_variables do
-      test :instance_variables do
+  end
+  
+  group :instance_variables do
+    test :instance_variables do
+      if Shell.jruby?
+        todo "jruby!"
+      else
         assert_equality instance_variables, [:@test_words, :@before_stack, :@after_stack, :@test_block]
       end
+    end
 
-      test :test_block do
-        assert_equality @test_block.source_location[1], __LINE__ - 1
-      end
+    test :test_block do
+      assert_equality @test_block.source_location[1], __LINE__ - 1
     end
+  end
 
-    group :tree do
-      test :test_tree do
-        assert_equality self.class.test_tree.class, Liza::TestTreePart::Extension
-        assert_equality self.class.test_tree, self.class.test_tree.parent
-        
-        assert_equality 2, self.class.test_tree.tests.count
-        assert_equality 5, self.class.test_tree.children.count
+  group :tree do
+    test :test_tree do
+      assert_equality self.class.test_tree.class, Liza::TestTreePart::Extension
+      assert_equality self.class.test_tree, self.class.test_tree.parent
+      
+      assert_equality 2, self.class.test_tree.tests.count
+      assert_equality 5, self.class.test_tree.children.count
 
-        assert_equality self.class.test_tree.tests.map(&:first).flatten, [:settings, :instance_groups]
-      end
+      assert_equality self.class.test_tree.tests.map(&:first).flatten, [:settings, :instance_groups]
     end
+  end
 
-    test :instance_groups do
-      assert assertions == 0
+  test :instance_groups do
+    assert assertions == 0
 
-      group do
-        assert true
-        assert true
-        assert true
-      end
+    group do
+      assert true
+      assert true
+      assert true
+    end
 
-      assert assertions == 2
+    assert assertions == 2
 
+    group do
+      assert true
       group do
         assert true
-        group do
-          assert true
-        end
-        assert true
       end
+      assert true
+    end
+
+    assert assertions == 4
+  end
 
-      assert assertions == 4
+  group :class_groups do
+    before do
+      @string = "START"
+      assert_equality @string, "START"
     end
 
-    group :class_groups do
+    test :class_groups, :outer_a do
+      @string.concat "-123"
+      assert_equality @string, "START-123"
+      #
+      @expectation_outer = "START-123-FINISH"
+    end
+
+    test :class_groups, :outer_b do
+      @string.concat "-321"
+      assert_equality @string, "START-321"
+      #
+      @expectation_outer = "START-321-FINISH"
+    end
+
+    group :class_groups_inner do
       before do
-        @string = "START"
-        assert_equality @string, "START"
+        @string.concat "-BEGIN"
+        assert_equality @string, "START-BEGIN"
       end
 
-      test :class_groups, :outer_a do
-        @string.concat "-123"
-        assert_equality @string, "START-123"
+      test :class_groups, :inner_a do
+        @string.concat "-aaa"
+        assert_equality @string, "START-BEGIN-aaa"
         #
-        @expectation_outer = "START-123-FINISH"
+        @expectation_inner = "START-BEGIN-aaa-END"
+        @expectation_outer = "START-BEGIN-aaa-END-FINISH"
       end
 
-      test :class_groups, :outer_b do
-        @string.concat "-321"
-        assert_equality @string, "START-321"
+      test :class_groups, :inner_b do
+        @string.concat "-bbb"
+        assert_equality @string, "START-BEGIN-bbb"
         #
-        @expectation_outer = "START-321-FINISH"
-      end
-
-      group :class_groups_inner do
-        before do
-          @string.concat "-BEGIN"
-          assert_equality @string, "START-BEGIN"
-        end
-
-        test :class_groups, :inner_a do
-          @string.concat "-aaa"
-          assert_equality @string, "START-BEGIN-aaa"
-          #
-          @expectation_inner = "START-BEGIN-aaa-END"
-          @expectation_outer = "START-BEGIN-aaa-END-FINISH"
-        end
-
-        test :class_groups, :inner_b do
-          @string.concat "-bbb"
-          assert_equality @string, "START-BEGIN-bbb"
-          #
-          @expectation_inner = "START-BEGIN-bbb-END"
-          @expectation_outer = "START-BEGIN-bbb-END-FINISH"
-        end
-
-        after do
-          @string.concat "-END"
-          assert_equality @string, @expectation_inner
-        end
+        @expectation_inner = "START-BEGIN-bbb-END"
+        @expectation_outer = "START-BEGIN-bbb-END-FINISH"
       end
 
       after do
-        @string << "-FINISH"
-        assert_equality @string, @expectation_outer
+        @string.concat "-END"
+        assert_equality @string, @expectation_inner
       end
     end
 
-    # group :throwables do
-    #   test :throw_within_test do
-    #     assert! true
-    #     assert! false
-    #     raise "it should not have reached this line"
-    #   end
-
-    #   group :throw_within_before do
-    #     before do
-    #       assert! false
-    #     end
-
-    #     test :that_will_not_run do
-    #       raise "it should not have reached this line"
-    #     end
-    #   end
-
-    #   group :throw_within_after do
-    #     test :that_will_not_run do
-    #       assert! false
-    #     end
-
-    #     after do
-    #       raise "it should not have reached this line"
-    #     end
-    #   end
-    # end
+    after do
+      @string << "-FINISH"
+      assert_equality @string, @expectation_outer
+    end
   end
+
+  # group :throwables do
+  #   test :throw_within_test do
+  #     assert! true
+  #     assert! false
+  #     raise "it should not have reached this line"
+  #   end
+
+  #   group :throw_within_before do
+  #     before do
+  #       assert! false
+  #     end
+
+  #     test :that_will_not_run do
+  #       raise "it should not have reached this line"
+  #     end
+  #   end
+
+  #   group :throw_within_after do
+  #     test :that_will_not_run do
+  #       assert! false
+  #     end
+
+  #     after do
+  #       raise "it should not have reached this line"
+  #     end
+  #   end
+  # end
 end

data/lib/liza/test_parts/test_assertions_advanced_part.rb

@@ -1,127 +1,125 @@
-module Liza
-  class TestAssertionsAdvancedPart < Part
-    insertion do
-      
-      def assert_equality a, b, msg = nil, kaller: nil
-        ret = a == b
-
-        if ret
-          self.class._assertion_passed
-          @last_result = :passed
-        else
-          self.class._assertion_failed msg
-          @last_result = :failed
-        end
-
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
-
-        if log_test_assertion_message?
-          msg ||= "#{__method__} #{a}, #{b} (== equality)"
-          log_test_assertion_message ret, msg
-        end
-
-        ret
+class Liza::TestAssertionsAdvancedPart < Liza::Part
+  insertion do
+    
+    def assert_equality a, b, msg = nil, kaller: nil
+      ret = a == b
+
+      if ret
+        self.class._assertion_passed
+        @last_result = :passed
+      else
+        self.class._assertion_failed msg
+        @last_result = :failed
       end
 
-      def refute_equality a, b, msg = nil, kaller: nil
-        ret = a == b
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
 
-        if ret
-          self.class._assertion_failed msg
-          @last_result = :failed
-        else
-          self.class._assertion_passed
-          @last_result = :passed
-        end
+      if log_test_assertion_message?
+        msg ||= "#{__method__} #{a}, #{b} (== equality)"
+        log_test_assertion_message ret, msg
+      end
+
+      ret
+    end
 
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
+    def refute_equality a, b, msg = nil, kaller: nil
+      ret = a == b
 
-        if log_test_assertion_message?
-          msg ||= "#{__method__} #{a}, #{b} (== equality)"
-          log_test_assertion_message !ret, msg
-        end
+      if ret
+        self.class._assertion_failed msg
+        @last_result = :failed
+      else
+        self.class._assertion_passed
+        @last_result = :passed
+      end
+
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
 
-        ret
+      if log_test_assertion_message?
+        msg ||= "#{__method__} #{a}, #{b} (== equality)"
+        log_test_assertion_message !ret, msg
       end
 
-      def assert_equality! a, b, msg = nil
-        critical assert_equality a, b, msg, kaller: caller
+      ret
+    end
+
+    def assert_equality! a, b, msg = nil
+      critical assert_equality a, b, msg, kaller: caller
+    end
+
+    def refute_equality! a, b, msg = nil
+      critical refute_equality a, b, msg, kaller: caller
+    end
+
+    def assert_raises exception_klass, msg = nil, kaller: nil, &block
+      raise ArgumentError, "No block given" unless block_given?
+
+      ret = false
+      begin
+        yield
+      rescue => e
+        ret = exception_klass === e
+        error = e
       end
 
-      def refute_equality! a, b, msg = nil
-        critical refute_equality a, b, msg, kaller: caller
+      if ret
+        self.class._assertion_passed
+        @last_result = :passed
+      else
+        self.class._assertion_failed msg
+        @last_result = :failed
       end
 
-      def assert_raises exception_klass, msg = nil, kaller: nil, &block
-        raise ArgumentError, "No block given" unless block_given?
-
-        ret = false
-        begin
-          yield
-        rescue => e
-          ret = exception_klass === e
-          error = e
-        end
-
-        if ret
-          self.class._assertion_passed
-          @last_result = :passed
-        else
-          self.class._assertion_failed msg
-          @last_result = :failed
-        end
-
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
-
-        if log_test_assertion_message?
-          msg ||= "#{__method__} (#{exception_klass}) #{error.inspect}"
-          log_test_assertion_message ret, msg
-        end
-
-        ret
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
+
+      if log_test_assertion_message?
+        msg ||= "#{__method__} (#{exception_klass}) #{error.inspect}"
+        log_test_assertion_message ret, msg
       end
 
-      def refute_raises exception_klass, msg = nil, kaller: nil, &block
-        raise ArgumentError, "No block given" unless block_given?
-
-        ret = false
-        begin
-          yield
-        rescue => e
-          ret = !exception_klass === e
-          error = e
-        end
-
-        if ret
-          self.class._assertion_failed msg
-          @last_result = :failed
-        else
-          self.class._assertion_passed
-          @last_result = :passed
-        end
-
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
-
-        if log_test_assertion_message?
-          msg ||= "#{__method__} (#{exception_klass}) #{error.inspect}"
-          log_test_assertion_message !ret, msg
-        end
-
-        ret
+      ret
+    end
+
+    def refute_raises exception_klass, msg = nil, kaller: nil, &block
+      raise ArgumentError, "No block given" unless block_given?
+
+      ret = false
+      begin
+        yield
+      rescue => e
+        ret = !exception_klass === e
+        error = e
       end
 
-      def assert_raises! e, msg = nil
-        critical assert_raises e, msg, kaller: caller
+      if ret
+        self.class._assertion_failed msg
+        @last_result = :failed
+      else
+        self.class._assertion_passed
+        @last_result = :passed
       end
 
-      def refute_raises! e, msg = nil
-        critical refute_raises e, msg, kaller: caller
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
+
+      if log_test_assertion_message?
+        msg ||= "#{__method__} (#{exception_klass}) #{error.inspect}"
+        log_test_assertion_message !ret, msg
       end
 
+      ret
     end
+
+    def assert_raises! e, msg = nil
+      critical assert_raises e, msg, kaller: caller
+    end
+
+    def refute_raises! e, msg = nil
+      critical refute_raises e, msg, kaller: caller
+    end
+
   end
 end