rushcheck 0.3 → 0.4

data/lib/rushcheck/bool.rb

@@ -7,25 +7,27 @@ require 'rushcheck/random'
 require 'rushcheck/result'
 require 'rushcheck/testable'
 
-module RandomBool
-  def arbitrary
-    Gen.elements([true, false])
-  end
-  
-  def random_range(gen, lo=@@min_bound, hi=@@max_bound)
-    v, g = Integer.random_range(gen, 0, 1)
-    [v==0, g]
+module RushCheck
+  module RandomBool
+    def arbitrary
+      RushCheck::Gen.elements([true, false])
+    end
+    
+    def random_range(gen, lo=@@min_bound, hi=@@max_bound)
+      v, g = Integer.random_range(gen, 0, 1)
+      [v==0, g]
+    end
   end
 end
 
 class TrueClass
 
-  extend Arbitrary
-  extend HsRandom
-  extend RandomBool
+  extend RushCheck::Arbitrary
+  extend RushCheck::HsRandom
+  extend RushCheck::RandomBool
 
-  include Testable
-  include Coarbitrary
+  include RushCheck::Testable
+  include RushCheck::Coarbitrary
 
   @@min_bound = 0
   @@max_bound = 1
@@ -39,19 +41,19 @@ class TrueClass
   end
 
   def property
-    Result.new(self).result
+    RushCheck::Result.new(self).result
   end
 
 end
 
 class FalseClass
 
-  extend Arbitrary
-  extend HsRandom
-  extend RandomBool
+  extend RushCheck::Arbitrary
+  extend RushCheck::HsRandom
+  extend RushCheck::RandomBool
 
-  include Coarbitrary
-  include Testable
+  include RushCheck::Coarbitrary
+  include RushCheck::Testable
 
   @@min_bound = 0
   @@max_bound = 1
@@ -65,15 +67,15 @@ class FalseClass
   end
   
   def property
-    Result.new(self).result
+    RushCheck::Result.new(self).result
   end
 end
 
 class NilClass
-  extend Arbitrary
+  extend RushCheck::Arbitrary
 
-  include Coarbitrary
-  include Testable
+  include RushCheck::Coarbitrary
+  include RushCheck::Testable
   
   def self.arbitrary
     Gen.unit(nil)
@@ -84,7 +86,7 @@ class NilClass
   end
 
   def property
-    Result.nothing
+    RushCheck::Result.nothing
   end
 
 end

data/lib/rushcheck/config.rb

@@ -1,98 +1,148 @@
 # = Config.rb
-# This file is implemented for the class RushCheckConfig.
+# This file is implemented for the class Config.
 
-# RushCheckConfig is a class which has configurations of tests.
-# This class is needed for several test functions.
-class RushCheckConfig
+require 'rushcheck/testresult'
 
-  attr_reader :max_test, :max_fail, :size, :every
+module RushCheck
 
-  def self.quick
-    new(100, 1000, 
-        Proc.new{|x| x / 2 + 3},
-        Proc.new do |n, args|
-          s = n.to_s
-          s + ("\b" * s.length)
-        end)
-  end
+  # Config is a class which has configurations of tests.
+  # This class is needed for several test functions.
+  class Config
 
-  def self.verbose 
-    new(100, 1000, 
-        Proc.new{|x| x / 2 + 3},
-        Proc.new do |n, args|
-          n.to_s + ":\n" + args.join("\n") + "\n"
-        end)
-  end
+    attr_reader :max_test, :max_fail, :size, :every
 
-  def initialize(max_test, max_fail, size, every)
-    @max_test, @max_fail, @size, @every = max_test, max_fail, size, every
-  end
+    def self.quick
+      new(100, 1000, 
+          Proc.new{|x| x / 2 + 3},
+          Proc.new do |n, args|
+            s = n.to_s
+            s + ("\b" * s.length)
+          end)
+    end
 
-  # print results of tests.
-  def done(mesg, ntest, stamps)
-    print mesg + ' ' + ntest.to_s + ' tests'
-
-    bag = stamps.compact.find_all {|x| ! x.empty?}.sort.
-            inject(Hash.new) do |r, m|
-              r[m] = r[m].nil? ? 1 : r[m] + 1
-              r
-            end.sort_by {|k, v| v}.reverse.map do |pair|
-              percentage = ((100 * pair[1]) / ntest).to_s + '%'
-              ([percentage] + pair[0]).join(', ')
-            end
+    def self.verbose 
+      new(100, 1000, 
+          Proc.new{|x| x / 2 + 3},
+          Proc.new do |n, args|
+            n.to_s + ":\n" + args.join("\n") + "\n"
+          end)
+    end
 
-    mes = case bag.length
-          when 0
-            ".\n"
-          when 1
-            '(' + bag[0] + ").\n"
-          else
-            ".\n" + bag.join(".\n") + ".\n"
-          end
+    def self.batch(n, v)
+      new(n, n * 10, 
+          Proc.new{|x| (x / 2 + 3).to_i},
+          Proc.new do |n, args|
+            v ? n.to_s + ":\n" + args.join("\n") + "\n" : ""
+          end)
+    end
 
