mutant 0.5.24 → 0.5.25

data/spec/unit/mutant/subject/context_spec.rb

@@ -7,9 +7,10 @@ describe Mutant::Subject, '#context' do
     Class.new(described_class)
   end
 
-  let(:object)  { class_under_test.new(context, node) }
-  let(:node)    { double('Node')                      }
-  let(:context) { double('Context')                   }
+  let(:object)  { class_under_test.new(config, context, node) }
+  let(:config)  { Mutant::Config::DEFAULT                     }
+  let(:node)    { double('Node')                              }
+  let(:context) { double('Context')                           }
 
   it { should be(context) }
 

data/spec/unit/mutant/subject/method/instance_spec.rb

@@ -3,8 +3,9 @@
 require 'spec_helper'
 
 describe Mutant::Subject::Method::Instance do
-  let(:object)  { described_class.new(context, node) }
+  let(:object)  { described_class.new(config, context, node) }
   let(:context) { double }
+  let(:config)  { Mutant::Config::DEFAULT }
 
   let(:node) do
     s(:def, :foo, s(:args))
@@ -71,8 +72,9 @@ describe Mutant::Subject::Method::Instance do
 end
 
 describe Mutant::Subject::Method::Instance::Memoized do
-  let(:object)  { described_class.new(context, node) }
-  let(:context) { double }
+  let(:object)  { described_class.new(config, context, node) }
+  let(:context) { double                                     }
+  let(:config)  { Mutant::Config::DEFAULT                    }
 
   let(:node) do
     s(:def, :foo, s(:args))

data/spec/unit/mutant/subject/method/singleton_spec.rb

@@ -4,8 +4,9 @@ require 'spec_helper'
 
 describe Mutant::Subject::Method::Singleton do
 
-  let(:object)  { described_class.new(context, node) }
-  let(:context) { double }
+  let(:object)  { described_class.new(config, context, node) }
+  let(:config)  { Mutant::Config::DEFAULT                    }
+  let(:context) { double                                     }
 
   let(:node) do
     s(:defs, s(:self), :foo, s(:args))

data/spec/unit/mutant/subject_spec.rb

@@ -9,7 +9,9 @@ describe Mutant::Subject do
     end
   end
 
-  let(:object) { class_under_test.new(context, node) }
+  let(:object) { class_under_test.new(config, context, node) }
+
+  let(:config) { Mutant::Config::DEFAULT }
 
   let(:node) do
     double('Node', location: location)
@@ -36,4 +38,37 @@ describe Mutant::Subject do
 
     it { should eql('Test:source_path:source_line') }
   end
+
+  describe '#prepare' do
+    subject { object.prepare }
+
+    it_should_behave_like 'a command method'
+  end
+
+  describe '#node' do
+    subject { object.node }
+
+    it { should be(node) }
+
+    it_should_behave_like 'an idempotent method'
+  end
+
+  describe '#mutations' do
+    subject { object.mutations }
+
+    before do
+      expect(Mutant::Mutator).to receive(:each).with(node).and_yield(mutation_a).and_yield(mutation_b)
+    end
+
+    let(:mutation_a) { double('Mutation A') }
+    let(:mutation_b) { double('Mutation B') }
+
+    it 'generates neutral and evil mutations' do
+      should eql([
+        Mutant::Mutation::Neutral.new(object, node),
+        Mutant::Mutation::Evil.new(object, mutation_a),
+        Mutant::Mutation::Evil.new(object, mutation_b)
+      ])
+    end
+  end
 end

data/spec/unit/mutant/test_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Mutant::Test do
+  let(:object) { described_class.new(integration, expression) }
+
+  let(:integration) { double('Integration', name: 'test-integration') }
+  let(:expression)  { double('Expression', syntax: 'test-syntax') }
+
+  describe '#identification' do
+    subject { object.identification }
+
+    it { should eql('test-integration:test-syntax') }
+  end
+
+  describe '#run' do
+    subject { object.run }
+
+    let(:report) { double('Report') }
+
+    it 'runs test via integration' do
+      expect(integration).to receive(:run).with(object).and_return(report)
+      expect(subject).to be(report)
+    end
+  end
+end

data/spec/unit/mutant/warning_expectation.rb

@@ -4,7 +4,7 @@ describe Mutant::WarningExpectation do
   let(:object) { described_class.new(expected_warnings) }
 
   let(:expected_warnings) { [] }
-  let(:warnings) { [] }
+  let(:actual_warnings)   { [] }
 
   let(:warning_a) { "foo.rb:10: warning: We have a problem!\n" }
   let(:warning_b) { "bar.rb:10: warning: We have an other problem!\n" }
@@ -19,7 +19,7 @@ describe Mutant::WarningExpectation do
     let(:block) do
       lambda do
         @called = true
