[jboss-cvs] JBossAS SVN: r81784 - in projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test: resources/org/jboss/test/microcontainer/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-11-28 12:39:51 -0500 (Fri, 28 Nov 2008)
New Revision: 81784

Added:
   projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.properties
Modified:
   projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java
Log:
Make test work with security manager enabled

Modified: projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java	2008-11-28 17:13:25 UTC (rev 81783)
+++ projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java	2008-11-28 17:39:51 UTC (rev 81784)
@@ -25,6 +25,9 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -56,14 +59,6 @@
       return suite(OverriddenClassLoaderTestCase.class);
    }
 
-//   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
-//   {
-//      //Don't use security for this test
-//      AbstractTypeTestDelegate delegate = new AbstractTypeTestDelegate(clazz);
-//      return delegate;
-//   }
-
-   
    public void testOverriddenLoader() throws Exception
    {
       ClassLoader loader = createParentLastURLClassLoader();
@@ -111,7 +106,7 @@
       File classFile = new File(url.toURI());
 
       //    File jarFile = new File("test-overridden-classloader.jar");
-      File jarFile = File.createTempFile("test-overridden-classloader", "jar");
+      File jarFile = createTempFile("test-overridden-classloader", "jar");
       jarFile.deleteOnExit();
       
       if (jarFile.exists())
@@ -151,4 +146,27 @@
       getLog().debug("===> Created jar " + jarFile.getAbsolutePath());
       return jarFile;
    }
+   
+   private File createTempFile(final String prefix, final String suffix) throws Exception
+   {
+      if (System.getSecurityManager() == null)
+         return File.createTempFile("test-overridden-classloader", "jar"); 
+      else
+      {
+         try
+         {
+            return AccessController.doPrivileged(new PrivilegedExceptionAction<File>()
+            {
+               public File run() throws Exception
+               {
+                  return File.createTempFile("test-overridden-classloader", "jar");
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw e.getException();
+         }
+      }
+   }
 }

Added: projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.properties
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.properties	                        (rev 0)
+++ projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.properties	2008-11-28 17:39:51 UTC (rev 81784)
@@ -0,0 +1 @@
+test.Permission.1=java.io.FilePermission, <<ALL FILES>>, write,delete