diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 18:59:44 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 18:59:44 +0000 |
| commit | 168b4574bffac2fa0066269f193237dd01e81199 (patch) | |
| tree | 6e240854171d9af4f05d6a80fde396b39c0ad437 /user/ant/imageio_fix_java_test.patch | |
| parent | 20d2ef3f09eb5705f80d4f53865a69ce2314be5d (diff) | |
| parent | 398521c6a9d620107337f7ce07bf81f829a88c67 (diff) | |
| download | packages-168b4574bffac2fa0066269f193237dd01e81199.tar.gz packages-168b4574bffac2fa0066269f193237dd01e81199.tar.bz2 packages-168b4574bffac2fa0066269f193237dd01e81199.tar.xz packages-168b4574bffac2fa0066269f193237dd01e81199.zip | |
Merge branch 'master' into 'master'
New package: ant
This merge adds support for a new package: [Apache Ant](http://ant.apache.org/)!
Ant is a Java based utility. It does ant things, such as building, testing, and installing.
:)
See merge request !235
Diffstat (limited to 'user/ant/imageio_fix_java_test.patch')
| -rw-r--r-- | user/ant/imageio_fix_java_test.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/user/ant/imageio_fix_java_test.patch b/user/ant/imageio_fix_java_test.patch new file mode 100644 index 000000000..4fa856e73 --- /dev/null +++ b/user/ant/imageio_fix_java_test.patch @@ -0,0 +1,26 @@ +diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +index c96691d..e8cfd29 100644 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +@@ -86,21 +86,6 @@ public class ImageIOTest { + assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); + } + +- @Test +- public void testDrawOverwriteTrue() { +- buildRule.executeTarget("testSimpleScale"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- File f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- assumeTrue("Could not change file modification date", +- f.setLastModified(f.lastModified() - FILE_UTILS.getFileTimestampGranularity() * 2)); +- long lastModified = f.lastModified(); +- buildRule.executeTarget("testDrawOverwriteTrue"); +- assertThat(buildRule.getLog(), containsString("Processing File")); +- f = new File(buildRule.getOutputDir(), LARGEIMAGE); +- long overwrittenLastModified = f.lastModified(); +- assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); +- } +- + @Test + public void testOverwriteFalse() { + buildRule.executeTarget("testSimpleScale"); |