ciat 0.4.9 → 0.4.10

data/spec/templates/elements/diff_html_erb_spec.rb

@@ -5,6 +5,7 @@ require 'hpricot'
 describe "checked-files output in detail row" do
   include ERBHelpers
   include CustomDetailRowMatchers
+  include Webrat::Matchers
   
   attr_reader :erb
   attr_reader :element
@@ -21,8 +22,9 @@ describe "checked-files output in detail row" do
     @element.should_receive(:describe).at_least(:once).and_return("the description")
     @element.should_receive(:content).and_return("the diff")
     
-    doc = process_erb
-    doc.should have_description("h4", "the description")
-    doc.should have_diff_table("the diff")
+    process_erb.should have_selector("body") do |body|
+      body.should have_selector("h4", :content => "the description")
+      body.should have_diff_table("the diff")
+    end
   end
 end

data/spec/templates/summary_row_html_erb_spec.rb

@@ -1,10 +1,12 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 require 'hpricot'
+require 'webrat'
 
 describe "summary row of test report" do
   include ERBHelpers
   include CustomDetailRowMatchers
+  include Webrat::Matchers
   
   attr_reader :erb
   attr_reader :recursion
@@ -20,9 +22,10 @@ describe "summary row of test report" do
     expect_description("the description")
     @result.should_receive(:subresults).at_least(:once).and_return([])
     
-    doc = process_erb
-    doc.should have_description("the description")
-    doc.should have_none("/tr/td[2]")
+    process_erb.should have_selector("body") do |body|
+      body.should have_selector("a", :content => "the description")
+      body.should have_selector("td", :count => 1)
+    end
   end
 
   it "should work with one processor" do
@@ -35,9 +38,11 @@ describe "summary row of test report" do
     expect_light(subresult, :light_setting, "the light")
   
     doc = process_erb
-    doc.should have_description("one proc description")
-    doc.should have_light(:light_setting, "the light")
-    doc.should have_none("/tr/td[3]")
+    doc.should have_selector("body") do |body|
+      body.should have_selector("a", :content => "one proc description")
+      body.should have_selector(".light_setting", :content => "the light")
+      body.should have_selector("td", :count => 2)      
+    end
   end
   
   it "should work with many processors" do
@@ -50,24 +55,26 @@ describe "summary row of test report" do
     expect_light(subresults[1], :light1, "word 1")
     expect_light(subresults[2], :light2, "word 2")
   
-    doc = process_erb
-    doc.should have_description("description three")
-    doc.should have_light(:light0, "word 0")
-    doc.should have_light(:light1, "word 1")
-    doc.should have_light(:light2, "word 2")
-    doc.should have_none("/tr/td[5]")
+    process_erb.should have_selector("body") do |body|
+      body.should have_selector("a", :content => "description three")
+      body.should have_light(:light0, "word 0")
+      body.should have_light(:light1, "word 1")
+      body.should have_light(:light2, "word 2")
+      body.should have_selector("td", :count => 4)
+    end
   end
   
   def expect_light(subresult, setting, word)
     light = mock("mock #{setting}")
     subresult.should_receive(:light).at_least(:once).and_return(light)
-    light.should_receive(:setting).and_return(setting)
+    light.should_receive(:color).and_return(setting)
     light.should_receive(:text).and_return(word)
   end
       
   def expect_description(text)
     description = mock("description")
-    @result.should_receive(:element).with(:description).and_return(description)
+    @result.should_receive(:element).
+      with(:description).and_return(description)
     description.should_receive(:content).and_return(text)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ciat
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors: 
 - Jeremy D. Frens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -05:00
+date: 2009-11-21 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/ciat.rb
+- lib/ciat/ciat_file.rb
 - lib/ciat/differs/html_differ.rb
 - lib/ciat/erb_helpers.rb
 - lib/ciat/feedback/composite.rb
@@ -33,7 +34,6 @@ files:
 - lib/ciat/feedback/return_status.rb
 - lib/ciat/feedback/standard_output.rb
 - lib/ciat/io.rb
-- lib/ciat/processors/basic_processing.rb
 - lib/ciat/processors/compilation_interpreter.rb
 - lib/ciat/processors/compiler.rb
 - lib/ciat/processors/interpreter.rb
@@ -41,11 +41,11 @@ files:
 - lib/ciat/processors/parrot.rb
 - lib/ciat/rake_task.rb
 - lib/ciat/subresult.rb