-        warnings.each(&Kernel.method(:warn))
+        actual_warnings.each(&Kernel.method(:warn))
       end
     end
 
@@ -28,6 +28,7 @@ describe Mutant::WarningExpectation do
     end
 
     context 'when no warnings occur during block execution' do
+
       context 'and no warnings are expected' do
         it_should_behave_like 'a command method'
       end
@@ -35,20 +36,22 @@ describe Mutant::WarningExpectation do
       context 'and warnings are expected' do
         let(:expected_warnings) { [warning_a] }
 
-        it 'raises an expectation error' do
-          expect { subject }.to raise_error(Mutant::WarningExpectation::ExpectationError.new([], [warning_a]))
+        before do
+          expect($stderr).to receive(:puts).with("Expected but missing warnings: #{expected_warnings}")
         end
+
+        it_should_behave_like 'a command method'
       end
     end
 
     context 'when warnings occur during block execution' do
-      let(:warnings) { [warning_a, warning_b] }
+      let(:actual_warnings) { [warning_a, warning_b] }
 
       context 'and only some no warnings are expected' do
         let(:expected_warnings) { [warning_a] }
 
         it 'raises an expectation error' do
-          expect { subject }.to raise_error(Mutant::WarningExpectation::ExpectationError.new([warning_b], []))
+          expect { subject }.to raise_error(Mutant::WarningExpectation::ExpectationError.new(expected_warnings))
         end
       end
 
@@ -60,10 +63,10 @@ describe Mutant::WarningExpectation do
 
       context 'and there is an expected warning missing' do
         let(:expected_warnings) { [warning_a] }
-        let(:warnings)          { [warning_b] }
+        let(:actual_warnings)   { [warning_b] }
 
         it 'raises an expectation error' do
-          expect { subject }.to raise_error(Mutant::WarningExpectation::ExpectationError.new([warning_b], [warning_a]))
+          expect { subject }.to raise_error(Mutant::WarningExpectation::ExpectationError.new([warning_b]))
         end
       end
     end

data/spec/unit/mutant_spec.rb

@@ -1,9 +1,18 @@
 require 'spec_helper'
 
 describe Mutant do
-  describe '.singleton_subclass_instance' do
-    let(:object) { described_class }
+  let(:object) { described_class }
+
+  describe '.zombify' do
+    subject { object.zombify }
+
+    it 'calls the zombifier' do
+      expect(Mutant::Zombifier).to receive(:run).with('mutant', :Zombie)
+      subject
+    end
+  end
 
+  describe '.singleton_subclass_instance' do
     subject { object.singleton_subclass_instance(name, superclass, &block) }
 
     before { subject }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.25
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -296,11 +296,11 @@ files:
 - lib/mutant/expression/namespace.rb
 - lib/mutant/integration.rb
 - lib/mutant/isolation.rb
-- lib/mutant/killer.rb
 - lib/mutant/loader.rb
 - lib/mutant/matcher.rb
-- lib/mutant/matcher/builder.rb
 - lib/mutant/matcher/chain.rb
+- lib/mutant/matcher/compiler.rb
+- lib/mutant/matcher/config.rb
 - lib/mutant/matcher/filter.rb
 - lib/mutant/matcher/method.rb
 - lib/mutant/matcher/method/finder.rb
@@ -314,8 +314,6 @@ files:
 - lib/mutant/meta/example.rb
 - lib/mutant/meta/example/dsl.rb
 - lib/mutant/mutation.rb
-- lib/mutant/mutation/evil.rb
-- lib/mutant/mutation/neutral.rb
 - lib/mutant/mutator.rb
 - lib/mutant/mutator/node.rb
 - lib/mutant/mutator/node/and_asgn.rb
@@ -380,29 +378,28 @@ files:
 - lib/mutant/reporter/cli/printer.rb
 - lib/mutant/reporter/cli/progress.rb
 - lib/mutant/reporter/cli/progress/config.rb
-- lib/mutant/reporter/cli/progress/mutation.rb
+- lib/mutant/reporter/cli/progress/env.rb
 - lib/mutant/reporter/cli/progress/noop.rb
+- lib/mutant/reporter/cli/progress/result.rb
+- lib/mutant/reporter/cli/progress/result/mutation.rb
+- lib/mutant/reporter/cli/progress/result/subject.rb
 - lib/mutant/reporter/cli/progress/subject.rb
 - lib/mutant/reporter/cli/registry.rb
 - lib/mutant/reporter/cli/report.rb
-- lib/mutant/reporter/cli/report/config.rb
+- lib/mutant/reporter/cli/report/env.rb
 - lib/mutant/reporter/cli/report/mutation.rb
 - lib/mutant/reporter/cli/report/subject.rb
+- lib/mutant/reporter/cli/report/test.rb
 - lib/mutant/reporter/null.rb
 - lib/mutant/reporter/trace.rb
 - lib/mutant/require_highjack.rb
