sapphire 0.7.21 → 0.7.22

data/bin/sapphire

@@ -10,7 +10,11 @@ $instances = []
 
 
 if ENV["reporter"]  
-  $reporters << ENV["reporter"]
+  reporters =  ENV["reporter"].split(',')
+
+  reporters.each do |r|
+    $reporters << r
+  end
 end
 
 if ENV["file"]
@@ -33,12 +37,14 @@ def Report(&block)
 end
 
 def Process()
+  ignore_console = false
   $reporters.each do |r|
     $instances << Object.const_get(r).new()
     $instances.last.file = @file if $instances.last.is_a? HtmlReporter
+    ignore_console = true if $instances.last.is_a? TeamCityReporter
   end
 
-  $instances << ConsoleReporter.new()
+  $instances << ConsoleReporter.new() if !ignore_console
 
   if Runner.instance.test_plans.count > 0
     Report do |x| x.BeginTesting end
@@ -59,9 +65,11 @@ def Process()
 
     Report do |x| x.TestingComplete end
     Report do |x| x.OutputResults end
+
   end
 end
 
+
 if @file.nil?
   Process()
 else
@@ -71,4 +79,3 @@ else
   end
 end
 
-

data/lib/sapphire.rb

@@ -26,12 +26,12 @@ module Sapphire
     include DSL::Configuration
     include DSL::Data
     include DSL::TestPlans
+    include DSL::Coverage
     include Configuration
     include DataAbstractions
     include JobAbstractions
     include WebAbstractions
     include Testing
-    include Testing::Coverage
     include Testing::TeamCity
     include UI
   end

data/lib/sapphire/DSL.rb