+- lib/ciat/subtest.rb
 - lib/ciat/suite.rb
 - lib/ciat/suite_builder.rb
 - lib/ciat/test.rb
 - lib/ciat/test_element.rb
-- lib/ciat/test_file.rb
 - lib/ciat/test_result.rb
 - lib/ciat/traffic_light.rb
 - lib/data/ciat.css
@@ -70,7 +70,7 @@ rdoc_options:
 - --title
 - CIAT -- Compiler and Interpreter Acceptance Tester
 - --main
-- README.txt
+- README.rdoc
 - --line-numbers
 require_paths: 
 - lib
@@ -94,20 +94,26 @@ signing_key:
 specification_version: 3
 summary: Acceptance tester for compilers and interpreters
 test_files: 
+- spec/ciat/ciat_file_spec.rb
 - spec/ciat/erb_helpers_spec.rb
 - spec/ciat/feedback/composite_spec.rb
 - spec/ciat/feedback/feedback_counter_spec.rb
 - spec/ciat/feedback/html_feedback_spec.rb
 - spec/ciat/feedback/return_status_spec.rb
 - spec/ciat/feedback/standard_output_spec.rb
-- spec/ciat/processors/basic_processing_spec.rb
+- spec/ciat/processors/compilation_interpreter_spec.rb
+- spec/ciat/processors/compiler_spec.rb
+- spec/ciat/processors/interpreter_spec.rb
 - spec/ciat/processors/java_spec.rb
 - spec/ciat/processors/parrot_spec.rb
+- spec/ciat/processors/shared_examples_for_element_names.rb
+- spec/ciat/rake_task_spec.rb
 - spec/ciat/subresult_spec.rb
+- spec/ciat/subtest_spec.rb
 - spec/ciat/suite_builder_spec.rb
 - spec/ciat/suite_spec.rb
 - spec/ciat/test_element_spec.rb
-- spec/ciat/test_file_spec.rb
+- spec/ciat/test_result_spec.rb
 - spec/ciat/test_spec.rb
 - spec/ciat/traffic_light_spec.rb
 - spec/ciat_spec.rb

data/lib/ciat/processors/basic_processing.rb

@@ -1,55 +0,0 @@
-require 'rake'
-require 'ciat/differs/html_differ'
-
-module CIAT::Processors
-  module BasicProcessing
-    include CIAT::Differs::HtmlDiffer
-    
-    # Executes the program, and diffs the output.
-    def process(test)
-      # TODO: verify required elements
-      # TODO: handle optional element
-      if execute(test)
-        if diff(test)
-          CIAT::TrafficLight::GREEN
-        else
-          CIAT::TrafficLight::RED
-        end
-      else
-        CIAT::TrafficLight::YELLOW
-      end
-    end
-
-    def execute(test)
-      RakeFileUtils.verbose(false) do
-        sh "#{executable} '#{input_file(test)}' #{command_line_args(test)} > '#{output_file(test)}' 2> '#{error_file(test)}'" do |ok, result|
-          return ok
-        end
-      end
-    end
-    
-    def command_line_args(test) #:nodoc:
-      test.element?(:command_line) ? test.element(:command_line).content.strip : ''
-    end
-    
-    # Compares the expected and generated executions.
-    def diff(test)
-      html_diff(
-        test.element(kind.output_name).as_file,
-        test.element(kind.output_name, :generated).as_file, 
-        test.element(kind.output_name, :diff).as_file)
-    end
-    
-    def input_file(test)
-      test.element(kind.input_name).as_file
-    end
-
-    def output_file(test)
-      test.element(kind.output_name, :generated).as_file
-    end
-
-    def error_file(test)
-      test.element(kind.output_name, :error).as_file
-    end
-  end
-end

data/spec/ciat/processors/basic_processing_spec.rb

