diff options
author | Roberto Araujo <roberto.andrioli@gmail.com> | 2017-10-19 19:51:22 -0200 |
---|---|---|
committer | Evgeny Mandrikov <Godin@users.noreply.github.com> | 2017-10-19 23:51:22 +0200 |
commit | caa820ed62133f47bacba06ea931bf5d7c43dcd6 (patch) | |
tree | 0f1bbe5cf29d986d4154276aaf9440edead98ae9 /org.jacoco.core.test/src/org | |
parent | ec6287a6b947b8e91a1c697aebdb157bbfab564b (diff) | |
download | jacoco-caa820ed62133f47bacba06ea931bf5d7c43dcd6.tar.gz |
Upgrade ASM to 6.0 (#600)
Diffstat (limited to 'org.jacoco.core.test/src/org')
7 files changed, 22 insertions, 28 deletions
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java index 1bf63ad6..71808496 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java @@ -36,7 +36,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import org.jacoco.core.data.ExecutionDataStore; -import org.jacoco.core.internal.Java9Support; import org.jacoco.core.internal.data.CRC64; import org.jacoco.core.test.TargetLoader; import org.junit.Before; @@ -93,8 +92,8 @@ public class AnalyzerTest { @Test public void testAnalyzeClassIdMatch() throws IOException { // class IDs are always calculated after downgrade of the version - final byte[] bytes = Java9Support.downgradeIfRequired( - TargetLoader.getClassDataAsBytes(AnalyzerTest.class)); + final byte[] bytes = TargetLoader + .getClassDataAsBytes(AnalyzerTest.class); executionData.get(Long.valueOf(CRC64.checksum(bytes)), "org/jacoco/core/analysis/AnalyzerTest", 200); analyzer.analyzeClass(bytes, "Test"); diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/FrameSnapshotTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/FrameSnapshotTest.java index e89176b9..9df32e11 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/internal/flow/FrameSnapshotTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/internal/flow/FrameSnapshotTest.java @@ -115,8 +115,7 @@ public class FrameSnapshotTest { analyzer.visitInsn(Opcodes.AALOAD); frame = FrameSnapshot.create(analyzer, 0); - // FIXME should be Opcodes.NULL after update of ASM to 6.0 - final Object[] stack = arr("java/lang/Object"); + final Object[] stack = arr(Opcodes.NULL); expectedVisitor.visitFrame(Opcodes.F_FULL, 1, arr("Foo"), 1, stack); } diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactoryTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactoryTest.java index 33415207..a68e4990 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactoryTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactoryTest.java @@ -283,7 +283,7 @@ public class ProbeArrayStrategyFactoryTest { private final List<AddedMethod> methods = new ArrayList<AddedMethod>(); ClassVisitorMock() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -300,7 +300,7 @@ public class ProbeArrayStrategyFactoryTest { String signature, String[] exceptions) { final AddedMethod m = new AddedMethod(access, name, desc); methods.add(m); - return new MethodVisitor(Opcodes.ASM5) { + return new MethodVisitor(Opcodes.ASM6) { @Override public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) { diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassFileVersionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassFileVersionsTest.java index 1ec04deb..8465b833 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassFileVersionsTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ClassFileVersionsTest.java @@ -25,11 +25,11 @@ import static org.objectweb.asm.Opcodes.V1_5; import static org.objectweb.asm.Opcodes.V1_6; import static org.objectweb.asm.Opcodes.V1_7; import static org.objectweb.asm.Opcodes.V1_8; +import static org.objectweb.asm.Opcodes.V9; import java.io.IOException; import org.jacoco.core.instr.Instrumenter; -import org.jacoco.core.internal.Java9Support; import org.jacoco.core.internal.instr.InstrSupport; import org.jacoco.core.runtime.IRuntime; import org.jacoco.core.runtime.SystemPropertiesRuntime; @@ -86,7 +86,7 @@ public class ClassFileVersionsTest { @Test public void test_1_9() throws IOException { - testVersion(Java9Support.V1_9, true); + testVersion(V9, true); } private void testVersion(int version, boolean frames) throws IOException { @@ -101,8 +101,8 @@ public class ClassFileVersionsTest { private void assertFrames(byte[] source, boolean expected) { final boolean[] hasFrames = new boolean[] { false }; - new ClassReader(Java9Support.downgradeIfRequired(source)).accept( - new ClassVisitor(InstrSupport.ASM_API_VERSION) { + new ClassReader(source) + .accept(new ClassVisitor(InstrSupport.ASM_API_VERSION) { @Override public MethodVisitor visitMethod(int access, String name, diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/FramesTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/FramesTest.java index 9bea83ab..afc4978f 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/FramesTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/FramesTest.java @@ -18,7 +18,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import org.jacoco.core.instr.Instrumenter; -import org.jacoco.core.internal.Java9Support; import org.jacoco.core.internal.instr.InstrSupport; import org.jacoco.core.runtime.IRuntime; import org.jacoco.core.runtime.SystemPropertiesRuntime; @@ -88,8 +87,7 @@ public class FramesTest { } private byte[] calculateFrames(byte[] source) { - ClassReader rc = new ClassReader( - Java9Support.downgradeIfRequired(source)); + ClassReader rc = new ClassReader(source); ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES); // Adjust Version to 1.6 to enable frames: diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ResizeInstructionsTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ResizeInstructionsTest.java index 413c37ac..0d2c2145 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ResizeInstructionsTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ResizeInstructionsTest.java @@ -11,12 +11,11 @@ *******************************************************************************/ package org.jacoco.core.test.validation; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import org.jacoco.core.instr.Instrumenter; -import org.jacoco.core.internal.Java9Support; import org.jacoco.core.internal.instr.InstrSupport; import org.jacoco.core.runtime.IRuntime; import org.jacoco.core.runtime.RuntimeData; @@ -58,9 +57,11 @@ public class ResizeInstructionsTest { */ @Test public void should_not_loose_InnerClasses_attribute() throws Exception { - final ClassWriter cw = new ClassWriter(0); - final ClassReader cr = new ClassReader(Java9Support.downgradeIfRequired( - TargetLoader.getClassDataAsBytes(Inner.class))); + // FIXME fails without COMPUTE_FRAMES because of + // https://gitlab.ow2.org/asm/asm/issues/317800 + final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES); + final ClassReader cr = new ClassReader( + TargetLoader.getClassDataAsBytes(Inner.class)); cr.accept(new ClassVisitor(InstrSupport.ASM_API_VERSION, cw) { @Override public void visitEnd() { @@ -79,11 +80,10 @@ public class ResizeInstructionsTest { final Class<?> outer = targetLoader.add(ResizeInstructionsTest.class, TargetLoader.getClassDataAsBytes(ResizeInstructionsTest.class)); final Class<?> inner = targetLoader.add(Inner.class, bytes); - // FIXME should not be null after update of ASM to 6.0 - assertNotSame(outer, inner.getEnclosingClass()); - assertNull(inner.getEnclosingClass()); - assertNotSame(outer, inner.getDeclaringClass()); - assertNull(inner.getDeclaringClass()); + assertSame(outer, inner.getEnclosingClass()); + assertNotNull(inner.getEnclosingClass()); + assertSame(outer, inner.getDeclaringClass()); + assertNotNull(inner.getDeclaringClass()); } /** diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/StructuredLockingTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/StructuredLockingTest.java index 9aa67a6c..ef95e591 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/StructuredLockingTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/StructuredLockingTest.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; import org.jacoco.core.instr.Instrumenter; -import org.jacoco.core.internal.Java9Support; import org.jacoco.core.runtime.IRuntime; import org.jacoco.core.runtime.SystemPropertiesRuntime; import org.jacoco.core.test.TargetLoader; @@ -64,8 +63,7 @@ public class StructuredLockingTest { byte[] instrumented = instrumenter.instrument(source, "TestTarget"); ClassNode cn = new ClassNode(); - new ClassReader(Java9Support.downgradeIfRequired(instrumented)) - .accept(cn, 0); + new ClassReader(instrumented).accept(cn, 0); for (MethodNode mn : cn.methods) { assertStructuredLocking(cn.name, mn); } |