From 248813d9521b1e5b14260bde70c4295e70304473 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 15:14:03 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946211 13f79535-47bb-0310-9956-ffa450edef68
---
 .../startup/TestContextConfigAnnotation.java       | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
index 95e682c2c..0b10295f3 100644
--- a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
+++ b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
@@ -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 extends TestCase {
         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;
     }
 }
-- 
2.11.0