Fixing failing test cases because of dependency updates (moving to th…

…e new signatures from the deprecated ones)
msiemczyk · Jan 3, 2018 · f210468 · f210468
1 parent 0a7a515
commit f210468
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/cobertura/pom.xml b/cobertura/pom.xml
@@ -129,6 +129,11 @@
       <artifactId>ant</artifactId>
       <version>${antVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-junit4</artifactId>
+      <version>${antVersion}</version>
+    </dependency>    
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-junit</artifactId>
@@ -183,7 +188,6 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
       <version>${logbackVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/cobertura/src/main/java/net/sourceforge/cobertura/instrument/HistoryMethodAdapter.java b/cobertura/src/main/java/net/sourceforge/cobertura/instrument/HistoryMethodAdapter.java
@@ -126,9 +126,9 @@ public void visitLookupSwitchInsn(Label arg0, int[] arg1, Label[] arg2) {
 	}
 
 	@Override
-	public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3) {
-		super.visitMethodInsn(arg0, arg1, arg2, arg3);
-		appendToBacklog(new MethodInsnNode(arg0, arg1, arg2, arg3));
+    public void visitMethodInsn(int arg0, String arg1, String arg2, String arg3, boolean intf) {
+        super.visitMethodInsn(arg0, arg1, arg2, arg3, intf);
+            appendToBacklog(new MethodInsnNode(arg0, arg1, arg2, arg3, intf));
 	}
 
 	@Override

diff --git a/.../main/java/net/sourceforge/cobertura/instrument/pass1/DetectIgnoredCodeMethodVisitor.java b/.../main/java/net/sourceforge/cobertura/instrument/pass1/DetectIgnoredCodeMethodVisitor.java
@@ -185,13 +185,13 @@ public void visitIntInsn(int arg0, int arg1) {
 
 	@Override
 	public void visitMethodInsn(int opcode, String owner, String name,
-			String desc) {
+                                String desc, boolean intf) {
 		if (ignoredStatus.isTrivial()
 				&& !(ignoredStatus == IgnoredStatus.POSSIBLE_TRIVIAL_INIT
 						&& name.equals("<init>") && owner.equals(superName) && opcode == Opcodes.INVOKESPECIAL)) {
 			markNotTrivial();
 		}
-		super.visitMethodInsn(opcode, owner, name, desc);
+            super.visitMethodInsn(opcode, owner, name, desc, intf);
 	}
 
 	@Override