-- lib/mutant/rspec.rb
+- lib/mutant/result.rb
 - lib/mutant/runner.rb
-- lib/mutant/runner/config.rb
-- lib/mutant/runner/killer.rb
-- lib/mutant/runner/mutation.rb
-- lib/mutant/runner/subject.rb
 - lib/mutant/subject.rb
 - lib/mutant/subject/method.rb
 - lib/mutant/subject/method/instance.rb
 - lib/mutant/subject/method/singleton.rb
 - lib/mutant/test.rb
-- lib/mutant/test/report.rb
 - lib/mutant/version.rb
 - lib/mutant/walker.rb
 - lib/mutant/warning_expectation.rb
@@ -481,8 +478,7 @@ files:
 - spec/support/mutation_verifier.rb
 - spec/support/rspec.rb
 - spec/support/test_app.rb
-- spec/unit/mutant/cli_new_spec.rb
-- spec/unit/mutant/cli_run_spec.rb
+- spec/unit/mutant/cli_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
 - spec/unit/mutant/context/scope/unqualified_name_spec.rb
@@ -491,28 +487,30 @@ files:
 - spec/unit/mutant/expression/methods_spec.rb
 - spec/unit/mutant/expression/namespace/flat_spec.rb
 - spec/unit/mutant/expression/namespace/recursive_spec.rb
+- spec/unit/mutant/expression_spec.rb
 - spec/unit/mutant/integration_spec.rb
 - spec/unit/mutant/isolation_spec.rb
 - spec/unit/mutant/loader/eval_spec.rb
 - spec/unit/mutant/matcher/chain_spec.rb
+- spec/unit/mutant/matcher/compiler_spec.rb
+- spec/unit/mutant/matcher/filter_spec.rb
 - spec/unit/mutant/matcher/method/instance_spec.rb
 - spec/unit/mutant/matcher/method/singleton_spec.rb
 - spec/unit/mutant/matcher/methods/instance_spec.rb
 - spec/unit/mutant/matcher/methods/singleton_spec.rb
 - spec/unit/mutant/matcher/namespace_spec.rb
+- spec/unit/mutant/matcher/null_spec.rb
 - spec/unit/mutant/mutation_spec.rb
 - spec/unit/mutant/mutator/node_spec.rb
+- spec/unit/mutant/reporter/cli_spec.rb
 - spec/unit/mutant/reporter/null_spec.rb
 - spec/unit/mutant/require_highjack_spec.rb
-- spec/unit/mutant/runner/config_spec.rb
-- spec/unit/mutant/runner/mutation_spec.rb
-- spec/unit/mutant/runner/subject_spec.rb
+- spec/unit/mutant/runner_spec.rb
 - spec/unit/mutant/subject/context_spec.rb
 - spec/unit/mutant/subject/method/instance_spec.rb
 - spec/unit/mutant/subject/method/singleton_spec.rb
-- spec/unit/mutant/subject/mutations_spec.rb
-- spec/unit/mutant/subject/node_spec.rb
 - spec/unit/mutant/subject_spec.rb
+- spec/unit/mutant/test_spec.rb
 - spec/unit/mutant/warning_expectation.rb
 - spec/unit/mutant/warning_filter_spec.rb
 - spec/unit/mutant_spec.rb
@@ -555,8 +553,7 @@ test_files:
 - spec/integration/mutant/rspec_spec.rb
 - spec/integration/mutant/test_mutator_handles_types_spec.rb
 - spec/integration/mutant/zombie_spec.rb
-- spec/unit/mutant/cli_new_spec.rb
-- spec/unit/mutant/cli_run_spec.rb
+- spec/unit/mutant/cli_spec.rb
 - spec/unit/mutant/context/root_spec.rb
 - spec/unit/mutant/context/scope/root_spec.rb
 - spec/unit/mutant/context/scope/unqualified_name_spec.rb
@@ -565,28 +562,30 @@ test_files:
 - spec/unit/mutant/expression/methods_spec.rb
 - spec/unit/mutant/expression/namespace/flat_spec.rb
 - spec/unit/mutant/expression/namespace/recursive_spec.rb
+- spec/unit/mutant/expression_spec.rb
 - spec/unit/mutant/integration_spec.rb
 - spec/unit/mutant/isolation_spec.rb
 - spec/unit/mutant/loader/eval_spec.rb
 - spec/unit/mutant/matcher/chain_spec.rb
+- spec/unit/mutant/matcher/compiler_spec.rb
+- spec/unit/mutant/matcher/filter_spec.rb
 - spec/unit/mutant/matcher/method/instance_spec.rb
 - spec/unit/mutant/matcher/method/singleton_spec.rb
 - spec/unit/mutant/matcher/methods/instance_spec.rb
 - spec/unit/mutant/matcher/methods/singleton_spec.rb
 - spec/unit/mutant/matcher/namespace_spec.rb
