rutema 1.1.3 → 1.2.0

data/test/distro_test/config/full.rutema

@@ -1,3 +1,5 @@
+require 'rutema/parsers/xml'
+require 'rutema/reporters/activerecord'
 configuration.parser={:class=>Rutema::MinimalXMLParser}
 configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:adapter=>"sqlite3",:database=>"sample.db"}}
 configuration.tests=[

data/test/distro_test/specs/check.spec

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="check">
+<title>Check specification</title>
+<description>Runs once at the beginning</description>
+<scenario>
+	<echo text="Just checking"/>
+</scenario>
+</specification>

data/test/distro_test/specs/duplicate_name.spec

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="sample">
+<title>Duplicate name specification</title>
+<description>Check for parser errors</description>
+<scenario>
+	<echo text="Hello testing world"/>
+</scenario>
+</specification>

data/test/distro_test/specs/fail.spec

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="fail">
+<title>Failing specification</title>
+<description>This will fail</description>
+<scenario>
+	<echo text="About to fail"/>
+	<command cmd="cd blibliki"/>
+</scenario>
+</specification>

data/test/distro_test/specs/setup.spec

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="setup">
+<title>Setup specification</title>
+<description>Runs before every test</description>
+<scenario>
+	<echo text="Setting up"/>
+</scenario>
+</specification>

data/test/distro_test/specs/teardown.spec

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<specification name="teardown">
+<title>Teardown specification</title>
+<description>Runs after every test</description>
+<scenario>
+	<echo text="Tearing down"/>
+</scenario>
+</specification>

data/test/rutema.rutema

@@ -1,3 +1,3 @@
 configuration.parser={:class=>Rutema::MinimalXMLParser}
 configuration.reporter={:class=>Rutema::ActiveRecordReporter, :db=>{:adapter=>"sqlite3",:database=>"rutema.db"}}
-configuration.tests=["rutema.spec","migration.spec"]
+configuration.tests=["rutema.spec"]

data/test/rutema.spec

@@ -1,10 +1,10 @@
 <specification name="TR001">
 <title>Rutema self hosting test</title>
-<description>Test that rutemax is usable as a step in a specification using the distro test example</description>
+<description>Test that rutema is usable as a step in a specification using the distro test example</description>
 <scenario>
-	<command cmd="rutemax -c distro_test/config/minimal.rutema"/>
-	<command cmd="rutemax -c distro_test/config/database.rutema"/>
-	<command cmd="rutemax -c distro_test/config/database.rutema distro_test/specs/T001.spec"/>
-	<command cmd="rutemax -c distro_test/config/full.rutema"/>
+	<command cmd="rutema -c distro_test/config/minimal.rutema"/>
+	<command cmd="rutema -c distro_test/config/database.rutema"/>
+	<command cmd="rutema -c distro_test/config/database.rutema distro_test/specs/T001.spec"/>
+	<command cmd="rutema -c distro_test/config/full.rutema"/>
 </scenario>
 </specification>

data/test/test_configuration.rb

@@ -1,13 +1,11 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
+$:.unshift File.join(File.dirname(__FILE__),"..")
 require 'test/unit'
 require 'rubygems'
-require 'rutema/gems'
+require 'patir/configuration'
+require 'lib/rutema/configuration'
 #$DEBUG=true
 module TestRutema
-  require 'rutema/system'
-  
-  class TestRutemaXConfigurator<Test::Unit::TestCase
+  class TestRutemaConfigurator<Test::Unit::TestCase
     def setup
       @prev_dir=Dir.pwd
       Dir.chdir(File.dirname(__FILE__))
@@ -15,10 +13,10 @@ module TestRutema
     def teardown
       Dir.chdir(@prev_dir)
     end
-    def test_rutemax_configuration
+    def test_rutema_configuration
       cfg=nil
       #load the valid configuration
-      assert_nothing_raised() { cfg=Rutema::RutemaXConfigurator.new("distro_test/config/full.rutema").configuration}
+      assert_nothing_raised() { cfg=Rutema::RutemaConfigurator.new("distro_test/config/full.rutema").configuration}
       assert_not_nil(cfg.parser)
       assert_not_nil(cfg.reporters)
       assert_equal(1, cfg.reporters.size)
@@ -36,7 +34,7 @@ module TestRutema
     end
     
     def test_specification_paths
-      cfg=Rutema::RutemaXConfigurator.new("distro_test/config/full.rutema").configuration
+      cfg=Rutema::RutemaConfigurator.new("distro_test/config/full.rutema").configuration
       assert_not_nil(cfg.tests)
     end
   end

data/test/test_couchdb.rb

@@ -16,6 +16,20 @@ module TestRutema
   end
 
   class TestCouchDBModel<Test::Unit::TestCase
+    def setup
+      @db=CouchRest.database!("http://localhost:5984/rutema_test")
+    end
+    
+    def test_couchdb_model
+      run=Rutema::CouchDB::Run.new
+      run.database=@db
+      run.context="context"
+      run.scenarios=["1","2","#{self.object_id}"]
+      assert_nothing_raised() {  run.save }
+      
+      r=Rutema::CouchDB::Run.get(run.slug)
+      assert_equal(run.slug, r.slug)
+    end
   end
   
   class TestCouchDBReporter<Test::Unit::TestCase

data/test/{test_specification.rb → test_objectmodel.rb}

@@ -1,9 +1,8 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'test/unit'
 require 'rubygems'
-require 'rutema/gems'
+require 'rutema/objectmodel'
 module TestRutema
-  require 'rutema/specification'
   class DummyCommand
     include Patir::Command
     def initialize
@@ -11,9 +10,6 @@ module TestRutema
       @output="output"
       @error="error"
     end
-    def to_s
-      return ""
-    end
   end
   class Dummy
     include Rutema::SpecificationElement
@@ -23,26 +19,27 @@ module TestRutema
       step=Rutema::TestStep.new("test step",DummyCommand.new())
       assert(!step.attended?, "attended?")
       assert_not_equal("dummy", step.name)
-      assert_equal("step - ", step.name)
+      assert(/step - .*DummyCommand.*/=~step.name)
       assert_equal("output", step.output)
       assert_equal("error", step.error)
       assert_equal(:not_executed, step.status)
       assert_nothing_raised() { step.run }
-      assert_nothing_raised() { step.run("context") }
       assert_equal(:success, step.status)
       assert_nothing_raised() { step.reset }
       assert_equal(:not_executed, step.status)
       assert_equal("", step.output)
+      assert(/0 - step - .*DummyCommand.*- not_executed/=~step.to_s)
     end
   end
   class TestSpecification<Test::Unit::TestCase
     def test_new
-      spec=Rutema::TestSpecification.new
-      assert_equal("", spec.name)
-      assert_equal("", spec.title)
-      assert_equal("", spec.description)
+      spec=Rutema::TestSpecification.new(:name=>"name",:title=>"title",:description=>"description")
+      assert_equal("name", spec.name)
+      assert_equal("title", spec.title)
+      assert_equal("description", spec.description)
       assert_not_nil(spec.scenario)
       assert(spec.requirements.empty?)
+      assert_equal("name - title", spec.to_s)
     end
   end
   class TestScenario<Test::Unit::TestCase

data/test/test_parsers.rb

@@ -0,0 +1,136 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+require 'test/unit'
+require 'ostruct'
+
+require 'rubygems'
+require 'patir/command'
+require 'mocha'
+
+require 'rutema/parsers/base'
+require 'rutema/parsers/xml'
+
+#$DEBUG=true
+module TestRutema
+  class TestSpecificationParser<Test::Unit::TestCase
+    def test_specification_parser
+      parser=nil
+      assert_nothing_raised() { parser=Rutema::SpecificationParser.new({}) }
+      assert_not_nil(parser)
+      assert(!parser.configuration.empty?)
+      assert_raise(Rutema::ParserError) { parser.parse_specification("foo") }
+    end
+  end
+  class TestBaseXMlParser<Test::Unit::TestCase
+    SAMPLE_SPEC=<<-EOT
+    <specification name="sample">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <step/>
+    <another_step script="script"/>
+    </scenario>
+    </specification>
+    EOT
+    INCLUDE_SPEC=<<-EOT
+    <specification name="include">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <step/>
+    <include_scenario file="#{File.expand_path(File.dirname(__FILE__))}/distro_test/specs/include.scenario"/>
+    </scenario>
+    </specification>
+    EOT
+    BAD_INCLUDE_SPEC=<<-EOT
+    <specification name="bad_include">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <include_scenario file=unknown.scenario"/>
+    </scenario>
+    </specification>
+    EOT
+    MISSING_INCLUDE_SPEC=<<-EOT
+    <specification name="bad_include">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <include_scenario/>
+    </scenario>
+    </specification>
+    EOT
+
+    def test_parse_specification
+      parser=Rutema::BaseXMLParser.new({})
+      specification=parser.parse_specification(SAMPLE_SPEC)
+      assert_equal("sample",specification.name)
+      assert_equal("Description", specification.description)
+      assert_equal("Title", specification.title)
+      assert(specification.scenario)
+      assert_equal(2, specification.scenario.steps.size)
+      assert_equal(1, specification.scenario.steps[0].number)
+      assert_equal("another_step", specification.scenario.steps[1].step_type)
+      assert_equal("script", specification.scenario.steps[1].script)
+      assert_equal(2, specification.scenario.steps[1].number)
+      assert_raise(Rutema::ParserError) { parser.parse_specification("") }
+      assert_raise(Rutema::ParserError) { parser.parse_specification("missing.spec") }
+    end
+
+    def test_include
+      parser=Rutema::BaseXMLParser.new({})
+      specification=parser.parse_specification(INCLUDE_SPEC)
+      assert_equal(3, specification.scenario.steps.size)
+      assert(specification.scenario.steps[2].has_included_in?)
+      assert_raise(Rutema::ParserError) {  parser.parse_specification(BAD_INCLUDE_SPEC) }
+      assert_raise(Rutema::ParserError) {  parser.parse_specification(MISSING_INCLUDE_SPEC) }
+    end
+
+  end
+  class TestExtensibleXMlParser<Test::Unit::TestCase
+    SAMPLE_SPEC=<<-EOT
+    <specification name="sample">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <step/>
+    <another_step script="script"/>
+    </scenario>
+    </specification>
+    EOT
+    def test_parse_specification
+      parser=Rutema::ExtensibleXMLParser.new({})
+      assert_not_nil(parser.configuration)
+      specification=nil
+      assert_nothing_raised() { specification=parser.parse_specification(SAMPLE_SPEC) }
+      assert_equal(2, specification.scenario.steps.size)
+    end
+    def test_parse_error
+      parser=Rutema::ExtensibleXMLParser.new({})
+      assert_not_nil(parser.configuration)
+      specification=nil
+      assert_raise(Rutema::ParserError) { specification=parser.parse_specification("<") }
+    end
+  end
+  class TestMinimalXMlParser<Test::Unit::TestCase
+    SAMPLE_SPEC=<<-EOT
+    <specification name="sample">
+    <title>Title</title>
+    <description>Description</description>
+    <scenario>
+    <echo/>
+    <command cmd="l"/>
+    </scenario>
+    </specification>
+    EOT
+    def test_parse_specification
+      parser=Rutema::MinimalXMLParser.new({})
+      specification=nil
+      assert_nothing_raised() { specification=parser.parse_specification(SAMPLE_SPEC) }
+      assert_not_nil(specification)
+      assert_equal(2, specification.scenario.steps.size)
+      assert_equal("Description", specification.description)
+      assert_equal("Title", specification.title)
+      assert_equal("sample", specification.name)
+    end
+  end
+end

data/test/test_rake.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'rubygems'
-require 'rutema/gems'
 require 'test/unit'
+require 'rubygems'
+require 'rake'
 require 'rutema/rake'
 
 module TestRutema
@@ -14,7 +14,6 @@ module TestRutema
       assert_equal([], t.rake_task.prerequisites)
       assert_nothing_raised() { t.add_dependency("some_task") }
       assert_equal(["some_task"], t.rake_task.prerequisites)
-      
     end
     
     def test_rake_task_block

data/test/test_runners.rb

@@ -0,0 +1,72 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+require 'test/unit'
+require 'ostruct'
+
+require 'rubygems'
+require 'patir/command'
+require 'mocha'
+
+require 'rutema/objectmodel'
+require 'rutema/runners/default'
+require 'rutema/runners/step'
+
+#$DEBUG=true
+module TestRutema
+  class TestRunner<Test::Unit::TestCase
+    def test_new
+      runner=Rutema::Runner.new
+      assert(!runner.attended?)
+      assert_nil(runner.setup)
+      assert_nil(runner.teardown)
+      assert(runner.states.empty?)
+    end
+    def test_run
+      runner=Rutema::Runner.new
+      scenario=Rutema::TestScenario.new
+      state1=runner.run("test1",scenario)
+      state2=runner.run("test2",scenario)
+      assert_equal(state1, runner["test1"])
+      assert_equal(state2, runner["test2"])
+      assert_equal(2, runner.states.size)
+      state2=runner.run("test2",scenario)
+      assert_equal(2, runner.states.size)
+    end
+    def test_run_exceptions
+      runner=Rutema::Runner.new
+      scenario=Rutema::TestScenario.new
+      step=Rutema::TestStep.new("bad",Patir::RubyCommand.new("bad"){|cmd| raise "Bad command"})
+      scenario.add_step(step)
+      state1=:success
+      assert_nothing_raised() { state1=runner.run("test1",scenario) }
+      assert_equal(:error, state1.status)
+    end
+    def test_reset
+      runner=Rutema::Runner.new
+      scenario=Rutema::TestScenario.new
+      state1=runner.run("test1",scenario)
+      state2=runner.run("test2",scenario)
+      assert_equal(2, runner.states.size)
+      runner.reset
+      assert(runner.states.empty?)
+    end
+    def test_ignore
+      step=OpenStruct.new("status"=>:not_executed)
+      step.stubs(:number).returns(1)
+      step.stubs(:name).returns("mock")
+      step.stubs(:step_type).returns("mock")
+      step.stubs(:output).returns("mock")
+      step.stubs(:error).returns("")
+      step.stubs(:strategy).returns(:attended)
+      step.stubs(:exec_time).returns(12)
+      step.stubs(:has_cmd?).returns(false)
+      step.expects(:ignore?).returns(true)
+      step.expects(:status).times(6).returns(:not_executed).then.returns(:not_executed).then.returns(:error).then.returns(:warning).then.returns(:warning).then.returns(:warning)
+      scenario=Rutema::TestScenario.new
+      scenario.expects(:attended?).returns(false)
+      scenario.stubs(:steps).returns([step])
+      runner=Rutema::Runner.new
+      runner.run("ignore",scenario)
+      assert(runner.success?,"run is not a success")
+    end
+  end
+end

data/test/test_system.rb

@@ -1,114 +1,14 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__),"..")
 require 'rubygems'
 require 'test/unit'
 require 'ostruct'
 require 'patir/command'
 require 'mocha'
