Author: kkolinko
Date: Wed May 19 15:14:03 2010
New Revision: 946211
URL: http://svn.apache.org/viewvc?rev=946211&view=rev
Log:
Do not try to find compiled class files of test classes by looking directly
into "known" places, but ask the classloader where it loads them from.
This fixes test failure when ${tomcat.output} ant property has non-default
value.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=946211&r1=946210&r2=946211&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Wed May 19 15:14:03 2010
@@ -17,6 +17,7 @@
package org.apache.catalina.startup;
import java.io.File;
+import java.net.URL;
import java.util.Set;
import javax.servlet.DispatcherType;
@@ -33,7 +34,7 @@ import org.apache.catalina.deploy.WebXml
* fragment.
*
* @author Peter Rossbach
- * @version $Id$
+ * @version $Revision$
*/
public class TestContextConfigAnnotation extends TestCase {
@@ -239,25 +240,18 @@ public class TestContextConfigAnnotation
FilterDef filterDef = webxml.getFilters().get("paramD");
assertNull(filterDef);
}
-
+
/**
- * Find newest class resource at eclipse and ant standard class output
dirs!
+ * Find compiled test class
*
* @param className
* @return File Resource
*/
private File paramClassResource(String className) {
- File antFile = new File("output/testclasses/" + className + ".class");
- File eclipseFile = new File(".settings/output/" + className +
".class");
- if (antFile.exists()) {
- if (eclipseFile.exists()) {
- if (antFile.lastModified() >= eclipseFile.lastModified()) {
- return antFile;
- }
- return eclipseFile;
- }
- return antFile;
- }
- return eclipseFile;
+ URL url = getClass().getClassLoader().getResource(className +
".class");
+ assertNotNull(url);
+
+ File file = new File(url.getPath());
+ return file;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
