mutiny 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb1518ee7685be979e2c8126897e4adc1c1968a
-  data.tar.gz: 8e7c06989301a0b963b975e66a377ed7292fa15e
+  metadata.gz: c8022ed2607c22424b82450df4d6677b0cca31f7
+  data.tar.gz: 5ae8a0cbc564142fd95b3dbea091c9de2743fe66
 SHA512:
-  metadata.gz: 317e070449d82430923f27b231360bc3e881189e17dd6ebef48dcea0e5e4a69dbfc3a5921ead07f4de0492ff8899a374b9e119df9a41a082a80932ec72d4efc3
-  data.tar.gz: 32d348132b09838e11cbde3e189b605cc4bf1fb45b8e956f4856411fdc5ef62a9d1342808eac796d75341df7cdb182fe1b08eb0c72385faecdd337c9ed79348f
+  metadata.gz: 260df403d7bd1d04c1516f08098792f31920ef4b15a6f98eafb1e97d79f7fb71090f84d766b003bd52798555a5de86aaef9519e769d7da7976da24ae6daeb7ad
+  data.tar.gz: f4e6fbfe0cc8a16a4d1055234babbae6f0f381dc4a4a1d332c1127d589a2d19cd4732c9c6dba48752fafc2cacc872468c07896bbd2889a5447aa906117c8c0ac

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    mutiny (0.2.8)
+    mutiny (0.3.0)
       gli (~> 2.13.0)
-      metamorpher (~> 0.2.5)
+      metamorpher (~> 0.2.6)
       parser (~> 2.2.2)
       unparser (~> 0.2.4)
 
