diff --git a/README.md b/README.md index df2355b..72474d7 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To use the plugin it must be placed on the classpath of the pitest tool (**not** org.pitest pitest-rv-plugin - 1.0 + 0.1 diff --git a/pom.xml b/pom.xml index a1190c0..f65c68c 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.pitest pitest-rv-plugin ${revision} - + pitest-rv-plugin http://pitest.org Research operators for pitest @@ -23,7 +23,7 @@ 1.8.0 5.8.0 2.7.6 - 1.8.0 + 1.25.9 9.3 diff --git a/src/main/java/org/pitest/rv/ABSMutator.java b/src/main/java/org/pitest/rv/ABSMutator.java index d361bd8..5ee81e0 100644 --- a/src/main/java/org/pitest/rv/ABSMutator.java +++ b/src/main/java/org/pitest/rv/ABSMutator.java @@ -47,9 +47,6 @@ class ABSMethodVisitor extends MethodVisitor { } private boolean shouldMutate(String message) { - if (this.context.getClassInfo().isEnum()) { - return false; - } final MutationIdentifier newId = this.context.registerMutation(this.factory, message); return this.context.shouldMutate(newId); } diff --git a/src/main/java/org/pitest/rv/AOD1Mutator.java b/src/main/java/org/pitest/rv/AOD1Mutator.java index 55b9a3f..04f9733 100644 --- a/src/main/java/org/pitest/rv/AOD1Mutator.java +++ b/src/main/java/org/pitest/rv/AOD1Mutator.java @@ -18,7 +18,7 @@ public enum AOD1Mutator implements MethodMutatorFactory { public MethodVisitor create(final MutationContext context, final MethodInfo methodInfo, final MethodVisitor methodVisitor) { - return new AODMethodVisitor1(this, context, methodInfo, methodVisitor); + return new AODMethodVisitor1(this, context, methodVisitor); } public String getGloballyUniqueId() { @@ -34,24 +34,18 @@ class AODMethodVisitor1 extends MethodVisitor { private final MethodMutatorFactory factory; private final MutationContext context; - private final MethodInfo info; AODMethodVisitor1(final MethodMutatorFactory factory, - final MutationContext context, final MethodInfo info, final MethodVisitor delegateMethodVisitor) { + final MutationContext context, final MethodVisitor delegateMethodVisitor) { super(ASMVersion.ASM_VERSION, delegateMethodVisitor); this.factory = factory; this.context = context; - this.info = info; } private boolean shouldMutate(String expression) { - if (this.info.isGeneratedEnumMethod()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation( - this.factory, "Replaced " + expression + " operation with first member"); - return this.context.shouldMutate(newId); - } + final MutationIdentifier newId = this.context.registerMutation( + this.factory, "Replaced " + expression + " operation with first member"); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/AOD2Mutator.java b/src/main/java/org/pitest/rv/AOD2Mutator.java index e00467c..d685dd8 100644 --- a/src/main/java/org/pitest/rv/AOD2Mutator.java +++ b/src/main/java/org/pitest/rv/AOD2Mutator.java @@ -46,14 +46,9 @@ class AODMethodVisitor2 extends LocalVariablesSorter { } private boolean shouldMutate(String expression) { - if (this.info.isGeneratedEnumMethod()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation(this.factory, - "Replaced " + expression + " operation by second member"); - return this.context.shouldMutate(newId); - } - + final MutationIdentifier newId = this.context.registerMutation(this.factory, + "Replaced " + expression + " operation by second member"); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/OBBN2Mutator.java b/src/main/java/org/pitest/rv/OBBN2Mutator.java index 6b904dc..295db92 100644 --- a/src/main/java/org/pitest/rv/OBBN2Mutator.java +++ b/src/main/java/org/pitest/rv/OBBN2Mutator.java @@ -17,7 +17,7 @@ public enum OBBN2Mutator implements MethodMutatorFactory { public MethodVisitor create(final MutationContext context, final MethodInfo methodInfo, final MethodVisitor methodVisitor) { - return new OBBNMethodVisitor2(this, context, methodInfo, methodVisitor); + return new OBBNMethodVisitor2(this, context, methodVisitor); } public String getGloballyUniqueId() { @@ -33,25 +33,18 @@ class OBBNMethodVisitor2 extends MethodVisitor { private final MethodMutatorFactory factory; private final MutationContext context; - private final MethodInfo info; OBBNMethodVisitor2(final MethodMutatorFactory factory, - final MutationContext context, final MethodInfo info, final MethodVisitor delegateMethodVisitor) { + final MutationContext context, final MethodVisitor delegateMethodVisitor) { super(ASMVersion.ASM_VERSION, delegateMethodVisitor); this.factory = factory; this.context = context; - this.info = info; } private boolean shouldMutate(String expression) { - if (info.isGeneratedEnumMethod()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation( - this.factory, "Replaced " + expression + " by first member"); - return this.context.shouldMutate(newId); - } - + final MutationIdentifier newId = this.context.registerMutation( + this.factory, "Replaced " + expression + " by first member"); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/OBBN3Mutator.java b/src/main/java/org/pitest/rv/OBBN3Mutator.java index b3090cc..6fe4c0d 100644 --- a/src/main/java/org/pitest/rv/OBBN3Mutator.java +++ b/src/main/java/org/pitest/rv/OBBN3Mutator.java @@ -46,14 +46,9 @@ class OBBNMethodVisitor3 extends LocalVariablesSorter { } private boolean shouldMutate(String expression) { - if (info.isGeneratedEnumMethod()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation( - this.factory, "Replace " + expression + " by second member"); - return this.context.shouldMutate(newId); - } - + final MutationIdentifier newId = this.context.registerMutation( + this.factory, "Replace " + expression + " by second member"); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/UOI1Mutator.java b/src/main/java/org/pitest/rv/UOI1Mutator.java index 8104ce6..38f4a5a 100644 --- a/src/main/java/org/pitest/rv/UOI1Mutator.java +++ b/src/main/java/org/pitest/rv/UOI1Mutator.java @@ -42,12 +42,8 @@ class UOI1MethodVisitor extends MethodVisitor { } private boolean shouldMutate(String description) { - if (context.getClassInfo().isEnum()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation(this.factory, description); - return this.context.shouldMutate(newId); - } + final MutationIdentifier newId = this.context.registerMutation(this.factory, description); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/UOI2Mutator.java b/src/main/java/org/pitest/rv/UOI2Mutator.java index 727a473..4a622e5 100644 --- a/src/main/java/org/pitest/rv/UOI2Mutator.java +++ b/src/main/java/org/pitest/rv/UOI2Mutator.java @@ -41,12 +41,8 @@ class UOI2MethodVisitor extends MethodVisitor { } private boolean shouldMutate(String description) { - if (context.getClassInfo().isEnum()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation(this.factory, description); - return this.context.shouldMutate(newId); - } + final MutationIdentifier newId = this.context.registerMutation(this.factory, description); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/UOI3Mutator.java b/src/main/java/org/pitest/rv/UOI3Mutator.java index b573d7e..227308b 100644 --- a/src/main/java/org/pitest/rv/UOI3Mutator.java +++ b/src/main/java/org/pitest/rv/UOI3Mutator.java @@ -42,12 +42,8 @@ class UOIMethodVisitor3 extends MethodVisitor { } private boolean shouldMutate(String description) { - if (context.getClassInfo().isEnum()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation(this.factory, description); - return this.context.shouldMutate(newId); - } + final MutationIdentifier newId = this.context.registerMutation(this.factory, description); + return this.context.shouldMutate(newId); } @Override diff --git a/src/main/java/org/pitest/rv/UOI4Mutator.java b/src/main/java/org/pitest/rv/UOI4Mutator.java index 5929384..4f57958 100644 --- a/src/main/java/org/pitest/rv/UOI4Mutator.java +++ b/src/main/java/org/pitest/rv/UOI4Mutator.java @@ -42,12 +42,8 @@ class UOI4MethodVisitor extends MethodVisitor { } private boolean shouldMutate(String description) { - if (context.getClassInfo().isEnum()) { - return false; - } else { - final MutationIdentifier newId = this.context.registerMutation(this.factory, description); - return this.context.shouldMutate(newId); - } + final MutationIdentifier newId = this.context.registerMutation(this.factory, description); + return this.context.shouldMutate(newId); } @Override