tet 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d0239f2921f33e38b177f8c80d34a3b81ae1f1
-  data.tar.gz: b6122266f7d0d5bee82c9e76a761b39994228989
+  metadata.gz: f2de0d206de213821dee31d262b4fe42fce252ec
+  data.tar.gz: 89d73965972497b3b25fe0991cb81311dff1ce6d
 SHA512:
-  metadata.gz: 76b1653b796d3eb7c581eddcc057e7e80e9919e7840c7e2a6add135a223860bb88a751c4d0811dc8e7d2a6f3a54aa7b585f79909edfb6f98642d7e3be18532d2
-  data.tar.gz: 9eb495447fef64e050bc0c4b83c0adf42e07bd6729136cfea8b7808b3b0bd6306cf5510ab1d9af8b3b94373a6f5faf391c362c58b7a0c54950ddd628a8cc1359
+  metadata.gz: 67ff1d3932a9f0c12b25f9c98d6abe18502ceb2ae8961c58c7b59bc2c09812b8a56d591a119815f51d23aee376d7100671047af4288cd2c4a16b9bf2971ac55d
+  data.tar.gz: 4426a2c64c71c5b14709b059c3486cfec984d059a7d860561a1f6dcef07a51803352dbb9365000077839787fc1f126614e81fac2ca79011b8b077b649b274564

data/lib/tests.rb

@@ -7,55 +7,65 @@
 
 require_relative "./tet"
 
-puts <<-END
-Expected results:
-.F!..F.F.F!..F.F.!.F.......FF.FF.F!
-16 out of 35 failed
+$missed_fails   = 0
+$missed_errs    = 0
+$expected_fails = 0
+$expected_errs  = 0
+
+at_exit do
+  puts <<~END
+    \n
+    #{$missed_fails} missed fails
+    #{$missed_errs} missed errs
+    #{total_fails - $expected_fails + $missed_fails} unintended fails
+    #{total_errs - $expected_errs + $missed_errs} unintended errs
+  END
+end
+
+def total_fails
+  Tet.data[:fails] - Tet.data[:errs]
+end
 
-Actual results:
-END
+def total_errs
+  Tet.data[:errs]
+end
 
 # Wraps the block in a group to label it as an example instead of a real test.
-def fails
+def should_fail
+  $expected_fails += 1
+  prev_fail_count  = total_fails
+  result           = false
+
   group("INTENDED FAILURE") { result = yield }
-end
 
-group "#assert" do
-  assert("truthy blocks pass") { true }
+  $missed_fails += 1 if prev_fail_count == total_fails
 
-  fails do
-    assert("falsy blocks fail") { nil }
-    assert("errors are caught and count as failures") { not_a_method }
-  end
+  result
+end
 
-  assert "passing returns true" do
-    assert { true }.equal?(true)
-  end
+# Wraps the block in a group to label it as an example instead of a real test.
+def should_err
+  $expected_errs += 1
+  prev_err_count  = total_errs
+  result          = false
 
-  assert "failing returns false" do
-    fails { assert { nil }.equal?(false) }
-  end
+  group("INTENDED ERROR") { result = yield }
 
-  fails { assert("Can have a name") { nil } }
-end
+  $missed_errs += 1 if prev_err_count == total_errs
 
-group "#deny" do
-  deny("falsey blocks pass") { nil }
+  result
+end
 
-  fails do
-    deny("truthy blocks fail") { :truthy }
-    deny("errors are caught and count as failures") { not_a_method }
-  end
+group "#assert" do
+  assert("truthy blocks pass") { true }
 
-  assert "passing returns true" do
-    deny { nil }.equal?(true)
-  end
+  should_fail { assert("falsy blocks fail") { nil } }
+  should_err { assert("errors are caught and count as failures") { not_a_method } }
 
-  assert "failing returns false" do
-    fails { deny { :truthy }.equal?(false) }
-  end
+  assert("passing returns true") { true }.equal?(true)
 
-  fails { deny("Can have a name") { :truthy } }
+  should_fail { assert("failing returns false") { nil }.equal?(false) }
+  should_fail { assert("Can have a name") { nil } }
 end
 
 group "#group" do
@@ -63,15 +73,15 @@ group "#group" do
     group("EXAMPLE") { "example ouput" } == "example ouput"
   end
 
-  return_value = fails { group("catches errors") { raise "Example Error" } }
+  return_value = should_err { group { raise "Example Error" } }
 
-  assert "returns nil when an assertion returns an error" do
+  assert "returns nil when the block throws an error" do
     return_value.nil?
   end
 
   group "can have classes for names" do
     group String do
-      fails { assert { false } }
+      should_fail { assert { false } }
     end
   end
 end