+require 'lib/rutema/system'
+require 'lib/rutema/parsers/xml'
 
 #$DEBUG=true
 module TestRutema
-  require 'rutema/system'
-  class TestBaseXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<-EOT
-    <specification name="sample">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <step/>
-    <another_step script="script"/>
-    </scenario>
-    </specification>
-    EOT
-    INCLUDE_SPEC=<<-EOT
-    <specification name="include">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <step/>
-    <include_scenario file="#{File.expand_path(File.dirname(__FILE__))}/distro_test/specs/include.scenario"/>
-    </scenario>
-    </specification>
-    EOT
-    BAD_INCLUDE_SPEC=<<-EOT
-    <specification name="bad_include">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <include_scenario file=unknown.scenario"/>
-    </scenario>
-    </specification>
-    EOT
-    MISSING_INCLUDE_SPEC=<<-EOT
-    <specification name="bad_include">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <include_scenario/>
-    </scenario>
-    </specification>
-    EOT
-
-    def test_parse_specification
-      parser=Rutema::BaseXMLParser.new({})
-      specification=parser.parse_specification(SAMPLE_SPEC)
-      assert_equal("sample",specification.name)
-      assert_equal("Description", specification.description)
-      assert_equal("Title", specification.title)
-      assert(specification.scenario)
-      assert_equal(2, specification.scenario.steps.size)
-      assert_equal(1, specification.scenario.steps[0].number)
-      assert_equal("another_step", specification.scenario.steps[1].step_type)
-      assert_equal("script", specification.scenario.steps[1].script)
-      assert_equal(2, specification.scenario.steps[1].number)
-      assert_raise(Rutema::ParserError) { parser.parse_specification("") }
-      assert_raise(Rutema::ParserError) { parser.parse_specification("missing.spec") }
-    end
-
-    def test_include
-      parser=Rutema::BaseXMLParser.new({})
-      specification=parser.parse_specification(INCLUDE_SPEC)
-      assert_equal(3, specification.scenario.steps.size)
-      assert(specification.scenario.steps[2].has_included_in?)
-      assert_raise(Rutema::ParserError) {  parser.parse_specification(BAD_INCLUDE_SPEC) }
-      assert_raise(Rutema::ParserError) {  parser.parse_specification(MISSING_INCLUDE_SPEC) }
-    end
-
-  end
-
-  class TestExtensibleXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<-EOT
-    <specification name="sample">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <step/>
-    <another_step script="script"/>
-    </scenario>
-    </specification>
-    EOT
-    def test_parse_specification
-      parser=Rutema::ExtensibleXMLParser.new({})
-      assert_nil(parser.configuration)
-      assert_nothing_raised() { specification=parser.parse_specification(SAMPLE_SPEC) }
-    end
-  end
-  class TestMinimalXMlParser<Test::Unit::TestCase
-    SAMPLE_SPEC=<<-EOT
-    <specification name="sample">
-    <title>Title</title>
-    <description>Description</description>
-    <scenario>
-    <echo/>
-    <command cmd="l"/>
-    </scenario>
-    </specification>
-    EOT
-    def test_parse_specification
-      parser=Rutema::MinimalXMLParser.new({})
-      assert_nothing_raised() { @specification=parser.parse_specification(SAMPLE_SPEC) }
-      assert_equal(2, @specification.scenario.steps.size)
-    end
-  end
   class TestCoordinator<Test::Unit::TestCase
     def setup
       @prev_dir=Dir.pwd