+- spec/unit/mutant/matcher/null_spec.rb
 - spec/unit/mutant/mutation_spec.rb
 - spec/unit/mutant/mutator/node_spec.rb
+- spec/unit/mutant/reporter/cli_spec.rb
 - spec/unit/mutant/reporter/null_spec.rb
 - spec/unit/mutant/require_highjack_spec.rb
-- spec/unit/mutant/runner/config_spec.rb
-- spec/unit/mutant/runner/mutation_spec.rb
-- spec/unit/mutant/runner/subject_spec.rb
+- spec/unit/mutant/runner_spec.rb
 - spec/unit/mutant/subject/context_spec.rb
 - spec/unit/mutant/subject/method/instance_spec.rb
 - spec/unit/mutant/subject/method/singleton_spec.rb
-- spec/unit/mutant/subject/mutations_spec.rb
-- spec/unit/mutant/subject/node_spec.rb
 - spec/unit/mutant/subject_spec.rb
+- spec/unit/mutant/test_spec.rb
 - spec/unit/mutant/warning_expectation.rb
 - spec/unit/mutant/warning_filter_spec.rb
 - spec/unit/mutant_spec.rb

data/lib/mutant/killer.rb

@@ -1,44 +0,0 @@
-module Mutant
-  # Mutation killer
-  class Killer
-    include Adamantium::Flat, Anima.new(:test, :mutation)
-
-    # Report object for kill results
-    class Report
-      include Anima.new(
-        :killer,
-        :test_report
-      )
-
-      # Test if kill was successful
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def success?
-        killer.mutation.should_fail?.equal?(test_report.failed?)
-      end
-
-    end # Report
-
-    # Return killer report
-    #
-    # @return [Killer::Report]
-    #
-    # @api private
-    #
-    def run
-      test_report = Isolation.call do
-        mutation.insert
-        test.run
-      end
-
-      Report.new(
-        killer:      self,
-        test_report: test_report.update(test: test)
-      )
-    end
-
-  end # Killer
-end # Mutant

data/lib/mutant/matcher/builder.rb

@@ -1,142 +0,0 @@
-module Mutant
-  class Matcher
-    # Builder for complex matchers
-    class Builder
-      include Concord.new(:env), AST::Sexp
-
-      # Initalize object
-      #
-      # @param [Cache] env
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def initialize(env)
-        super
-        @matchers          = []
-        @subject_ignores   = []
-        @subject_selectors = []
-      end
-
-      # Add a subject ignore
-      #
-      # @param [Expression] expression
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_subject_ignore(expression)
-        @subject_ignores << expression.matcher(env)
-        self
-      end
-
-      # Add a subject selector
-      #
-      # @param [#call] selector
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_subject_selector(attribute, value)
-        @subject_selectors << Morpher.compile(s(:eql, s(:attribute, attribute), s(:static, value)))
-        self
-      end
-
-      # Add a match expression
-      #
-      # @param [Expression] expression
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_match_expression(expression)
-        @matchers << expression.matcher(env)
-        self
-      end
-
-      # Return generated matcher
-      #
-      # @return [Mutant::Matcher]
-      #
-      # @api private
-      #
-      def matcher
-        if @matchers.empty?
-          return Matcher::Null.new
-        end
-
-        matcher = Matcher::Chain.build(@matchers)
-
-        if predicate
-          Matcher::Filter.new(matcher, predicate)
-        else
-          matcher
-        end
-      end
-
-    private
-
-      # Return subject selector
-      #
-      # @return [#call]
-      #   if selector is present
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def subject_selector
-        Morpher::Evaluator::Predicate::Boolean::Or.new(@subject_selectors) if @subject_selectors.any?
-      end
-
-      # Return predicate
-      #
-      # @return [#call]
-      #   if filter is needed
-      #
-      # @return [nil]
-      #   othrwise
-      #
-      # @api private
-      #
-      def predicate
-        if subject_selector && subject_rejector
-          Morpher::Evaluator::Predicate::Boolean::And.new([
-            subject_selector,
-            Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-          ])
-        elsif subject_selector
-          subject_selector
-        elsif subject_rejector
-          Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-        else
-          nil
-        end
-      end
-
-      # Return subject rejector
-      #
-      # @return [#call]
-      #   if there is a subject rejector
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def subject_rejector
-        rejectors = @subject_ignores.flat_map(&:to_a).map do |subject|
-          Morpher.compile(s(:eql, s(:attribute, :identification), s(:static, subject.identification)))
-        end
-
-        Morpher::Evaluator::Predicate::Boolean::Or.new(rejectors) if rejectors.any?
-      end
-
-    end # Builder
-  end # Matcher
-end # Mutant