@@ -13,3 +13,4 @@ Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require fil
 Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/DSL/Events/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Coverage/*.rb'].each {|file| require file }

data/lib/sapphire/{Testing → DSL}/Coverage/Behavior.rb

@@ -1,5 +1,5 @@
 module Sapphire
-  module Testing
+  module DSL
     module Coverage
       def Behavior(token, hash)
         $features.last().AddBehavior(Behavior.new(token, hash))

data/lib/sapphire/{Testing → DSL}/Coverage/Covers.rb

@@ -1,6 +1,10 @@
 module Sapphire
-  module Testing
+  module DSL
     module Coverage
+      #def Covers(item)
+      #  Runner.instance.last_test_plan.Cover(item)
+      #end
+
       def Covers(hash)
         token = hash.keys.first
         target = hash[hash.keys.first]
@@ -9,14 +13,13 @@ module Sapphire
           $current_feature = target
         elsif(token == :requirement)
           $current_rule = target
-        elsif(token == :test)
+        elsif(token == :behavior)
           feature = $features.select { |f| f.token == $current_feature }[0]
           requirement = feature.requirements.select { |r| r.token == $current_rule }[0]
-          test = requirement.tests.select { |t| t.token == target }[0]
+          test = requirement.behaviors.select { |t| t.token == target }[0]
           test.is_covered = true
         end
-
       end
     end
   end
-end
+end

data/lib/sapphire/DSL/Coverage/Describe.rb

@@ -0,0 +1,9 @@
+module Sapphire
+  module DSL
+    module Coverage
+      def Describe(text)
+        $features.last().Describe(text)
+      end
+    end
+  end
+end

data/lib/sapphire/{Testing → DSL}/Coverage/Feature.rb

@@ -1,5 +1,5 @@
 module Sapphire
-  module Testing
+  module DSL
     module Coverage
       def Feature(token, &block)
         $features ||= []
@@ -25,6 +25,10 @@ module Sapphire
           @requirements.last().AddBehavior behavior
         end
 
+        def Describe(text)
+
+        end
+
       end
     end
   end

data/lib/sapphire/{Testing → DSL}/Coverage/Requirement.rb

@@ -1,8 +1,8 @@
 module Sapphire
-  module Testing
+  module DSL
     module Coverage
-      def Requirement(hash, &block)
-        $features.last.AddRequirement(Requirement.new(hash))
+      def Requirement(token, hash, &block)
+        $features.last.AddRequirement(Requirement.new(token, hash))
         block.call
       end
 
@@ -12,8 +12,8 @@ module Sapphire
         attr_reader :priority
         attr_reader :behaviors
 
-        def initialize(hash)
-          @token = hash.keys.first
+        def initialize(token, hash)
+          @token = token
           @priority = hash[hash.keys.first]
           @behaviors = []
         end

data/lib/sapphire/TeamCity.rb

@@ -1,4 +1,4 @@
-Dir[File.dirname(__FILE__) + '/TeamCity/*.rb'].each {|file| require file } if ENV["TeamCity"] == 1
+Dir[File.dirname(__FILE__) + '/TeamCity/*.rb'].each {|file| require file } if ENV["TeamCity"] == "1"
 
 module Sapphire
   module Testing

data/lib/sapphire/Testing/CoverageReporter.rb

@@ -0,0 +1,61 @@
+module Sapphire
+  module Testing
+    class CoverageReporter
+
+      def initialize()
+        @output = $stdout
+      end
+
+      def OutputResults()
+        @output.puts ""
+
+        $features.each do |feature|
+          @output.puts "Feature: " + feature.token.to_s
+
+          feature.requirements.each do |requirement|
+            @output.puts "\tRequirement: " + requirement.token.to_s
+
+
+            positiveCount = 0
+            negativeCount = 0
+            boundaryCount = 0
+            exceptionCount = 0
+
+            expectedPositiveCount = 0
+            expectedNegativeCount = 0
+            expectedBoundaryCount = 0
+            expectedExceptionCount = 0
+
+            requirement.behaviors.each do |behavior|
+
+              if behavior.type == :positive
+                positiveCount += 1 if behavior.is_covered
+                expectedPositiveCount += 1
+              end
+
+              if behavior.type == :negative
+                negativeCount += 1 if behavior.is_covered
+                expectedNegativeCount += 1
+              end
+
+              if behavior.type == :boundary
+                boundaryCount += 1 if behavior.is_covered
+                expectedBoundaryCount += 1
+              end
+
+              if behavior.type == :exception
+                exceptionCount += 1 if behavior.is_covered
+                expectedExceptionCount += 1
+              end
+            end
+
+            @output.puts "\t\tPositive: " + positiveCount.to_s + "/" + expectedPositiveCount.to_s + " covered."
+            @output.puts "\t\tNegative: " + negativeCount.to_s + "/" + expectedNegativeCount.to_s + " covered."
+            @output.puts "\t\tBoundary: " + boundaryCount.to_s + "/" + expectedBoundaryCount.to_s + " covered."
+            @output.puts "\t\tException: " + exceptionCount.to_s + "/" + expectedExceptionCount.to_s + " covered."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.21"
+  VERSION = "0.7.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9679440 !ruby/object:Gem::Requirement
+  requirement: &9789756 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9679440
+  version_requirements: *9789756
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9679188 !ruby/object:Gem::Requirement
+  requirement: &9789504 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9679188
+  version_requirements: *9789504
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9678936 !ruby/object:Gem::Requirement
+  requirement: &9789252 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9678936
+  version_requirements: *9789252
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -115,6 +115,11 @@ files:
 - lib/sapphire/DSL/Configuration/ConfiguredBrowser.rb
 - lib/sapphire/DSL/Configuration/ConfiguredUser.rb
 - lib/sapphire/DSL/Configuration/Use.rb
+- lib/sapphire/DSL/Coverage/Behavior.rb
+- lib/sapphire/DSL/Coverage/Covers.rb
+- lib/sapphire/DSL/Coverage/Describe.rb
+- lib/sapphire/DSL/Coverage/Feature.rb
+- lib/sapphire/DSL/Coverage/Requirement.rb
 - lib/sapphire/DSL/Data/Find.rb
 - lib/sapphire/DSL/Data/GetPageField.rb
 - lib/sapphire/DSL/Data/Verify.rb
@@ -150,7 +155,6 @@ files:
 - lib/sapphire/DSL/Scenarios/scenario.rb
 - lib/sapphire/DSL/Scenarios/then.rb
 - lib/sapphire/DSL/Scenarios/when.rb
-- lib/sapphire/DSL/TestPlans/Covers.rb
 - lib/sapphire/DSL/TestPlans/FileHandler.rb
 - lib/sapphire/DSL/TestPlans/Parameter.rb
 - lib/sapphire/DSL/TestPlans/PathHandler.rb
@@ -168,10 +172,7 @@ files:
 - lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/TeamCity.rb
 - lib/sapphire/Testing/ConsoleReporter.rb
-- lib/sapphire/Testing/Coverage/Behavior.rb
-- lib/sapphire/Testing/Coverage/Covers.rb
-- lib/sapphire/Testing/Coverage/Feature.rb
-- lib/sapphire/Testing/Coverage/Requirement.rb
+- lib/sapphire/Testing/CoverageReporter.rb
 - lib/sapphire/Testing/Executable.rb
 - lib/sapphire/Testing/ExpectationException.rb
 - lib/sapphire/Testing/HtmlReporter.rb

data/lib/sapphire/DSL/TestPlans/Covers.rb

@@ -1,9 +0,0 @@
-module Sapphire
-  module DSL
-    module TestPlans
-      def Covers(item)
-        Runner.instance.last_test_plan.Cover(item)
-      end
-    end
-  end
-end