diff options
Diffstat (limited to 'org.jacoco.cli.test/src/org/jacoco/cli/internal/commands')
7 files changed, 24 insertions, 22 deletions
diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java index f972f9cb..f1b9df10 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.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 @@ -25,7 +25,7 @@ public class ClassInfoTest extends CommandTestBase { execute("classinfo", "--invalid"); assertFailure(); - assertContains("\"--invalid\" is not a valid option", err); + assertContains("\"--invalid\"", err); assertContains( "java -jar jacococli.jar classinfo [<classlocations> ...]", err); diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/DumpTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/DumpTest.java index 6fc89233..70aeceda 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/DumpTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/DumpTest.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 @@ -51,7 +51,7 @@ public class DumpTest extends CommandTestBase { throws Exception { execute("dump"); assertFailure(); - assertContains("Option \"--destfile\" is required", err); + assertContains("\"--destfile\"", err); assertContains("java -jar jacococli.jar dump [--address <address>]", err); } diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ExecInfoTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ExecInfoTest.java index d688625b..5308937d 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ExecInfoTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ExecInfoTest.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 @@ -37,7 +37,7 @@ public class ExecInfoTest extends CommandTestBase { execute("execinfo", "--invalid"); assertFailure(); - assertContains("\"--invalid\" is not a valid option", err); + assertContains("\"--invalid\"", err); assertContains("java -jar jacococli.jar execinfo [<execfiles> ...]", err); } 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")); } } diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/MergeTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/MergeTest.java index fd04a341..d2dc1199 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/MergeTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/MergeTest.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 @@ -43,7 +43,7 @@ public class MergeTest extends CommandTestBase { execute("merge"); assertFailure(); - assertContains("Option \"--destfile\" is required", err); + assertContains("\"--destfile\"", err); assertContains("java -jar jacococli.jar merge [<execfiles> ...]", err); } diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.java index 4a941ccf..bff42966 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ReportTest.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 @@ -37,7 +37,7 @@ public class ReportTest extends CommandTestBase { execute("report"); assertFailure(); - assertContains("Option \"--classfiles\" is required", err); + assertContains("\"--classfiles\"", err); assertContains( "Usage: java -jar jacococli.jar report [<execfiles> ...]", err); } diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/VersionTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/VersionTest.java index d12bd034..dab8955f 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/VersionTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/VersionTest.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 |