Repository: ant-ivy Updated Branches: refs/heads/master 06af67c4e -> d976a4a27
Fixed ModuleDescriptorMemoryCacheTest Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d976a4a2 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d976a4a2 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d976a4a2 Branch: refs/heads/master Commit: d976a4a27fae96173d191f78c1780e5045076af0 Parents: 06af67c Author: Maarten Coene <maart...@apache.org> Authored: Fri Aug 24 09:25:25 2018 +0200 Committer: Maarten Coene <maart...@apache.org> Committed: Fri Aug 24 09:25:25 2018 +0200 ---------------------------------------------------------------------- .../cache/ModuleDescriptorMemoryCacheTest.java | 42 ++++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d976a4a2/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java index bd3157f..230cb2e 100644 --- a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java +++ b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java @@ -17,20 +17,21 @@ */ package org.apache.ivy.core.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; - import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.plugins.parser.ParserSettings; +import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.text.ParseException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class ModuleDescriptorMemoryCacheTest { private ModuleDescriptorMemoryCache cache = new ModuleDescriptorMemoryCache(2); @@ -39,23 +40,38 @@ public class ModuleDescriptorMemoryCacheTest { private IvySettings ivySettings2 = new IvySettings(); - private File url1 = new File("file://cached/file.txt"); + private File url1 = null; - private File url2 = new File("file://cached/file2.txt"); + private File url2 = null; - private File url3 = new File("file://cached/file3.txt"); + private File url3 = null; private ModuleRevisionId mrid1 = ModuleRevisionId.newInstance("org", "name", "rev"); - private ModuleDescriptor md1 = DefaultModuleDescriptor.newDefaultInstance(mrid1); + private DefaultModuleDescriptor md1 = DefaultModuleDescriptor.newDefaultInstance(mrid1); private ModuleRevisionId mrid2 = ModuleRevisionId.newInstance("org", "name", "rev2"); - private ModuleDescriptor md2 = DefaultModuleDescriptor.newDefaultInstance(mrid2); + private DefaultModuleDescriptor md2 = DefaultModuleDescriptor.newDefaultInstance(mrid2); private ModuleRevisionId mrid3 = ModuleRevisionId.newInstance("org", "name", "rev3"); - private ModuleDescriptor md3 = DefaultModuleDescriptor.newDefaultInstance(mrid3); + private DefaultModuleDescriptor md3 = DefaultModuleDescriptor.newDefaultInstance(mrid3); + + @Before + public void setUp() throws IOException { + url1 = File.createTempFile("ivy", "xml"); + md1.setLastModified(url1.lastModified()); + url1.deleteOnExit(); + + url2 = File.createTempFile("ivy", "xml"); + md2.setLastModified(url2.lastModified()); + url2.deleteOnExit(); + + url3 = File.createTempFile("ivy", "xml"); + md3.setLastModified(url3.lastModified()); + url3.deleteOnExit(); + } @Test public void testUseModuleDescriptorProviderWhenModuleNotCached() throws ParseException,