-    print mes
-  end
+    def initialize(max_test, max_fail, size, every)
+      @max_test, @max_fail, @size, @every = max_test, max_fail, size, every
+    end
 
-  # execute tests
-  def tests(gen, rnd, nt=1, nf=0, stamps=[])
-    ntest, nfail = nt, nf
-    while true
-      if ntest > max_test
-        done('OK, passed', max_test, stamps)
-        tests_result = true
-        break
-      end
-      if nfail > max_fail
-        done('Arguments exhausted after ', ntest, stamps)
-        tests_result = nil
-        break
+    # print results of tests.
+    def done(mesg, ntest, stamps)
+      print mesg + ' ' + ntest.to_s + ' tests'
+
+      bag = stamps.compact.find_all {|x| ! x.empty?}.sort.
+        inject(Hash.new) do |r, m|
+        r[m] = r[m].nil? ? 1 : r[m] + 1
+        r
+      end.sort_by {|k, v| v}.reverse.map do |pair|
+        percentage = ((100 * pair[1]) / ntest).to_s + '%'
+        ([percentage] + pair[0]).join(', ')
       end
 
-      rnd_l, rnd_r = rnd.split
-      result = gen.generate(size.call(ntest), rnd_r)
-      message = every.call(ntest, result.arguments)
-      print message # don't puts
-
-      case result.ok
-      when nil
-        nfail += 1
-        redo
-      when true
-        stamps.push(result.stamp)
-        ntest += 1
-        redo
-      when false
-        error = "Falsifiable, after " + ntest.to_s + " tests:\n" + 
-          result.arguments.join("\n")
-        puts error
-        tests_result = false
-        break
-      else
-        raise(RuntimeError, "RushCheck: illegal result")
+      mes = case bag.length
+            when 0
+              ".\n"
+            when 1
+              '(' + bag[0] + ").\n"
+            else
+              ".\n" + bag.join(".\n") + ".\n"
+            end
+
+      print mes
+    end
+
+    # execute tests
+    def tests(gen, rnd, nt=1, nf=0, stamps=[])
+      ntest, nfail = nt, nf
+      while true
+        if ntest > max_test
+          done('OK, passed', max_test, stamps)
+          tests_result = true
+          break
+        end
+        if nfail > max_fail
+          done('Arguments exhausted after ', ntest, stamps)
+          tests_result = nil
+          break
+        end
+
+        rnd_l, rnd_r = rnd.split
+        result = gen.generate(size.call(ntest), rnd_r)
+        message = every.call(ntest, result.arguments)
+        print message # don't puts
+
+        case result.ok
+        when nil
+          nfail += 1
+          redo
+        when true
+          stamps.push(result.stamp)
+          ntest += 1
+          redo
+        when false
+          error = "Falsifiable, after " + ntest.to_s + " tests:\n" + 
+            result.arguments.join("\n")
+          puts error
+          tests_result = false
+          break
+        else
+          raise(RuntimeError, "RushCheck: illegal result")
+        end
       end
+      
+      tests_result
     end
-    
-    tests_result
+
+    def test_batch(gen, rnd, nt=1, nf=0, stamps=[])
+      ntest, nfail = nt, nf
+      while true
+        if ntest > max_test
+          tests_result = RushCheck::TestOk.new("OK, passed", ntest, stamps)
+          break
+        end
+        if nfail > max_fail
+          test_result = RushCheck::TestExausted.new('Arguments exhausted after ', ntest, stamps)
+          break
+        end
+        
+        rnd_l, rnd_r = rnd.split
+        result = gen.generate(size.call(ntest), rnd_r)
+        message = every.call(ntest, result.arguments)
+        print message # don't puts
+
+        case result.ok
+        when nil
+          nfail += 1
+          redo
+        when true
+          stamps.push(result.stamp)
+          ntest += 1
+          redo
+        when false
+          tests_result = RushCheck::TestFailed.new(result.arguments, ntest)
+          break
+        else
+          raise(RuntimeError, "RushCheck: illegal result")
+        end
+      end    
+
+      test_result
+    end
+
   end
 
 end

data/lib/rushcheck/float.rb

@@ -7,16 +7,16 @@ require 'rushcheck/random'
 
 class Float
   
-  extend Arbitrary
-  extend HsRandom
+  extend RushCheck::Arbitrary
+  extend RushCheck::HsRandom
   
-  include Coarbitrary
+  include RushCheck::Coarbitrary
 
   @@min_bound = 0.0
   @@max_bound = 1.0
 
   def self.arbitrary
-    Gen.new do |n, r|
+    RushCheck::Gen.new do |n, r|
       a, b, c = (1..3).map { Integer.arbitrary.value(n, r) }
       a + (b / (c.abs + 1))
     end