aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Tucker <imbilltucker@gmail.com>2020-07-07 09:01:57 -0600
committerGitHub <noreply@github.com>2020-07-07 17:01:57 +0200
commitb404a6b3eca7f39156d4ad3a98576a2d7bfa06af (patch)
tree0fda7349028e12afd6ab9569ee42c8973a057ee2
parent6ceb0193d6bfc06a684f0063627bf3f047b15ad5 (diff)
downloadjacoco-b404a6b3eca7f39156d4ad3a98576a2d7bfa06af.tar.gz
improve english grammer (#1068)
change language from "..do no match with execution data" to "..do not match with execution data. Co-authored-by: William Tucker <william.tucker2@usda.gov>
-rw-r--r--jacoco-maven-plugin.test/it/it-report-nomatch/verify.bsh2
-rw-r--r--jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java2
-rw-r--r--org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml2
-rw-r--r--org.jacoco.ant/src/org/jacoco/ant/ReportTask.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/jacoco-maven-plugin.test/it/it-report-nomatch/verify.bsh b/jacoco-maven-plugin.test/it/it-report-nomatch/verify.bsh
index b6043687..f453c2e6 100644
--- a/jacoco-maven-plugin.test/it/it-report-nomatch/verify.bsh
+++ b/jacoco-maven-plugin.test/it/it-report-nomatch/verify.bsh
@@ -14,7 +14,7 @@ import java.io.*;
import org.codehaus.plexus.util.*;
String buildLog = FileUtils.fileRead( new File( basedir, "build.log" ) );
-if ( buildLog.indexOf( "Classes in bundle " ) < 0 || buildLog.indexOf(" do no match with execution data." ) < 0 ) {
+if ( buildLog.indexOf( "Classes in bundle " ) < 0 || buildLog.indexOf(" do not match with execution data." ) < 0 ) {
throw new RuntimeException( "Warning 1 was not printed" );
}
if ( buildLog.indexOf( "For report generation the same class files must be used as at runtime." ) < 0 ) {
diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java b/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
index 6409cf00..86ceaa01 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
@@ -216,7 +216,7 @@ final class ReportSupport {
Integer.valueOf(bundle.getClassCounter().getTotalCount())));
if (!nomatch.isEmpty()) {
log.warn(format(
- "Classes in bundle '%s' do no match with execution data. "
+ "Classes in bundle '%s' do not match with execution data. "
+ "For report generation the same class files must be used as at runtime.",
bundle.getName()));
for (final IClassCoverage c : nomatch) {
diff --git a/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml b/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
index a56f6b39..84b073b8 100644
--- a/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
+++ b/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
@@ -129,7 +129,7 @@
</classfiles>
</structure>
</jacoco:report>
- <au:assertLogContains level="warn" text="Classes in bundle 'root' do no match with execution data."/>
+ <au:assertLogContains level="warn" text="Classes in bundle 'root' do not match with execution data."/>
<au:assertLogContains level="warn" text="For report generation the same class files must be used as at runtime."/>
<au:assertLogContains level="warn" text="Execution data for class org/jacoco/ant/TestTarget does not match."/>
</target>
diff --git a/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java b/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
index 148e8f13..8ca07cb2 100644
--- a/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
+++ b/org.jacoco.ant/src/org/jacoco/ant/ReportTask.java
@@ -585,7 +585,7 @@ public class ReportTask extends Task {
Integer.valueOf(bundle.getClassCounter().getTotalCount())));
if (!nomatch.isEmpty()) {
log(format(
- "Classes in bundle '%s' do no match with execution data. "
+ "Classes in bundle '%s' do not match with execution data. "
+ "For report generation the same class files must be used as at runtime.",
bundle.getName()), Project.MSG_WARN);
for (final IClassCoverage c : nomatch) {