@@ -1,146 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe CIAT::Processors::BasicProcessing do
-  class Processor
-    include CIAT::Processors::BasicProcessing
-  end
-  
-  before(:each) do
-    @processor = Processor.new
-  end
-  
-  describe "processing" do
-    before(:each) do
-      @test = mock("test")
-    end
-    
-    it "should execute and diff normally" do
-      @processor.should_receive(:execute).with(@test).and_return(true)
-      @processor.should_receive(:diff).with(@test).and_return(true)
-      
-      @processor.process(@test).should == CIAT::TrafficLight::GREEN
-    end
-
-    it "should execute with an error" do
-      @processor.should_receive(:execute).with(@test).and_return(false)
-      
-      @processor.process(@test).should == CIAT::TrafficLight::YELLOW
-    end
-
-    it "should execute normally and diff with a failure" do
-      @processor.should_receive(:execute).with(@test).and_return(true)
-      @processor.should_receive(:diff).with(@test).and_return(false)
-      
-      @processor.process(@test).should == CIAT::TrafficLight::RED
-    end
-  end
-  
-  describe "executing a processor for a test" do
-    it "should put together and execute a shell command" do
-      test, ok, result = mock("test"), mock("ok"), mock("result")
-      
-      @processor.should_receive(:executable).and_return("[executable]")
-      @processor.should_receive(:input_file).with(test).
-        and_return("[input]")
-      @processor.should_receive(:command_line_args).with(test).
-        and_return("[args]")
-      @processor.should_receive(:output_file).with(test).
-        and_return("[output]")
-      @processor.should_receive(:error_file).with(test).
-        and_return("[error]") 
-      @processor.should_receive(:sh).
-        with("[executable] '[input]' [args] > '[output]' 2> '[error]'").
-        and_yield(ok, result)
-      
-      @processor.execute(test).should == ok
-    end
-  end
-  
-  describe "handling command-line arguments" do
-    it "should strip command-line arguments" do
-      test = mock("test")
-      command_line = mock("command_line")
-    
-      test.should_receive(:element?).with(:command_line).and_return(true)
-      test.should_receive(:element).with(:command_line).
-        and_return(command_line)
-      command_line.should_receive(:content).
-        and_return("   argument1 \t argument2  \n\n")
-    
-      @processor.command_line_args(test).should == "argument1 \t argument2"
-    end
-    
-    it "should return empty string if none provided" do
-      test = mock("test")
-      
-      test.should_receive(:element?).with(:command_line).and_return(false)
-      
-      @processor.command_line_args(test).should == ''
-    end
-  end
-  
-  describe "computing a diff" do
-    it "should compute a diff in HTML" do
-      test, kind, result = 
-        mock("test"), mock("processor kind"), mock("result")
-      output_name = mock("output name")
-
-      @processor.should_receive(:kind).any_number_of_times.and_return(kind)
-      kind.should_receive(:output_name).any_number_of_times.
-        and_return(output_name)
-      original_file = expect_element_as_file(test, output_name)
-      generated_file = expect_element_as_file(test, output_name, :generated)
-      diff_file = expect_element_as_file(test, output_name, :diff)
-      @processor.should_receive(:html_diff).
-        with(original_file, generated_file, diff_file).and_return(result)
-    
-      @processor.diff(test).should eql(result)
-    end
-    
-    def expect_element_as_file(test, *names)
-      element, filename = mock("#{names} element"), mock("#{names} filename")
-      test.should_receive(:element).with(*names).and_return(element)
-      element.should_receive(:as_file).and_return(filename)
-      filename
-    end
-  end
-  
-  it "should get filename of input" do
-    test = mock("test")
-    kind, element, name = mock("kind"), mock("element"), mock("name")
-    filename = mock("filename")
-    
-    @processor.should_receive(:kind).and_return(kind)
-    kind.should_receive(:input_name).and_return(name)
-    test.should_receive(:element).with(name).and_return(element)
-    element.should_receive(:as_file).and_return(filename)
-    
-    @processor.input_file(test).should eql(filename)
-  end
-
-  it "should get filename of input" do
-    test = mock("test")
-    kind, element, name = mock("kind"), mock("element"), mock("name")
-    filename = mock("filename")
-    
-    @processor.should_receive(:kind).and_return(kind)
-    kind.should_receive(:output_name).and_return(name)
-    test.should_receive(:element).with(name, :generated).and_return(element)
-    element.should_receive(:as_file).and_return(filename)
-    
-    @processor.output_file(test).should eql(filename)
-  end
-
-  it "should get filename of input" do
-    test = mock("test")
-    kind, element, name = mock("kind"), mock("element"), mock("name")
-    filename = mock("filename")
-    
-    @processor.should_receive(:kind).and_return(kind)
-    kind.should_receive(:output_name).and_return(name)
-    test.should_receive(:element).with(name, :error).and_return(element)
-    element.should_receive(:as_file).and_return(filename)
-    
-    @processor.error_file(test).should eql(filename)
-  end
-end