Author: maartenc
Date: Thu Mar 8 13:43:49 2007
New Revision: 516189
URL: http://svn.apache.org/viewvc?view=rev&rev=516189
Log:
Removed hard-coded report filenames.
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?view=diff&rev=516189&r1=516188&r2=516189
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Thu Mar 8 13:43:49 2007
@@ -1135,7 +1135,7 @@
assertEquals(0,
crr.getDownloadReports(ModuleRevisionId.newInstance("org1", "mod1.2",
"2.0")).length);
assertEquals(1,
crr.getDownloadReports(ModuleRevisionId.newInstance("org1", "mod1.2",
"2.1")).length);
- File r = new File(_cache,
ResolveOptions.getDefaultResolveId(mrid.getModuleId()) + "-default.xml");
+ File r =
_cacheManager.getConfigurationResolveReportInCache(ResolveOptions.getDefaultResolveId(md),
"default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
@@ -1175,7 +1175,7 @@
assertEquals(1,
crr.getDownloadReports(ModuleRevisionId.newInstance("org1", "mod1.2",
"2.1")).length);
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1",
"4.14");
- File r = new File(_cache,
ResolveOptions.getDefaultResolveId(mrid.getModuleId()) + "-default.xml");
+ File r =
_cacheManager.getConfigurationResolveReportInCache(ResolveOptions.getDefaultResolveId(mrid.getModuleId()),
"default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
@@ -1840,7 +1840,7 @@
assertNotNull(crr);
assertEquals(1, crr.getDownloadReports(depId).length);
- File r = new File(_cache,
ResolveOptions.getDefaultResolveId(mrid.getModuleId()) + "-default.xml");
+ File r =
_cacheManager.getConfigurationResolveReportInCache(ResolveOptions.getDefaultResolveId(mrid.getModuleId()),
"default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();