@@ -98,24 +108,20 @@ group "#err" do
   end
 
   group "fails when there is no error" do
-    fails { err { 1+1 } }
+    should_fail { err { 1+1 } }
 
     assert "... and returns false" do
-      fails { err { 1+1 } }.equal?(false)
+      should_fail { err { 1+1 } }.equal?(false)
     end
   end
 
-  group "fails given wrong error class" do
-    fails { err(expect: ArgumentError) { not_a_method } }
+  group "ail sgiven wrong error class" do
+    should_fail { err(expect: ArgumentError) { not_a_method } }
 
     assert "... and returns false" do
-      fails { err(expect: ArgumentError) { not_a_method } }.equal?(false)
+      should_fail { err(expect: ArgumentError) { not_a_method } }.equal?(false)
     end
   end
 
-  fails { err("Can have a name") { 1+1 } }
-end
-
-group "'Did you mean?' error messages look nice" do
-  fails { assert { 1.to_z } }
+  should_fail { err("Can have a name") { 1+1 } }
 end

data/lib/tet.rb

@@ -11,7 +11,7 @@ def group name = nil
 end
 
 # Declare that a block will return a truthy value.
-# If it doesn't or if it has an error, the assertion will be logged as failing.
+# If it doesn't or if it has an error, the test will be logged as failing.
 def assert name = nil
   Tet.in_group(name) do
     result = false
@@ -24,22 +24,16 @@ def assert name = nil
       else
         Tet.fail
       end
-    rescue StandardError => error
-      Tet.error(error)
+    rescue StandardError => error_object
+      Tet.error(error_object)
     end
 
     !!result
   end
 end
 
-# Declare that a block will return a falsy value.
-# If it doesn't or if it has an error, the assertion will be logged as failing.
-def deny name = nil
-  assert(name) { !yield }
-end
-
 # Declare that a block will have an error.
-# If it doesn't the assertion will be logged as failing.
+# If it doesn't the test will be logged as failing.
 def err name = nil, expect: StandardError
   Tet.in_group(name) do
     result = false
@@ -68,11 +62,16 @@ module Tet
   GroupSeperator = "  |  "
 
   @current_group = []
-  @fail_messeges = []
-  @total_asserts = 0
-  @total_fails   = 0
+  @data          = {
+                     messages: [],
+                     tests:    0,
+                     fails:    0,
+                     errs:     0
+                   }
 
   class << self
+    attr_reader :data
+
     # Store the group name for the duration of calling the given block.
     def in_group name
       result = nil
@@ -88,32 +87,47 @@ module Tet
       result
     end
 
-    # Log a passing assertion.
+    # Log a passing test.
     def pass
       print PassChar
 
-      @total_asserts += 1
+      @data[:tests] += 1
     end
 
-    # Log a failing assertion.
+    # Log a failing test.
     def fail *messeges, letter: FailChar
       print letter
 
-      @total_asserts += 1
-      @total_fails   += 1
-      @fail_messeges << @current_group.join(GroupSeperator) << messeges
+      @data[:tests] += 1
+      @data[:fails] += 1
+
+      @data[:messages] << @current_group.join(GroupSeperator) << messeges
     end
 
-    # Log an assertion error.
+    # Log an error.
     def error error_object, *messages
+      @data[:errs] += 1
       fail *messages, *format_error(error_object), letter: ErrorChar
     end
 
-    # Log an assertion which had the wrong error.
+    # Log test which raised the wrong error.
     def wrong_error expected:, got:
       fail "EXPECTED: #{expected}", *format_error(got)
     end
 
+    # Print stats and messages for all the failing tests.
+    def render_result
+      puts "\n" unless @data[:tests] == 0
+
+      if @data[:fails] + @data[:errs] == 0
+        puts "all #{@data[:tests]} tests passed"
+      else
+        puts "#{@data[:fails]} fails including #{@data[:errs]} errors"
+      end
+
+      puts indent(@data[:messages])
+    end
+
     private
 
     # Format an error message so #indent will render it properly
@@ -138,10 +152,5 @@ module Tet
     end
   end
 
-  # Print messages for all the failing assertions.
-  at_exit do
-    puts "\n" unless @total_asserts.zero?
-    puts "#{@total_fails} out of #{@total_asserts} failed"
-    puts indent(@fail_messeges)
-  end
+  at_exit { Tet.render_result }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tet
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Colin Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies: []
 description: A very minimal test framework designed for simple projects. A couple
   of features, relatively nice looking output, and nothing else. Does the world need
@@ -45,4 +45,3 @@ signing_key:
 specification_version: 4
 summary: Barely a test framework
 test_files: []
-has_rdoc: