diff --git a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java index 82db4fd92..9054c95f6 100644 --- a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java +++ b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java @@ -57,13 +57,13 @@ public class PropertyFileInputHandler implements InputHandler { Object o = props.get(request.getPrompt()); if (o == null) { - throw new BuildException("Unable to find input for \'" - + request.getPrompt() + "\'"); + throw new BuildException("Unable to find input for '" + + request.getPrompt() + "'"); } request.setInput(o.toString()); if (!request.isInputValid()) { throw new BuildException("Found invalid input " + o - + " for \'" + request.getPrompt() + "\'"); + + " for '" + request.getPrompt() + "'"); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 4971b7ace..53c232ed6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -217,7 +217,7 @@ public class Chmod extends ExecuteOn { @Override public void setExecutable(String e) { throw new BuildException(getTaskType() - + " doesn\'t support the executable attribute", getLocation()); + + " doesn't support the executable attribute", getLocation()); } /** @@ -230,7 +230,7 @@ public class Chmod extends ExecuteOn { @Override public void setCommand(Commandline cmdl) { throw new BuildException(getTaskType() - + " doesn\'t support the command attribute", getLocation()); + + " doesn't support the command attribute", getLocation()); } /** @@ -242,7 +242,7 @@ public class Chmod extends ExecuteOn { @Override public void setSkipEmptyFilesets(boolean skip) { throw new BuildException(getTaskType() - + " doesn\'t support the skipemptyfileset attribute", getLocation()); + + " doesn't support the skipemptyfileset attribute", getLocation()); } /** @@ -254,7 +254,7 @@ public class Chmod extends ExecuteOn { @Override public void setAddsourcefile(boolean b) { throw new BuildException(getTaskType() - + " doesn\'t support the addsourcefile attribute", getLocation()); + + " doesn't support the addsourcefile attribute", getLocation()); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java index e926818fb..8e2b5bbbd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exec.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java @@ -64,7 +64,7 @@ public class Exec extends Task { + "the Exec class"); System.err.println("is considered to be dead code by the Ant " + "developers and is unmaintained."); - System.err.println("Don\'t use it!"); + System.err.println("Don't use it!"); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 6b7f3b9b6..7dca1ba85 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -251,7 +251,7 @@ public class ExecuteOn extends ExecTask { */ public Commandline.Marker createSrcfile() { if (srcFilePos != null) { - throw new BuildException(getTaskType() + " doesn\'t support multiple " + throw new BuildException(getTaskType() + " doesn't support multiple " + "srcfile elements.", getLocation()); } srcFilePos = cmdl.createMarker(); @@ -265,7 +265,7 @@ public class ExecuteOn extends ExecTask { */ public Commandline.Marker createTargetfile() { if (targetFilePos != null) { - throw new BuildException(getTaskType() + " doesn\'t support multiple " + throw new BuildException(getTaskType() + " doesn't support multiple " + "targetfile elements.", getLocation()); } targetFilePos = cmdl.createMarker(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index d768088e8..acc3a655e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -2499,7 +2499,7 @@ public class Javadoc extends Task { // Path.list does it for us. sp.createPathElement().setLocation(baseDir); } else { - log(baseDir + " doesn\'t contain any packages, dropping it.", + log(baseDir + " doesn't contain any packages, dropping it.", Project.MSG_VERBOSE); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java index f428a4de5..849852759 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java @@ -62,7 +62,7 @@ public class Jikes { + "the Jikes class"); System.err.println("is considered to be dead code by the Ant " + "developers and is unmaintained."); - System.err.println("Don\'t use it!"); + System.err.println("Don't use it!"); this.jop = jop; this.command = command; diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index 8c83994b3..c53f9070a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java @@ -100,7 +100,7 @@ public class JikesOutputParser implements ExecuteStreamHandler { + "JikesOutputParser class"); System.err.println("is considered to be dead code by the Ant " + "developers and is unmaintained."); - System.err.println("Don\'t use it!"); + System.err.println("Don't use it!"); this.task = task; this.emacsMode = emacsMode; diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java index 2709e4b45..5aca7712a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Patch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Patch.java @@ -74,7 +74,7 @@ public class Patch extends Task { */ public void setPatchfile(File file) { if (!file.exists()) { - throw new BuildException("patchfile " + file + " doesn\'t exist", + throw new BuildException("patchfile " + file + " doesn't exist", getLocation()); } cmd.createArgument().setValue("-i"); diff --git a/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java index a0e022f2f..d08784417 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java +++ b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java @@ -61,7 +61,7 @@ public class ResourceCount extends Task implements Condition { public void setRefid(Reference r) { Object o = r.getReferencedObject(); if (!(o instanceof ResourceCollection)) { - throw new BuildException("%s doesn\'t denote a ResourceCollection", + throw new BuildException("%s doesn't denote a ResourceCollection", r.getRefId()); } add((ResourceCollection) o); diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java index 211f2352a..1ac8e7ee0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java @@ -55,7 +55,7 @@ public class TaskOutputStream extends OutputStream { + "TaskOutputStream class"); System.err.println("is considered to be dead code by the Ant " + "developers and is unmaintained."); - System.err.println("Don\'t use it!"); + System.err.println("Don't use it!"); this.task = task; this.msgOutputLevel = msgOutputLevel; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index f22dccb6c..03bb15c65 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -316,7 +316,7 @@ public class Os implements Condition { break; default: throw new BuildException( - "Don\'t know how to detect os family \"" + "Don't know how to detect os family \"" + family + "\""); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index ce95bd4fa..8ce2a1762 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -273,7 +273,7 @@ public class ANTLR extends Task { log("Found " + f.getAbsolutePath(), Project.MSG_DEBUG); createClasspath().setLocation(f); } else { - log("Couldn\'t find " + resource, Project.MSG_VERBOSE); + log("Couldn't find " + resource, Project.MSG_VERBOSE); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java index e921fc06e..34a4f38ba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java @@ -122,7 +122,7 @@ public class RenameExtensions extends MatchingTask { log(" from=\"*" + fromExtension + "\"", Project.MSG_INFO); log(" to=\"*" + toExtension + "\" />", Project.MSG_INFO); log("", Project.MSG_INFO); - log("using the same patterns on as you\'ve used here", + log("using the same patterns on as you've used here", Project.MSG_INFO); Move move = new Move(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 19479d551..ef9d0210a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -376,7 +376,7 @@ public class JDependTask extends Task { File f = LoaderUtils.getResourceSource(getClass().getClassLoader(), resource); if (f == null) { - log("Couldn\'t find " + resource, Project.MSG_DEBUG); + log("Couldn't find " + resource, Project.MSG_DEBUG); } else { log("Found " + f.getAbsolutePath(), Project.MSG_DEBUG); runtimeClasses.createPath().setLocation(f); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java index cbdaa8c6f..dd2b34fbd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java @@ -107,9 +107,9 @@ public final class JspCompilerAdapterFactory { Class c = classloader.findClass(className).asSubclass(JspCompilerAdapter.class); return c.newInstance(); } catch (ClassNotFoundException cnfe) { - throw new BuildException(className + " can\'t be found.", cnfe); + throw new BuildException(className + " can't be found.", cnfe); } catch (ClassCastException cce) { - throw new BuildException(className + " isn\'t the classname of " + throw new BuildException(className + " isn't the classname of " + "a compiler adapter.", cce); } catch (Throwable t) { // for all other possibilities diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index d67307f7a..de5c31dc5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1839,7 +1839,7 @@ public class JUnitTask extends Task { antRuntimeClasses.createPath().setLocation(f); return true; } else { - log("Couldn\'t find " + resource, Project.MSG_DEBUG); + log("Couldn't find " + resource, Project.MSG_DEBUG); return false; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java index 8f32adff2..cf666dcd1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java @@ -72,7 +72,7 @@ public abstract class AbstractAccessTask extends ExecuteOn { @Override public void setCommand(Commandline cmdl) { throw new BuildException(getTaskType() - + " doesn\'t support the command attribute", + + " doesn't support the command attribute", getLocation()); } @@ -84,7 +84,7 @@ public abstract class AbstractAccessTask extends ExecuteOn { */ @Override public void setSkipEmptyFilesets(boolean skip) { - throw new BuildException(getTaskType() + " doesn\'t support the " + throw new BuildException(getTaskType() + " doesn't support the " + "skipemptyfileset attribute", getLocation()); } @@ -98,7 +98,7 @@ public abstract class AbstractAccessTask extends ExecuteOn { @Override public void setAddsourcefile(boolean b) { throw new BuildException(getTaskType() - + " doesn\'t support the addsourcefile attribute", getLocation()); + + " doesn't support the addsourcefile attribute", getLocation()); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java index 2a14c6b58..61b7b3513 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java @@ -80,7 +80,7 @@ public class Chgrp extends AbstractAccessTask { @Override public void setExecutable(String e) { throw new BuildException(getTaskType() - + " doesn\'t support the executable" + + " doesn't support the executable" + " attribute", getLocation()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java index 482c2d94f..41745ec00 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java @@ -80,7 +80,7 @@ public class Chown extends AbstractAccessTask { @Override public void setExecutable(String e) { throw new BuildException(getTaskType() - + " doesn\'t support the executable" + + " doesn't support the executable" + " attribute", getLocation()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java index 50a2fbb89..8b8941319 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java @@ -111,7 +111,7 @@ public class Attrib extends ExecuteOn { @Override public void setExecutable(String e) { throw new BuildException(getTaskType() - + " doesn\'t support the executable attribute", getLocation()); + + " doesn't support the executable attribute", getLocation()); } /** @@ -122,7 +122,7 @@ public class Attrib extends ExecuteOn { */ public void setCommand(String e) { throw new BuildException(getTaskType() - + " doesn\'t support the command attribute", getLocation()); + + " doesn't support the command attribute", getLocation()); } /** @@ -134,7 +134,7 @@ public class Attrib extends ExecuteOn { @Override public void setAddsourcefile(boolean b) { throw new BuildException(getTaskType() - + " doesn\'t support the addsourcefile attribute", getLocation()); + + " doesn't support the addsourcefile attribute", getLocation()); } /** @@ -145,7 +145,7 @@ public class Attrib extends ExecuteOn { */ @Override public void setSkipEmptyFilesets(boolean skip) { - throw new BuildException(getTaskType() + " doesn\'t support the " + throw new BuildException(getTaskType() + " doesn't support the " + "skipemptyfileset attribute", getLocation()); } @@ -159,7 +159,7 @@ public class Attrib extends ExecuteOn { @Override public void setParallel(boolean parallel) { throw new BuildException(getTaskType() - + " doesn\'t support the parallel attribute", + + " doesn't support the parallel attribute", getLocation()); } @@ -172,7 +172,7 @@ public class Attrib extends ExecuteOn { @Override public void setMaxParallel(int max) { throw new BuildException(getTaskType() - + " doesn\'t support the maxparallel attribute", + + " doesn't support the maxparallel attribute", getLocation()); } diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 86aa4d6c1..ade5cd005 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -436,13 +436,13 @@ public class Commandline implements Cloneable { */ public static String quoteArgument(String argument) { if (argument.contains("\"")) { - if (argument.contains("\'")) { - throw new BuildException("Can\'t handle single and double" + if (argument.contains("'")) { + throw new BuildException("Can't handle single and double" + " quotes in same argument"); } return '\'' + argument + '\''; } - if (argument.contains("\'") || argument.contains(" ") + if (argument.contains("'") || argument.contains(" ") // WIN9x uses a bat file for executing commands || (IS_WIN_9X && argument.contains(";"))) { return '\"' + argument + '\"'; @@ -490,7 +490,7 @@ public class Commandline implements Cloneable { final int inQuote = 1; final int inDoubleQuote = 2; int state = normal; - final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true); + final StringTokenizer tok = new StringTokenizer(toProcess, "\"' ", true); final ArrayList result = new ArrayList<>(); final StringBuilder current = new StringBuilder(); boolean lastTokenHasBeenQuoted = false; @@ -499,7 +499,7 @@ public class Commandline implements Cloneable { String nextTok = tok.nextToken(); switch (state) { case inQuote: - if ("\'".equals(nextTok)) { + if ("'".equals(nextTok)) { lastTokenHasBeenQuoted = true; state = normal; } else { @@ -515,7 +515,7 @@ public class Commandline implements Cloneable { } break; default: - if ("\'".equals(nextTok)) { + if ("'".equals(nextTok)) { state = inQuote; } else if ("\"".equals(nextTok)) { state = inDoubleQuote; @@ -648,7 +648,7 @@ public class Commandline implements Cloneable { if (args == null || args.length == 0) { return ""; } - StringBuilder buf = new StringBuilder("Executing \'").append(args[0]).append("\'"); + StringBuilder buf = new StringBuilder("Executing '").append(args[0]).append("'"); if (args.length > 1) { buf.append(" with "); buf.append(describeArguments(args, 1)); @@ -686,7 +686,7 @@ public class Commandline implements Cloneable { StringBuilder buf = new StringBuilder(); buf.append(String.format("argument%s:%n", args.length > offset ? "s" : "")); for (int i = offset; i < args.length; i++) { - buf.append(String.format("\'%s\'%n", args[i])); + buf.append(String.format("'%s'%n", args[i])); } buf.append(DISCLAIMER); return buf.toString(); diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index 1e4245b37..bac304cd0 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/src/main/org/apache/tools/ant/types/DataType.java @@ -278,7 +278,7 @@ public abstract class DataType extends ProjectComponent implements Cloneable { + " is not a subclass of " + displayName(requiredClass), Project.MSG_VERBOSE); - throw new BuildException(ref.getRefId() + " doesn\'t denote a " + dataTypeName); + throw new BuildException(ref.getRefId() + " doesn't denote a " + dataTypeName); } /** diff --git a/src/main/org/apache/tools/ant/types/TarFileSet.java b/src/main/org/apache/tools/ant/types/TarFileSet.java index 2d085027a..a95fca15d 100644 --- a/src/main/org/apache/tools/ant/types/TarFileSet.java +++ b/src/main/org/apache/tools/ant/types/TarFileSet.java @@ -219,7 +219,7 @@ public class TarFileSet extends ArchiveFileSet { configureFileSet(zfs); return zfs; } - String msg = getRefid().getRefId() + " doesn\'t denote a tarfileset or a fileset"; + String msg = getRefid().getRefId() + " doesn't denote a tarfileset or a fileset"; throw new BuildException(msg); } diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java index a73a2e913..b49177fef 100644 --- a/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -83,7 +83,7 @@ public class ZipFileSet extends ArchiveFileSet { configureFileSet(zfs); return zfs; } - String msg = getRefid().getRefId() + " doesn\'t denote a zipfileset or a fileset"; + String msg = getRefid().getRefId() + " doesn't denote a zipfileset or a fileset"; throw new BuildException(msg); } diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java index 0e20388c1..748fb17a5 100644 --- a/src/main/org/apache/tools/ant/util/ResourceUtils.java +++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java @@ -191,7 +191,7 @@ public class ResourceUtils { Project.MSG_VERBOSE); } if (targetnames == null || targetnames.length == 0) { - logTo.log(sr + " skipped - don\'t know how to handle it", + logTo.log(sr + " skipped - don't know how to handle it", Project.MSG_VERBOSE); continue; } @@ -211,7 +211,7 @@ public class ResourceUtils { result.add(sr); final Resource t = r.iterator().next(); logTo.log(sr.getName() + " added as " + t.getName() - + (t.isExists() ? " is outdated." : " doesn\'t exist."), + + (t.isExists() ? " is outdated." : " doesn't exist."), Project.MSG_VERBOSE); continue; } diff --git a/src/main/org/apache/tools/zip/ExtraFieldUtils.java b/src/main/org/apache/tools/zip/ExtraFieldUtils.java index 3af5c01dd..f024ab062 100644 --- a/src/main/org/apache/tools/zip/ExtraFieldUtils.java +++ b/src/main/org/apache/tools/zip/ExtraFieldUtils.java @@ -63,11 +63,11 @@ public class ExtraFieldUtils { ZipExtraField ze = (ZipExtraField) c.newInstance(); implementations.put(ze.getHeaderId(), c); } catch (ClassCastException cc) { - throw new RuntimeException(c + " doesn\'t implement ZipExtraField"); //NOSONAR + throw new RuntimeException(c + " doesn't implement ZipExtraField"); //NOSONAR } catch (InstantiationException ie) { throw new RuntimeException(c + " is not a concrete class"); //NOSONAR } catch (IllegalAccessException ie) { - throw new RuntimeException(c + "\'s no-arg constructor is not public"); //NOSONAR + throw new RuntimeException(c + "'s no-arg constructor is not public"); //NOSONAR } } diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java index 5387f849d..63746a3b9 100644 --- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java +++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java @@ -103,7 +103,7 @@ public class IntrospectionHelperTest { public void testSupportsCharacters() { assertTrue("IntrospectionHelperTest supports addText", ih.supportsCharacters()); ih = IntrospectionHelper.getHelper(String.class); - assertFalse("String doesn\'t support addText", ih.supportsCharacters()); + assertFalse("String doesn't support addText", ih.supportsCharacters()); } public void addText(String text) { diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java index 8f0a0f921..577571f5a 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java @@ -235,7 +235,7 @@ public class AntTest { buildRule.getProject().resolveFile("ant/test3.log"), buildRule.getProject().resolveFile("ant/test4.log")); - logFiles.forEach(logFile -> assertFalse(logFile.getName() + " doesn\'t exist", + logFiles.forEach(logFile -> assertFalse(logFile.getName() + " doesn't exist", logFile.exists())); buildRule.executeTarget("testLogfilePlacement"); @@ -461,7 +461,7 @@ public class AntTest { } if (error == null) { try { - String msg = "Call " + calls + " refid=\'" + keys[calls] + "\'"; + String msg = "Call " + calls + " refid='" + keys[calls] + "'"; if (value == null) { Object o = event.getProject().getReference(keys[calls]); if (expectSame[calls++]) { diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java index 0688e053d..8ca75a4be 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java @@ -232,7 +232,7 @@ public class FixCrLfTest { // not used, but public so theoretically must remain for BC? @Deprecated public void assertEqualContent(File expect, File result) throws AssertionFailedError, IOException { - assertTrue("Expected file " + result + " doesn\'t exist", result.exists()); + assertTrue("Expected file " + result + " doesn't exist", result.exists()); try (InputStream inExpect = new BufferedInputStream(Files.newInputStream(expect.toPath())); InputStream inResult = new BufferedInputStream(Files.newInputStream(result.toPath()))) { diff --git a/src/tests/junit/org/apache/tools/ant/types/CommandlineTest.java b/src/tests/junit/org/apache/tools/ant/types/CommandlineTest.java index 4124b91d3..e5821eaeb 100644 --- a/src/tests/junit/org/apache/tools/ant/types/CommandlineTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/CommandlineTest.java @@ -48,7 +48,7 @@ public class CommandlineTest { s = Commandline.translateCommandline(null); assertEquals("null", 0, s.length); - s = Commandline.translateCommandline("1 \'2\' 3"); + s = Commandline.translateCommandline("1 '2' 3"); assertEquals("Simple case with single quotes", 3, s.length); assertEquals("Single quotes have been stripped", "2", s[1]); @@ -60,15 +60,15 @@ public class CommandlineTest { assertEquals("Case with double quotes and whitespace", 3, s.length); assertEquals("Double quotes stripped, space included", "2 3", s[1]); - s = Commandline.translateCommandline("1 \"2\'3\" 4"); + s = Commandline.translateCommandline("1 \"2'3\" 4"); assertEquals("Case with double quotes around single quote", 3, s.length); - assertEquals("Double quotes stripped, single quote included", "2\'3", s[1]); + assertEquals("Double quotes stripped, single quote included", "2'3", s[1]); - s = Commandline.translateCommandline("1 \'2 3\' 4"); + s = Commandline.translateCommandline("1 '2 3' 4"); assertEquals("Case with single quotes and whitespace", 3, s.length); assertEquals("Single quotes stripped, space included", "2 3", s[1]); - s = Commandline.translateCommandline("1 \'2\"3\' 4"); + s = Commandline.translateCommandline("1 '2\"3' 4"); assertEquals("Case with single quotes around double quote", 3, s.length); assertEquals("Single quotes stripped, double quote included", "2\"3", s[1]); @@ -93,15 +93,15 @@ public class CommandlineTest { assertEquals("Doublequoted null arg", 1, s.length); assertEquals("Doublequoted null arg", "", s[0]); - s = Commandline.translateCommandline("\'\' a"); + s = Commandline.translateCommandline("'' a"); assertEquals("Singlequoted null arg prepend", 2, s.length); assertEquals("Singlequoted null arg prepend", "", s[0]); assertEquals("Singlequoted null arg prepend", "a", s[1]); - s = Commandline.translateCommandline("a \'\'"); + s = Commandline.translateCommandline("a ''"); assertEquals("Singlequoted null arg append", 2, s.length); assertEquals("Singlequoted null arg append", "a", s[0]); assertEquals("Singlequoted null arg append", "", s[1]); - s = Commandline.translateCommandline("\'\'"); + s = Commandline.translateCommandline("''"); assertEquals("Singlequoted null arg", 1, s.length); assertEquals("Singlequoted null arg", "", s[0]); } @@ -112,8 +112,8 @@ public class CommandlineTest { @Test public void testTokenizerUnbalancedSingleQuote() { thrown.expect(BuildException.class); - thrown.expectMessage("unbalanced quotes in a \'b c"); - Commandline.translateCommandline("a \'b c"); + thrown.expectMessage("unbalanced quotes in a 'b c"); + Commandline.translateCommandline("a 'b c"); } /** @@ -132,8 +132,8 @@ public class CommandlineTest { assertEquals("", Commandline.toString(null)); assertEquals("1 2 3", Commandline.toString(new String[] {"1", "2", "3"})); assertEquals("1 \"2 3\"", Commandline.toString(new String[] {"1", "2 3"})); - assertEquals("1 \"2\'3\"", Commandline.toString(new String[] {"1", "2\'3"})); - assertEquals("1 \'2\"3\'", Commandline.toString(new String[] {"1", "2\"3"})); + assertEquals("1 \"2'3\"", Commandline.toString(new String[] {"1", "2'3"})); + assertEquals("1 '2\"3'", Commandline.toString(new String[] {"1", "2\"3"})); } @Test diff --git a/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java b/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java index 0d73edc30..a2cd3689b 100644 --- a/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/DirSetTest.java @@ -51,7 +51,7 @@ public class DirSetTest extends AbstractFileSetTest { @Test public void testDirSetFromFileSet() { thrown.expect(BuildException.class); - thrown.expectMessage("dummy doesn\'t denote a DirSet"); + thrown.expectMessage("dummy doesn't denote a DirSet"); fs.setProject(getProject()); getProject().addReference("dummy", fs); ds.setRefid(new Reference(getProject(), "dummy")); @@ -61,7 +61,7 @@ public class DirSetTest extends AbstractFileSetTest { @Test public void testFileSetFromDirSet() { thrown.expect(BuildException.class); - thrown.expectMessage("dummy doesn\'t denote a FileSet"); + thrown.expectMessage("dummy doesn't denote a FileSet"); getProject().addReference("dummy", ds); fs.setRefid(new Reference(getProject(), "dummy")); fs.getDir(getProject()); diff --git a/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java b/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java index f5e89dd49..2fb965e00 100644 --- a/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/EnumeratedAttributeTest.java @@ -42,8 +42,8 @@ public class EnumeratedAttributeTest { assertFalse(value.toUpperCase() + " is in TestNormal", t1.containsValue(value.toUpperCase())); } - assertFalse("TestNormal doesn\'t have \"d\" attribute", t1.containsValue("d")); - assertFalse("TestNull doesn\'t have \"d\" attribute and doesn\'t die", + assertFalse("TestNormal doesn't have \"d\" attribute", t1.containsValue("d")); + assertFalse("TestNull doesn't have \"d\" attribute and doesn't die", (new TestNull()).containsValue("d")); } diff --git a/src/tests/junit/org/apache/tools/ant/types/PathTest.java b/src/tests/junit/org/apache/tools/ant/types/PathTest.java index 5fae6bb71..47ad4982b 100644 --- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java @@ -128,7 +128,7 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertThat("c resolved relative to project\'s basedir", + assertThat("c resolved relative to project's basedir", l[0], endsWith("/c")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -146,10 +146,10 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertThat("c resolved relative to project\'s basedir", + assertThat("c resolved relative to project's basedir", l[0], endsWith("/c")); assertEquals("/test", l[1]); - assertThat("d resolved relative to project\'s basedir", + assertThat("d resolved relative to project's basedir", l[2], endsWith("/d")); assertEquals("/programs", l[3]); } else if (isNetWare) { @@ -169,7 +169,7 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertThat("c resolved relative to project\'s basedir", + assertThat("c resolved relative to project's basedir", l[0], endsWith("/c")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -187,10 +187,10 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertThat("c resolved relative to project\'s basedir", + assertThat("c resolved relative to project's basedir", l[0], endsWith("/c")); assertEquals("/test", l[1]); - assertThat("d resolved relative to project\'s basedir", + assertThat("d resolved relative to project's basedir", l[2], endsWith("/d")); assertEquals("/programs", l[3]); } else if (isNetWare) { @@ -211,7 +211,7 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("/sys")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -219,9 +219,9 @@ public class PathTest { assertEquals("volumes on NetWare", 1, l.length); } else { assertEquals("no multiple character-length volumes on Windows", 2, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("\\sys")); - assertThat("test resolved relative to project\'s basedir", + assertThat("test resolved relative to project's basedir", l[1], endsWith("\\test")); } } @@ -233,10 +233,10 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("/sys")); assertEquals("/test", l[1]); - assertThat("dev resolved relative to project\'s basedir", + assertThat("dev resolved relative to project's basedir", l[2], endsWith("/dev")); assertEquals("/temp", l[3]); } else if (isNetWare) { @@ -245,13 +245,13 @@ public class PathTest { assertEquals("dev:\\temp", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 4, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("\\sys")); - assertThat("test resolved relative to project\'s basedir", + assertThat("test resolved relative to project's basedir", l[1], endsWith("\\test")); - assertThat("dev resolved relative to project\'s basedir", + assertThat("dev resolved relative to project's basedir", l[2], endsWith("\\dev")); - assertThat("temp resolved relative to project\'s basedir", + assertThat("temp resolved relative to project's basedir", l[3], endsWith("\\temp")); } } @@ -263,7 +263,7 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("/sys")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -271,9 +271,9 @@ public class PathTest { assertEquals("sys:\\test", l[0].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 2, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("\\sys")); - assertThat("test resolved relative to project\'s basedir", + assertThat("test resolved relative to project's basedir", l[1], endsWith("\\test")); } } @@ -285,10 +285,10 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("/sys")); assertEquals("/test", l[1]); - assertThat("dev resolved relative to project\'s basedir", + assertThat("dev resolved relative to project's basedir", l[2], endsWith("/dev")); assertEquals("/temp", l[3]); } else if (isNetWare) { @@ -297,13 +297,13 @@ public class PathTest { assertEquals("dev:\\temp", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 4, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("\\sys")); - assertThat("test resolved relative to project\'s basedir", + assertThat("test resolved relative to project's basedir", l[1], endsWith("\\test")); - assertThat("dev resolved relative to project\'s basedir", + assertThat("dev resolved relative to project's basedir", l[2], endsWith("\\dev")); - assertThat("temp resolved relative to project\'s basedir", + assertThat("temp resolved relative to project's basedir", l[3], endsWith("\\temp")); } } @@ -317,7 +317,7 @@ public class PathTest { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 3, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("/SYS")); assertEquals("/JAVA/lib/rt.jar", l[1]); assertEquals("/JAVA/lib/classes.zip", l[2]); @@ -327,11 +327,11 @@ public class PathTest { assertEquals("sys:\\java\\lib\\classes.zip", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 3, l.length); - assertThat("sys resolved relative to project\'s basedir", + assertThat("sys resolved relative to project's basedir", l[0], endsWith("\\SYS")); - assertThat("java/lib/rt.jar resolved relative to project\'s basedir", + assertThat("java/lib/rt.jar resolved relative to project's basedir", l[1], endsWith("\\JAVA\\lib\\rt.jar")); - assertThat("java/lib/classes.zip resolved relative to project\'s basedir", + assertThat("java/lib/classes.zip resolved relative to project's basedir", l[2], endsWith("\\JAVA\\lib\\classes.zip")); } } diff --git a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java index d2ea12222..da4652003 100644 --- a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java @@ -458,10 +458,10 @@ public class FileUtilsTest { assertTrue("Non existing files", getFileUtils().contentEquals(new File(ROOT, "foo"), new File(ROOT, "bar"))); - assertFalse("One exists, the other one doesn\'t", + assertFalse("One exists, the other one doesn't", getFileUtils().contentEquals(new File(ROOT, "foo"), new File(ROOT, "build.xml"))); - assertFalse("Don\'t compare directories", + assertFalse("Don't compare directories", getFileUtils().contentEquals(new File(ROOT, "src"), new File(ROOT, "src"))); assertTrue("File equals itself", diff --git a/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java b/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java index 2c55d695f..eb9dc3a0b 100644 --- a/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/GlobPatternMapperTest.java @@ -42,7 +42,7 @@ public class GlobPatternMapperTest { public void testNoPatternAtAll() { m.setFrom("foobar"); m.setTo("baz"); - assertNull("Shouldn\'t match foobar", m.mapFileName("plonk")); + assertNull("Shouldn't match foobar", m.mapFileName("plonk")); String[] result = m.mapFileName("foobar"); assertNotNull("Should match foobar", result); assertEquals("only one result for foobar", 1, result.length); @@ -53,7 +53,7 @@ public class GlobPatternMapperTest { public void testPostfixOnly() { m.setFrom("*foo"); m.setTo("*plonk"); - assertNull("Shouldn\'t match *foo", m.mapFileName("bar.baz")); + assertNull("Shouldn't match *foo", m.mapFileName("bar.baz")); String[] result = m.mapFileName("bar.foo"); assertNotNull("Should match *.foo", result); assertEquals("only one result for bar.foo", 1, result.length); @@ -69,7 +69,7 @@ public class GlobPatternMapperTest { public void testPrefixOnly() { m.setFrom("foo*"); m.setTo("plonk*"); - assertNull("Shouldn\'t match foo*", m.mapFileName("bar.baz")); + assertNull("Shouldn't match foo*", m.mapFileName("bar.baz")); String[] result = m.mapFileName("foo.bar"); assertNotNull("Should match foo*", result); assertEquals("only one result for foo.bar", 1, result.length); @@ -85,7 +85,7 @@ public class GlobPatternMapperTest { public void testPreAndPostfix() { m.setFrom("foo*bar"); m.setTo("plonk*pling"); - assertNull("Shouldn\'t match foo*bar", m.mapFileName("bar.baz")); + assertNull("Shouldn't match foo*bar", m.mapFileName("bar.baz")); String[] result = m.mapFileName("foo.bar"); assertNotNull("Should match foo*bar", result); assertEquals("only one result for foo.bar", 1, result.length); diff --git a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java index 25be59215..c7b4a08e2 100644 --- a/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java @@ -53,26 +53,26 @@ public abstract class RegexpMatcherTest { reg.setPattern("aaaa"); assertTrue("aaaa should match itself", reg.matches("aaaa")); assertTrue("aaaa should match xaaaa", reg.matches("xaaaa")); - assertFalse("aaaa shouldn\'t match xaaa", reg.matches("xaaa")); + assertFalse("aaaa shouldn't match xaaa", reg.matches("xaaa")); reg.setPattern("^aaaa"); - assertFalse("^aaaa shouldn\'t match xaaaa", reg.matches("xaaaa")); + assertFalse("^aaaa shouldn't match xaaaa", reg.matches("xaaaa")); assertTrue("^aaaa should match aaaax", reg.matches("aaaax")); reg.setPattern("aaaa$"); - assertFalse("aaaa$ shouldn\'t match aaaax", reg.matches("aaaax")); + assertFalse("aaaa$ shouldn't match aaaax", reg.matches("aaaax")); assertTrue("aaaa$ should match xaaaa", reg.matches("xaaaa")); reg.setPattern("[0-9]+"); assertTrue("[0-9]+ should match 123", reg.matches("123")); assertTrue("[0-9]+ should match 1", reg.matches("1")); - assertFalse("[0-9]+ shouldn\'t match \'\'", reg.matches("")); - assertFalse("[0-9]+ shouldn\'t match a", reg.matches("a")); + assertFalse("[0-9]+ shouldn't match ''", reg.matches("")); + assertFalse("[0-9]+ shouldn't match a", reg.matches("a")); reg.setPattern("[0-9]*"); assertTrue("[0-9]* should match 123", reg.matches("123")); assertTrue("[0-9]* should match 1", reg.matches("1")); - assertTrue("[0-9]* should match \'\'", reg.matches("")); + assertTrue("[0-9]* should match ''", reg.matches("")); assertTrue("[0-9]* should match a", reg.matches("a")); reg.setPattern("([0-9]+)=\\1"); assertTrue("([0-9]+)=\\1 should match 1=1", reg.matches("1=1")); - assertFalse("([0-9]+)=\\1 shouldn\'t match 1=2", reg.matches("1=2")); + assertFalse("([0-9]+)=\\1 shouldn't match 1=2", reg.matches("1=2")); } @Test