[jboss-cvs] JBossAS SVN: r71127 - in projects/microcontainer/trunk/kernel/src: resources/tests/org/jboss/test/kernel/controller/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 21 01:14:27 EDT 2008
Author: adrian at jboss.org
Date: 2008-03-21 01:14:26 -0400 (Fri, 21 Mar 2008)
New Revision: 71127
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase_NotAutomatic.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/support/PrivateFieldTestBean.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.java
Removed:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FieldAccessTestCase.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/ControllerTestSuite.java
Log:
Tests for private field access both allowed and disallowed, removed older test in the wrong place and broken
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java 2008-03-21 04:49:21 UTC (rev 71126)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java 2008-03-21 05:14:26 UTC (rev 71127)
@@ -105,6 +105,16 @@
throws Throwable
{
ExecutionWrapper wrapper = new PropertyDispatchWrapper(property, nullify, info, target, cl);
- dispatchExecutionWrapper(context, wrapper);
+ try
+ {
+ dispatchExecutionWrapper(context, wrapper);
+ }
+ catch (Throwable t)
+ {
+ if (nullify == false)
+ throw new RuntimeException("Error configuring property: " + property.getName() + " for " + context.getName(), t);
+ else
+ throw t;
+ }
}
}
\ No newline at end of file
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.xml 2008-03-21 05:14:26 UTC (rev 71127)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Allowed" class="org.jboss.test.kernel.controller.support.PrivateFieldTestBean" access-mode="ALL">
+ <property name="privateString">private</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase_NotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase_NotAutomatic.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase_NotAutomatic.xml 2008-03-21 05:14:26 UTC (rev 71127)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="NotAllowed" class="org.jboss.test.kernel.controller.support.PrivateFieldTestBean" access-mode="ALL">
+ <property name="privateString">private</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/support/PrivateFieldTestBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/support/PrivateFieldTestBean.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/support/PrivateFieldTestBean.java 2008-03-21 05:14:26 UTC (rev 71127)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.controller.support;
+
+/**
+ * PrivateFieldTestBean.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class PrivateFieldTestBean
+{
+ private String privateString;
+
+ public String getPrivateStringNotGetter()
+ {
+ return privateString;
+ }
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/ControllerTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/ControllerTestSuite.java 2008-03-21 04:49:21 UTC (rev 71126)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/ControllerTestSuite.java 2008-03-21 05:14:26 UTC (rev 71127)
@@ -48,7 +48,8 @@
suite.addTest(ContextClassLoaderTestCase.suite());
suite.addTest(InstallErrorTestCase.suite());
suite.addTest(InstallWhenRequiredErrorTestCase.suite());
-
+ suite.addTest(FieldAccessControlTestCase.suite());
+
return suite;
}
}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/controller/test/FieldAccessControlTestCase.java 2008-03-21 05:14:26 UTC (rev 71127)
@@ -0,0 +1,68 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.kernel.controller.test;
+
+import java.security.AccessControlException;
+
+import junit.framework.Test;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.test.kernel.controller.support.PrivateFieldTestBean;
+
+/**
+ * AccessControl Test Case.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 38046 $
+ */
+public class FieldAccessControlTestCase extends AbstractControllerTest
+{
+ public static Test suite()
+ {
+ return suite(FieldAccessControlTestCase.class);
+ }
+
+ public FieldAccessControlTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public void testPrivateField() throws Throwable
+ {
+ PrivateFieldTestBean test = assertBean("Allowed", PrivateFieldTestBean.class);
+ assertEquals("private", test.getPrivateStringNotGetter());
+
+ KernelDeployment deployment = deploy("FieldAccessControlTestCase_NotAutomatic.xml");
+ try
+ {
+ ControllerContext context = getControllerContext("NotAllowed", null);
+ assertEquals(ControllerState.ERROR, context.getState());
+ checkDeepThrowable(AccessControlException.class, context.getError());
+ }
+ finally
+ {
+ undeploy(deployment);
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FieldAccessTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FieldAccessTestCase.java 2008-03-21 04:49:21 UTC (rev 71126)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FieldAccessTestCase.java 2008-03-21 05:14:26 UTC (rev 71127)
@@ -1,64 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.kernel.dependency.test;
-
-import java.security.AccessControlException;
-
-import junit.framework.Test;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-
-/**
- * Field access tests.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class FieldAccessTestCase extends AbstractKernelDependencyTest
-{
- public FieldAccessTestCase(String name) throws Throwable
- {
- super(name, true);
- }
-
- public static Test suite()
- {
- return suite(FieldAccessTestCase.class);
- }
-
- public void testFieldAccess() throws Throwable
- {
- ControllerContext privateContext = install(0, "private");
- assertNotNull(privateContext);
- assertNotNull(privateContext.getError());
- assertInstanceOf(privateContext.getError(), AccessControlException.class, false);
-
- ControllerContext protectedContext = install(1, "protected");
- assertNotNull(protectedContext);
- assertNotNull(protectedContext.getError());
- assertInstanceOf(protectedContext.getError(), AccessControlException.class, false);
-
- ControllerContext publicContext = install(2, "public");
- assertNotNull(publicContext);
- assertEquals(ControllerState.INSTALLED, publicContext.getState());
- assertNull(publicContext.getError());
- }
-}
More information about the jboss-cvs-commits
mailing list