logic 0.0.4 → 0.0.5

data/lib/array.rb

@@ -4,4 +4,8 @@ class Array
     length
   end
 
+  def to_s
+    inspect
+  end
+
 end

data/lib/logic_operations.rb

@@ -1,14 +1,19 @@
 require 'array'
+require 'test_case_set'
 require 'truth_table'
 
 module LogicStatement
 
+  def test_cases
+    @test_cases ||= TestCaseSet.new(condition_count, self)
+  end
+
   def truth_table
-    TruthTable.new(condition_count) { |conditions| evaluate(conditions) }
+    TruthTable.new(test_cases)
   end
 
   def mcdc_pairs
-    truth_table.mcdc_pairs
+    test_cases.mcdc_pairs
   end
 
   def condition_count

data/lib/test_case.rb

@@ -1,6 +1,6 @@
+require 'integer'
 require 'range'
 require 'symbol'
-require 'integer'
 
 class TestCase
 
@@ -24,7 +24,7 @@ class TestCase
   end
 
   def output
-    @decision.call(conditions.dup)
+    @decision.evaluate(conditions.dup)
   end
 
   def mcdc_pair(index)

data/lib/test_case_set.rb

@@ -0,0 +1,55 @@
+require 'test_case'
+
+class TestCaseSet
+
+  def initialize(condition_count, decision)
+    @condition_count = condition_count
+    @decision = decision
+    @test_cases = create_cases
+  end
+
+  def create_cases
+    case_numbers.map do |case_number|
+      TestCase.new(case_number, @condition_count, @decision)
+    end
+  end
+
+  def case_numbers
+    1..2**@condition_count
+  end
+
+  def condition_identifiers
+    identifier_range.take(@condition_count)
+  end
+
+  def identifier_range
+    'a'..'z'
+  end
+
+  def mcdc_pairs
+    condition_identifiers.map do |condition_identifier|
+      "#{condition_identifier} => #{mcdc_pairs_for(condition_identifier)}"
+    end
+  end
+
+  def mcdc_pairs_for(condition_identifier)
+    @test_cases.inject([]) do |mcdc_cases, test_case|
+      mcdc_pair = test_case.mcdc_pair(index_of(condition_identifier))
+      mcdc_cases << mcdc_pair if test_case.is_mcdc_case_for_index?(index_of(condition_identifier))
+      mcdc_cases
+    end.uniq
+  end
+
+  def index_of(condition_identifier)
+    identifier_range.to_a.index(condition_identifier)
+  end
+
+  def count
+    @test_cases.count
+  end
+
+  def inject(initial, &block)
+    @test_cases.inject(initial, &block)
+  end
+
+end

data/lib/truth_table.rb

@@ -1,42 +1,7 @@
-require 'test_case'
-
 class TruthTable
 
-  def initialize(condition_count, &decision)
-    @condition_count = condition_count
-    @decision = decision
-  end
-
-  def condition_identifiers
-    identifier_range.take(@condition_count)
-  end
-
-  def cases
-    case_numbers.map do |case_number|
-      TestCase.new(case_number, @condition_count, @decision)
-    end
-  end
-
-  def case_numbers
-    1..2**@condition_count
-  end
-
-  def mcdc_pairs
-    condition_identifiers.map do |condition_identifier|
-      "#{condition_identifier} => #{mcdc_pairs_for(condition_identifier).inspect}"
-    end
-  end
-
-  def mcdc_pairs_for(condition_identifier)
-    cases.inject([]) do |mcdc_cases, test_case|
-      mcdc_pair = test_case.mcdc_pair(index_of(condition_identifier))
-      mcdc_cases << mcdc_pair if test_case.is_mcdc_case_for_index?(index_of(condition_identifier))
-      mcdc_cases
-    end.uniq
-  end
-
-  def index_of(condition_identifier)
-    identifier_range.to_a.index(condition_identifier)
+  def initialize(test_cases)
+    @test_cases = test_cases
   end
 
   def to_s
@@ -44,18 +9,14 @@ class TruthTable
   end
 
   def header
-    conditions = condition_identifiers.join(" ")
+    conditions = @test_cases.condition_identifiers.join(" ")
     "#{conditions.rjust(conditions.length + 4)} | output\n"
   end
 
   def formatted_cases
-    cases.inject("") do |output, test_case|
+    @test_cases.inject("") do |output, test_case|
       output += "#{test_case.number.to_s.rjust(2)}) #{test_case.conditions.join(' ')} | #{test_case.output.to_s.rjust(3)}\n"
     end
   end
 
-  def identifier_range
-    'a'..'z'
-  end
-
 end

data/spec/test_case_set_spec.rb

@@ -0,0 +1,23 @@
+require 'test_case_set'
+
+describe TestCaseSet do
+
+  describe "with 1 condition" do
+
+    let(:test_case_set) { TestCaseSet.new(1, nil) }
+    
+    describe :condition_dentifiers do
+      
+      it "includes 'a'" do
+        test_case_set.condition_identifiers.should include('a')
+      end
+
+    end
+    
+    it "has 2 test cases" do
+      test_case_set.count.should == 2
+    end
+
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bryan Ash
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: logic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,15 +58,16 @@ files:
 - lib/array.rb
 - lib/integer.rb
 - lib/logic_operations.rb
+- lib/logic_parser.treetop
 - lib/range.rb
 - lib/symbol.rb
 - lib/test_case.rb
+- lib/test_case_set.rb
 - lib/truth_table.rb
-- lib/logic_parser.treetop
 - bin/logic
 - spec/logic_parser_spec.rb
 - spec/spec.opts
-- spec/truth_table_spec.rb
+- spec/test_case_set_spec.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true

data/spec/truth_table_spec.rb

@@ -1,27 +0,0 @@
-require 'truth_table'
-
-describe TruthTable do
-
-  describe "with 1 condition" do
-
-    let(:table) { TruthTable.new(1) }
-    
-    describe :condition_dentifiers do
-      
-      it "includes 'a'" do
-        table.condition_identifiers.should include('a')
-      end
-
-    end
-
-    describe :cases do
-
-      it "has 2 cases" do
-        table.cases.length.should == 2
-      end
-
-    end
-
-  end
-  
-end