[jboss-cvs] JBossAS SVN: r57781 - in projects/aop/trunk/aop/src/test/org/jboss/test/aop: . nameddomain regression/jbaop194_undeploy

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2006-10-23 17:38:12 -0400 (Mon, 23 Oct 2006)
New Revision: 57781

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/nameddomain/NamedDomainTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop194_undeploy/UndeployTester.java
Log:
Move getting hold of the url for -aop.xml files to be deployed to AOPTestWithSetup

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java	2006-10-23 21:23:39 UTC (rev 57780)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java	2006-10-23 21:38:12 UTC (rev 57781)
@@ -21,6 +21,9 @@
 */ 
 package org.jboss.test.aop;
 
+import java.io.IOException;
+import java.net.URL;
+
 import org.jboss.test.AbstractTestCaseWithSetup;
 import org.jboss.test.AbstractTestDelegate;
 
@@ -49,4 +52,16 @@
       delegate.enableSecurity = true;
       return delegate;
    }
+   
+   protected URL getURLRelativeToProjectRoot(String relativePath) throws IOException
+   {
+      URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
+      System.out.println("class url: " + url);
+      String location = url.toString();
+      int index = location.indexOf("/output/");
+      location = location.substring(0, index);
+      
+      location = location + relativePath;
+      return new URL(location);
+   }
 }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/nameddomain/NamedDomainTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/nameddomain/NamedDomainTestCase.java	2006-10-23 21:23:39 UTC (rev 57780)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/nameddomain/NamedDomainTestCase.java	2006-10-23 21:38:12 UTC (rev 57781)
@@ -94,15 +94,7 @@
    {
       Proxied tgt = new Proxied();//Load the class before we deploy the xml that will cause weaving
       
-      URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
-      System.out.println("class url: " + url);
-      String location = url.toString();
-      int index = location.indexOf("/output/");
-      location = location.substring(0, index);
-      
-      location = location + "/src/resources/test/nameddomain/manual-aop.xml";
-      url = new URL(location);
-      System.out.println("xml url:   " + url);
+      URL url = getURLRelativeToProjectRoot("/src/resources/test/nameddomain/manual-aop.xml");
       AspectXmlLoader.deployXML(url);
       
       AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop194_undeploy/UndeployTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop194_undeploy/UndeployTester.java	2006-10-23 21:23:39 UTC (rev 57780)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop194_undeploy/UndeployTester.java	2006-10-23 21:38:12 UTC (rev 57781)
@@ -55,16 +55,8 @@
       pojo.method();
       assertTrue(TestInterceptor.intercepted);
 
-      URL url = pojo.getClass().getProtectionDomain().getCodeSource().getLocation();
-      System.out.println("class url: " + url);
-      String location = url.toString();
-      int index = location.indexOf("/output/");
-      location = location.substring(0, index);
+      URL url = getURLRelativeToProjectRoot("/src/resources/test/regression/jboss-aop.xml");
       
-      location = location + "/src/resources/test/regression/jboss-aop.xml";
-      url = new URL(location);
-      System.out.println("xml url:   " + url);
-
       System.out.println("Undeploying first time");
       AspectXmlLoader.undeployXML(url);
       TestInterceptor.intercepted = false;