[jboss-cvs] JBossAS SVN: r112484 - in projects/jboss-cl/branches/Branch_2_0/classloader/src: test/java/org/jboss/test/classloader/resources/tests and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 30 02:38:17 EST 2011
Author: alesj
Date: 2011-11-30 02:38:17 -0500 (Wed, 30 Nov 2011)
New Revision: 112484
Added:
projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/CountingClassLoaderPolicy.java
Modified:
projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/MockClassLoaderHelper.java
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/resources/tests/ResourceUnitTestCase.java
Log:
[JBCL-181]; add cache-hit tests.
Added: projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/CountingClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/CountingClassLoaderPolicy.java (rev 0)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/CountingClassLoaderPolicy.java 2011-11-30 07:38:17 UTC (rev 112484)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.classloader.test.support;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Set;
+
+/**
+ * Count access to resources.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class CountingClassLoaderPolicy extends MockClassLoaderPolicy
+{
+ private int getResourceCounter;
+ private int getResourcesCounter;
+
+ public CountingClassLoaderPolicy()
+ {
+ }
+
+ public CountingClassLoaderPolicy(String name)
+ {
+ super(name);
+ }
+
+ public int getGetResourceCounter()
+ {
+ return getResourceCounter;
+ }
+
+ public int getGetResourcesCounter()
+ {
+ return getResourcesCounter;
+ }
+
+ @Override
+ public URL getResource(String path)
+ {
+ getResourceCounter++;
+ return super.getResource(path);
+ }
+
+ @Override
+ public void getResources(String path, Set<URL> urls) throws IOException
+ {
+ getResourcesCounter++;
+ super.getResources(path, urls);
+ }
+}
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/MockClassLoaderHelper.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/MockClassLoaderHelper.java 2011-11-30 02:38:05 UTC (rev 112483)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/main/java/org/jboss/classloader/test/support/MockClassLoaderHelper.java 2011-11-30 07:38:17 UTC (rev 112484)
@@ -36,6 +36,7 @@
* WARNING. This class/package should be excluded from the release
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class MockClassLoaderHelper
@@ -70,6 +71,23 @@
}
/**
+ * Create a mock counting classloader policy with the given name
+ *
+ * @param name the name
+ * @return the policy
+ */
+ public static CountingClassLoaderPolicy createMockCountingClassLoaderPolicy(final String name)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<CountingClassLoaderPolicy>()
+ {
+ public CountingClassLoaderPolicy run()
+ {
+ return new CountingClassLoaderPolicy(name);
+ }
+ });
+ }
+
+ /**
* Create and register a mock classloader policy<p>
*
* No security problem here. The user needs access to a ClassLoaderSystem
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/resources/tests/ResourceUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/resources/tests/ResourceUnitTestCase.java 2011-11-30 02:38:05 UTC (rev 112483)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/resources/tests/ResourceUnitTestCase.java 2011-11-30 07:38:17 UTC (rev 112484)
@@ -29,11 +29,12 @@
import java.util.HashSet;
import junit.framework.Test;
-
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
+import org.jboss.classloader.test.support.CountingClassLoaderPolicy;
+import org.jboss.classloader.test.support.MockClassLoaderHelper;
import org.jboss.classloader.test.support.MockClassLoaderPolicy;
import org.jboss.test.classloader.AbstractClassLoaderTestWithSecurity;
@@ -41,6 +42,7 @@
* ClassLoaderSystemUnitTestCase.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class ResourceUnitTestCase extends AbstractClassLoaderTestWithSecurity
@@ -267,6 +269,21 @@
assertGetResource("a/", "testResource", classLoader);
}
+ public void testGetResourceFromCache() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystem();
+ CountingClassLoaderPolicy policy = MockClassLoaderHelper.createMockCountingClassLoaderPolicy(null);
+ policy.setPrefix("a/");
+ policy.setPath("com/acme/p1");
+ ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
+
+ assertGetResource("a/", "com/acme/p1/testResource", classLoader);
+ assertEquals(1, policy.getGetResourceCounter());
+ // should hit cache
+ assertGetResource("a/", "com/acme/p1/testResource", classLoader);
+ assertEquals(1, policy.getGetResourceCounter());
+ }
+
public void testGetResources() throws Exception
{
ClassLoaderSystem system = createClassLoaderSystem();
@@ -495,7 +512,25 @@
assertGetResources("testResource", classLoader, "a/", "b/");
}
-
+
+ public void testGetResourcesFromCache() throws Exception
+ {
+ ClassLoaderSystem system = createClassLoaderSystem();
+ CountingClassLoaderPolicy policy = MockClassLoaderHelper.createMockCountingClassLoaderPolicy(null);
+ policy.setPrefix("a/");
+ policy.setPath("com/acme/p1");
+ ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
+
+ assertGetResources("com/acme/p1/testResource", classLoader, "a/");
+ assertEquals(1, policy.getGetResourcesCounter());
+ // should hit cache from getResources
+ assertGetResource("a/", "com/acme/p1/testResource", classLoader);
+ assertEquals(0, policy.getGetResourceCounter());
+ // 2nd try -- should hit cache
+ assertGetResources("com/acme/p1/testResource", classLoader, "a/");
+ assertEquals(1, policy.getGetResourcesCounter());
+ }
+
protected URL assertGetResource(String prefix, String resourcePath, ClassLoader classLoader) throws Exception
{
URL url = classLoader.getResource(resourcePath);
More information about the jboss-cvs-commits
mailing list