@@ -145,67 +45,4 @@ module TestRutema
       puts coord.to_s if $DEBUG
     end
   end
-
-  class TestRunner<Test::Unit::TestCase
-    def test_new
-      runner=Rutema::Runner.new
-      assert(!runner.attended?)
-      assert_nil(runner.setup)
-      assert_nil(runner.teardown)
-      assert(runner.states.empty?)
-    end
-
-    def test_run
-      runner=Rutema::Runner.new
-      scenario=Rutema::TestScenario.new
-      state1=runner.run("test1",scenario)
-      state2=runner.run("test2",scenario)
-      assert_equal(state1, runner["test1"])
-      assert_equal(state2, runner["test2"])
-      assert_equal(2, runner.states.size)
-      state2=runner.run("test2",scenario)
-      assert_equal(2, runner.states.size)
-    end
-
-    def test_run_exceptions
-      runner=Rutema::Runner.new
-      scenario=Rutema::TestScenario.new
-      step=Rutema::TestStep.new("bad",Patir::RubyCommand.new("bad"){|cmd| raise "Bad command"})
-      scenario.add_step(step)
-      state1=:success
-      assert_nothing_raised() { state1=runner.run("test1",scenario) }
-      assert_equal(:error, state1.status)
-    end
-    def test_reset
-      runner=Rutema::Runner.new
-      scenario=Rutema::TestScenario.new
-      state1=runner.run("test1",scenario)
-      state2=runner.run("test2",scenario)
-      assert_equal(2, runner.states.size)
-      runner.reset
-      assert(runner.states.empty?)
-    end
-
-    def test_ignore
-      $DEBUG=true
-      step=OpenStruct.new("status"=>:not_executed)
-      step.stubs(:number).returns(1)
-      step.stubs(:name).returns("mock")
-      step.stubs(:step_type).returns("mock")
-      step.stubs(:output).returns("mock")
-      step.stubs(:error).returns("")
-      step.stubs(:strategy).returns(:attended)
-      step.stubs(:exec_time).returns(12)
-      step.stubs(:has_cmd?).returns(false)
-      step.expects(:ignore?).returns(true)
-      step.expects(:status).times(6).returns(:not_executed).then.returns(:not_executed).then.returns(:error).then.returns(:warning).then.returns(:warning)
-      scenario=Rutema::TestScenario.new
-      scenario.expects(:attended?).returns(false)
-      scenario.stubs(:steps).returns([step])
-      runner=Rutema::Runner.new
-      runner.run("ignore",scenario)
-      assert(runner.success?,"run is not a success")
-    end
-  end
-
 end