@@ -51,7 +51,7 @@ GEM
     json (1.8.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    metamorpher (0.2.5)
+    metamorpher (0.2.6)
       attributable (~> 0.1.0)
       parser (~> 2.2.2)
       unparser (~> 0.2.4)

data/RELEASES.md

@@ -1,5 +1,11 @@
 # Release History
 
+## v0.3.0 (18 March 2016)
+* Implement more sophisticated test filtering, which works well with targeted tests (e.g., "List#empty should have size 0") and with generic tests (e.g., "Users should be able to log out").
+* Capture more forms of stillborn mutant, including those arising from instances of `ScriptError`.
+* Fix bug in which mutation would be repeated if there was more than one subject in a single source file.
+* Fix bugs in mutations of hash literals and array literals.
+
 ## v0.2.8 (22 February 2016)
 * Prevent insertion operators from incorrectly mutating private and protected keywords.
 * Fix bugs in mutating overlapping ASTs (by upgrading to metamorpher v0.2.5).

data/lib/mutiny/analysis/analyser/default.rb

@@ -4,8 +4,12 @@ module Mutiny
   module Analysis
     class Analyser
       class Default < self
+        def before_all(mutant_set)
+          @subject_set = Subjects::SubjectSet.new(mutant_set.subjects)
+        end
+
         def select_tests(mutant)
-          integration.tests.for(mutant.subject) # TODO: is this correctly minimal?
+          integration.tests.filterable(@subject_set).for(mutant.subject)
         end
       end
     end

data/lib/mutiny/integration/rspec/parser.rb

@@ -7,8 +7,6 @@ module Mutiny
       # This code originally based on Markus Schirp's implementation of Mutant::Integration::Rspec
       #  https://github.com/mbj/mutant/blob/master/lib/mutant/integration/rspec.rb
       class Parser
-        EXPRESSION_DELIMITER = " "
-
         def initialize(context = Context.new)
           @world = context.world
         end
@@ -26,9 +24,9 @@ module Mutiny
         def parse_example(example)
           metadata = example.metadata
           location = metadata.fetch(:location)
-          expression = metadata.fetch(:full_description).split(EXPRESSION_DELIMITER, 2).first
+          name = metadata.fetch(:full_description)
 
-          Test.new(location: location, expression: expression, example: example)
+          Test.new(location: location, name: name, example: example)
         end
       end
     end

data/lib/mutiny/mode/check.rb

@@ -6,7 +6,7 @@ module Mutiny
       def run
         report "Checking..."
 
-        if test_set.empty?
+        if relevant_test_set.empty?
           report_invalid
 
         elsif test_run.passed?
@@ -25,7 +25,7 @@ module Mutiny
       end
 
       def report_warning
-        report "  At least one relevant test found (#{test_set.size} in total)"
+        report "  At least one relevant test found (#{relevant_test_set.size} in total)"
         report "  Not all relevant tests passed. The failing tests are:\n"
 
         failed_test_locations.each do |location|
@@ -37,7 +37,7 @@ module Mutiny
       end
 
       def report_valid
-        report "  At least one relevant test found (#{test_set.size} in total)"
+        report "  At least one relevant test found (#{relevant_test_set.size} in total)"
         report "  All relevant tests passed"
         report "Looks good!"
       end
@@ -50,12 +50,16 @@ module Mutiny
         test_run.failed_tests.locations
       end
 
-      def test_set
-        @test_set ||= configuration.integration.tests.for_all(environment.subjects)
+      def relevant_test_set
+        @test_set ||= complete_test_set.for_all(environment.subjects)
+      end
+
+      def complete_test_set
+        @complete_test_set ||= configuration.integration.tests.filterable(environment.subjects)
       end
 
       def test_run
-        @test_run ||= configuration.integration.run(test_set)
+        @test_run ||= configuration.integration.run(relevant_test_set)
       end
     end
   end

data/lib/mutiny/mutants/mutant.rb

@@ -27,7 +27,7 @@ module Mutiny
         # rubocop:disable Eval
         eval(code, TOPLEVEL_BINDING)
         # rubocop:enable Eval
-      rescue
+      rescue StandardError, ScriptError
         @stillborn = true
       end
 

data/lib/mutiny/subjects/environment.rb

@@ -12,7 +12,7 @@ module Mutiny
       end
 
       def subjects
-        SubjectSet.new(modules.select(&:relevant?).map(&:to_subject))
+        SubjectSet.new(modules.select(&:relevant?).map(&:to_subject)).per_file
       end
 
       private

data/lib/mutiny/subjects/subject_set.rb

@@ -3,7 +3,8 @@ module Mutiny
     class SubjectSet
       include Enumerable
       extend Forwardable
-      def_delegators :@subjects, :each, :product
+      attr_reader :subjects
+      def_delegators :@subjects, :each, :product, :hash
 
       def initialize(subjects)
         @subjects = subjects
@@ -12,6 +13,23 @@ module Mutiny
       def names
         @names ||= map(&:name).sort
       end
+
+      def [](index)
+        subjects.detect { |s| s.name == index }
+      end
+
+      # Returns a new SubjectSet which contains only one subject per source file
+      # For source files that contain more than one subject (i.e., Ruby module),
+      # the subjects are ordered by name alphabetically and only the first is used
+      def per_file
+        self.class.new(group_by(&:path).values.map { |subjects| subjects.sort_by(&:name).first })
+      end
+
+      def eql?(other)
+        is_a?(other.class) && other.subjects == subjects
+      end
+
+      alias_method "==", "eql?"
     end
   end
 end

data/lib/mutiny/tests/test.rb

@@ -1,11 +1,21 @@
 module Mutiny
   module Tests
     class Test
-      attr_reader :location, :expression
+      attr_reader :location, :name
 
-      def initialize(location: nil, expression:)
+      def initialize(location: nil, name:)
         @location = location
-        @expression = expression
+        @name = name
+      end
+
+      def eql?(other)
+        other.location == location && other.name == name
+      end
+
+      alias_method "==", "eql?"
+
+      def hash
+        [location, name].hash
       end
     end
   end

data/lib/mutiny/tests/test_set.rb

@@ -1,4 +1,6 @@
 require "forwardable"
+require_relative "test_set/filterable"
+require_relative "test_set/filter/default"
 
 module Mutiny
   module Tests
@@ -18,31 +20,38 @@ module Mutiny
         tests.map(&:location)
       end
 
-      def for_all(subject_set)
-        subset { |test| subject_set.names.include?(test.expression) }
-      end
-
-      def for(subject)
-        subset { |test| subject.name == test.expression }
-      end
-
       def subset(&block)
-        self.class.new(tests.select(&block))
+        derive(tests.select(&block))
       end
 
       def take(n)
-        self.class.new(tests.take(n))
+        derive(tests.take(n))
       end
 
       def eql?(other)
         is_a?(other.class) && other.tests == tests
       end
 
+      def filterable(subjects, filtering_strategy: Filter::Default)
+        extend(Filterable)
+        self.filter = filtering_strategy.new(subject_names: subjects.names)
+        self
+      end
+
       alias_method "==", "eql?"
 
       protected
 
       attr_reader :tests
+
+      def derive(tests)
+        self.class.new(tests).tap do |derived|
+          if respond_to?(:filter)
+            derived.extend(Filterable)
+            derived.filter = filter
+          end
+        end
+      end
     end
   end
 end

data/lib/mutiny/tests/test_set/filter.rb

@@ -0,0 +1,19 @@
+module Mutiny
+  module Tests
+    class TestSet
+      class Filter
+        def initialize(subject_names:)
+          @subject_names = subject_names
+        end
+
+        def related?(subject_name:, test_name:)
+          fail "Subclasses must implement Filter#related? for #{subject_name}, #{test_name}"
+        end
+
+        protected
+
+        attr_reader :subject_names
+      end
+    end
+  end
+end

data/lib/mutiny/tests/test_set/filter/default.rb

@@ -0,0 +1,29 @@
+require_relative "../filter"
+
+module Mutiny
+  module Tests
+    class TestSet
+      class Filter
+        class Default < self
+          def related?(subject_name:, test_name:)
+            general?(test_name) || specific_to?(test_name, subject_name)
+          end
+
+          private
+
+          # Returns true if the test is applicable to no specific subject
+          # (e.g., is an end-to-end test)
+          def general?(test_name)
+            subject_names.none? { |subject_name| test_name.start_with?(subject_name) }
+          end
+
+          # Returns true if the test is specific to the given subject
+          # (e.g., is a unit test for the specified subject)
+          def specific_to?(test_name, subject_name)
+            test_name.start_with?(subject_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mutiny/tests/test_set/filterable.rb

@@ -0,0 +1,26 @@
+require "forwardable"
+require_relative "filter/default"
+
+module Mutiny
+  module Tests
+    class TestSet
+      module Filterable
+        attr_accessor :filter
+
+        def for_all(subject_set)
+          subset { |test| subject_set.any? { |subject| related?(subject, test) } }
+        end
+
+        def for(subject)
+          subset { |test| related?(subject, test) }
+        end
+
+        private
+
+        def related?(subject, test)
+          filter.related?(subject_name: subject.name, test_name: test.name)
+        end
+      end
+    end
+  end
+end

data/lib/mutiny/version.rb

@@ -1,3 +1,3 @@
 module Mutiny
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/mutiny.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "parser", "~> 2.2.2"
   spec.add_runtime_dependency "unparser", "~> 0.2.4"
   spec.add_runtime_dependency "gli", "~> 2.13.0"
-  spec.add_runtime_dependency "metamorpher", "~> 0.2.5"
+  spec.add_runtime_dependency "metamorpher", "~> 0.2.6"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.4.2"

data/spec/unit/subjects/subject_set_spec.rb

@@ -0,0 +1,27 @@
+module Mutiny
+  module Subjects
+    describe SubjectSet do
+      context "per_file" do
+        it "should contain only the alphabetically first subject when more than one in a file" do
+          first = Subject.new(name: "Bar", path: "main.rb")
+          second = Subject.new(name: "Foo", path: "main.rb")
+          nested = Subject.new(name: "Foo::Bar", path: "main.rb")
+
+          all_subjects = SubjectSet.new([first, second, nested])
+
+          expect(all_subjects.per_file).to eq(SubjectSet.new([first]))
+        end
+
+        it "should contain all subjects when there are one-per-file" do
+          first = Subject.new(name: "Bar", path: "bar.rb")
+          second = Subject.new(name: "Foo", path: "foo.rb")
+          nested = Subject.new(name: "Foo::Bar", path: "foo/bar.rb")
+
+          all_subjects = SubjectSet.new([first, second, nested])
+
+          expect(all_subjects.per_file).to eq(all_subjects)
+        end
+      end
+    end
+  end
+end

data/spec/unit/tests/test_set/filter/default_spec.rb

@@ -0,0 +1,32 @@
+module Mutiny
+  module Tests
+    class TestSet
+      class Filter
+        describe Default do
+          subject { Default.new(subject_names: %w(Max Min)) }
+
+          it "should return true when the test and subject have the same name" do
+            expect(subject.related?(subject_name: "Max", test_name: "Max")).to be_truthy
+          end
+
+          it "should return true when the test is for a specific method in the subject" do
+            expect(subject.related?(subject_name: "Max", test_name: "Max.run")).to be_truthy
+          end
+
+          it "should return true when the test is for a specific class method in the subject" do
+            expect(subject.related?(subject_name: "Max", test_name: "Max#run")).to be_truthy
+          end
+
+          it "should return false when the test and subject have different names" do
+            expect(subject.related?(subject_name: "Min", test_name: "Max")).to be_falsey
+          end
+
+          it "should return true when the test does not begin with a known subject" do
+            expect(subject.related?(subject_name: "Max", test_name: "system test")).to be_truthy
+            expect(subject.related?(subject_name: "Min", test_name: "system test")).to be_truthy
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/tests/test_set/filterable_spec.rb

@@ -0,0 +1,61 @@
+module Mutiny
+  module Tests
+    class TestSet
+      describe Filterable do
+        context "for" do
+          let(:subjects) { subject_set_for("Max", "Min") }
+          let(:test_set) { test_set_for("Min", "Min#run", subjects: subjects) }
+
+          it "should return only those tests that are relevant to the subject" do
+            expected = test_set_for("Min", "Min#run", subjects: subjects)
+            expect(test_set.for(subjects["Min"])).to eq(expected)
+          end
+
+          it "should return no tests if none are relevant to the subject" do
+            expect(test_set.for(subjects["Max"])).to eq(TestSet.empty)
+          end
+        end
+
+        context "for all" do
+          let(:subjects) { subject_set_for("Max", "Min") }
+          let(:test_set) { test_set_for("Min", "Min#run", subjects: subjects) }
+
+          it "should remove irrelevant tests" do
+            expected = test_set.subset { |t| t.name != "Subtract" }
+
+            expect(test_set.for_all(subjects)).to eq(expected)
+          end
+
+          it "should return all relevant tests" do
+            expected = test_set.subset { |t| t.name.start_with?("Min") }
+
+            expect(test_set.for_all(subjects)).to eq(expected)
+          end
+
+          it "should return no tests when there are no tests" do
+            expect(TestSet.empty.filterable(subjects).for_all(subjects)).to eq(TestSet.empty)
+          end
+        end
+
+        def subject_set_for(*names)
+          Subjects::SubjectSet.new(names.map { |n| Subjects::Subject.new(name: n) })
+        end
+
+        def test_set_for(*expressions, subjects:)
+          TestSet.new(tests_for(*expressions))
+            .filterable(subjects, filtering_strategy: DummyStrategy)
+        end
+
+        def tests_for(*names)
+          names.map { |name| Test.new(name: name) }
+        end
+
+        class DummyStrategy < Filter
+          def related?(subject_name:, test_name:)
+            test_name.start_with?(subject_name)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/tests/test_set_spec.rb

@@ -0,0 +1,37 @@
+module Mutiny
+  module Tests
+    describe TestSet do
+      let(:tests) { %w(test1 test2 test3) }
+      subject { TestSet.new(tests) }
+
+      context "take" do
+        it "(n) should return TestSet containing first n tests" do
+          expect(subject.take(2)).to eq(TestSet.new(tests.take(2)))
+        end
+
+        it "(0) should return an empty TestSet" do
+          expect(subject.take(0)).to eq(TestSet.empty)
+        end
+
+        it "(n) of an empty TestSet should return an empty TestSet" do
+          expect(TestSet.empty.take(2)).to eq(TestSet.empty)
+        end
+      end
+
+      context "subset" do
+        it "should return TestSet containing tests that match condition" do
+          subset = subject.subset { |t| t.end_with? "2" }
+          expected = TestSet.new(tests.select { |t| t.end_with? "2" })
+
+          expect(subset).to eq(expected)
+        end
+
+        it "should return empty TestSet when no tests match condition" do
+          subset = subject.subset { |_| false }
+
+          expect(subset).to eq(TestSet.empty)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutiny
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Louis Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,9 @@ files:
 - lib/mutiny/tests/test.rb
 - lib/mutiny/tests/test_run.rb
 - lib/mutiny/tests/test_set.rb
+- lib/mutiny/tests/test_set/filter.rb
+- lib/mutiny/tests/test_set/filter/default.rb
+- lib/mutiny/tests/test_set/filterable.rb
 - lib/mutiny/version.rb
 - mutiny.gemspec
 - spec/integration/check_spec.rb
@@ -284,8 +287,11 @@ files:
 - spec/unit/pattern_spec.rb
 - spec/unit/subjects/environment/type_spec.rb
 - spec/unit/subjects/environment_spec.rb
+- spec/unit/subjects/subject_set_spec.rb
 - spec/unit/subjects/subject_spec.rb
-- spec/unit/subjects/test_set_spec.rb
+- spec/unit/tests/test_set/filter/default_spec.rb
+- spec/unit/tests/test_set/filterable_spec.rb
+- spec/unit/tests/test_set_spec.rb
 homepage: https://github.com/mutiny/mutiny
 licenses:
 - MIT
@@ -345,5 +351,8 @@ test_files:
 - spec/unit/pattern_spec.rb
 - spec/unit/subjects/environment/type_spec.rb
 - spec/unit/subjects/environment_spec.rb
+- spec/unit/subjects/subject_set_spec.rb
 - spec/unit/subjects/subject_spec.rb
-- spec/unit/subjects/test_set_spec.rb
+- spec/unit/tests/test_set/filter/default_spec.rb
+- spec/unit/tests/test_set/filterable_spec.rb
+- spec/unit/tests/test_set_spec.rb

data/spec/unit/subjects/test_set_spec.rb

@@ -1,75 +0,0 @@
-module Mutiny
-  module Tests
-    describe TestSet do
-      let(:tests) { %w(test1 test2 test3) }
-      subject { TestSet.new(tests) }
-
-      context "take" do
-        it "(n) should return TestSet containing first n tests" do
-          expect(subject.take(2)).to eq(TestSet.new(tests.take(2)))
-        end
-
-        it "(0) should return an empty TestSet" do
-          expect(subject.take(0)).to eq(TestSet.empty)
-        end
-
-        it "(n) of an empty TestSet should return an empty TestSet" do
-          expect(TestSet.empty.take(2)).to eq(TestSet.empty)
-        end
-      end
-
-      context "subset" do
-        it "should return TestSet containing tests that match condition" do
-          subset = subject.subset { |t| t.end_with? "2" }
-          expected = TestSet.new(tests.select { |t| t.end_with? "2" })
-
-          expect(subset).to eq(expected)
-        end
-
-        it "should return empty TestSet when no tests match condition" do
-          subset = subject.subset { |_| false }
-
-          expect(subset).to eq(TestSet.empty)
-        end
-      end
-
-      context "for" do
-        it "should return only those tests (whose expression) matches a subject" do
-          subjects = subject_set_for("Max", "Min")
-          test_set = test_set_for("Subtract", "Min", "Add")
-
-          expect(test_set.for_all(subjects)).to eq(test_set.subset { |t| t.expression == "Min" })
-        end
-
-        it "should return multiple tests for a single subject" do
-          subjects = subject_set_for("Min")
-          test_set = test_set_for("Min", "Max", "Min", "Max", "Min")
-
-          expect(test_set.for_all(subjects)).to eq(test_set.subset { |t| t.expression == "Min" })
-        end
-
-        it "should return no tests when there are no tests" do
-          subjects = subject_set_for("Max", "Min")
-          test_set = TestSet.empty
-
-          expect(test_set.for_all(subjects)).to eq(TestSet.empty)
-        end
-
-        it "should return no tests when there are no relevant subjects" do
-          subjects = subject_set_for("Max", "Min")
-          test_set = test_set_for("Subtract", "Add")
-
-          expect(test_set.for_all(subjects)).to eq(TestSet.empty)
-        end
-
-        def subject_set_for(*names)
-          Subjects::SubjectSet.new(names.map { |n| Subjects::Subject.new(name: n) })
-        end
-
-        def test_set_for(*expressions)
-          TestSet.new(expressions.map { |e| Test.new(expression: e) })
-        end
-      end
-    end
-  end
-end