diff options
Diffstat (limited to 'org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java')
| -rw-r--r-- | org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java index 75850c1e..76f31b83 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/InstrumentTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors + * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,13 +26,14 @@ import java.util.HashSet; import java.util.Set; import org.jacoco.cli.internal.CommandTestBase; +import org.jacoco.core.internal.InputStreams; +import org.jacoco.core.internal.instr.InstrSupport; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Opcodes; +import org.objectweb.asm.MethodVisitor; /** * Unit tests for {@link Instrument}. @@ -47,7 +48,7 @@ public class InstrumentTest extends CommandTestBase { throws Exception { execute("instrument"); assertFailure(); - assertContains("Option \"--dest\" is required", err); + assertContains("\"--dest\"", err); assertContains( "Usage: java -jar jacococli.jar instrument [<sourcefiles> ...]", err); @@ -134,18 +135,19 @@ public class InstrumentTest extends CommandTestBase { private void assertInstrumented(File classfile) throws IOException { InputStream in = new FileInputStream(classfile); - ClassReader reader = new ClassReader(in); + final ClassReader reader = InstrSupport + .classReaderFor(InputStreams.readFully(in)); in.close(); - final Set<String> fields = new HashSet<String>(); - reader.accept(new ClassVisitor(Opcodes.ASM6) { + final Set<String> methods = new HashSet<String>(); + reader.accept(new ClassVisitor(InstrSupport.ASM_API_VERSION) { @Override - public FieldVisitor visitField(int access, String name, String desc, - String signature, Object value) { - fields.add(name); + public MethodVisitor visitMethod(int access, String name, + String descriptor, String signature, String[] exceptions) { + methods.add(name); return null; } }, 0); - assertTrue(fields.contains("$jacocoData")); + assertTrue(methods.contains("$jacocoInit")); } } |