[jboss-cvs] JBossAS SVN: r62504 - in projects/microcontainer/trunk: dependency/src/tests/org/jboss/test/dependency/controller/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 24 06:12:27 EDT 2007
Author: alesj
Date: 2007-04-24 06:12:27 -0400 (Tue, 24 Apr 2007)
New Revision: 62504
Added:
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CardinalityTestCase.java
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/BadCallbackTestObject.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.java
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Cardinality.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionTestSuite.java
Log:
Cardinality + BadCallback test cases.
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Cardinality.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Cardinality.java 2007-04-24 10:02:45 UTC (rev 62503)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Cardinality.java 2007-04-24 10:12:27 UTC (rev 62504)
@@ -138,7 +138,7 @@
return createCardinality(getLimitFromString(args[0]), getLimitFromString(args[1]));
}
else
- return createUnlimitedCardinality(Integer.valueOf(string));
+ return createUnlimitedCardinality(getLimitFromString(string));
}
/**
Added: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CardinalityTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CardinalityTestCase.java (rev 0)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CardinalityTestCase.java 2007-04-24 10:12:27 UTC (rev 62504)
@@ -0,0 +1,115 @@
+/*
+* 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.dependency.controller.test;
+
+import junit.framework.Test;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.test.AbstractTestCaseWithSetup;
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * CardinalityTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CardinalityTestCase extends AbstractTestCaseWithSetup
+{
+ public static Test suite()
+ {
+ return suite(CardinalityTestCase.class);
+ }
+
+ public CardinalityTestCase(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Default setup.
+ *
+ * @param clazz the class
+ * @return the delegate
+ * @throws Exception for any error
+ */
+ public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ {
+ return new AbstractTestDelegate(clazz);
+ }
+
+ public void testParseCardinality() throws Throwable
+ {
+ assertEquals(Cardinality.ZERO_TO_ONE, Cardinality.toCardinality("0..1"));
+ assertEquals(Cardinality.ZERO_TO_MANY, Cardinality.toCardinality("0..n"));
+ assertEquals(Cardinality.ONE_TO_ONE, Cardinality.toCardinality("1..1"));
+ assertEquals(Cardinality.ONE_TO_MANY, Cardinality.toCardinality("1..n"));
+
+ Cardinality c1 = Cardinality.toCardinality("2..20");
+ assertEquals(2, c1.getLeft());
+ assertEquals(20, c1.getRight());
+
+ Cardinality c2 = Cardinality.createCardinality(2, 20);
+ assertEquals(2, c2.getLeft());
+ assertEquals(20, c2.getRight());
+
+ Cardinality c3 = Cardinality.createUnlimitedCardinality(10);
+ assertEquals(10, c3.getLeft());
+ assertTrue(c3.isRightInfinity());
+
+ Cardinality c4 = Cardinality.createLimitedCardinality(10);
+ assertEquals(0, c4.getLeft());
+ assertEquals(10, c4.getRight());
+
+ Cardinality c5 = Cardinality.createCardinality(Cardinality.INFINITY, Cardinality.INFINITY);
+ assertTrue(c5.isLeftInfinity());
+ assertTrue(c5.isRightInfinity());
+ }
+
+ public void testRangeCardinality() throws Throwable
+ {
+ Cardinality c1 = Cardinality.fromString("5..10");
+ assertTrue(c1.isInRange(5));
+ assertTrue(c1.isInRange(7));
+ assertTrue(c1.isInRange(10));
+ assertFalse(c1.isInRange(-1));
+ assertFalse(c1.isInRange(3));
+ assertFalse(c1.isInRange(20));
+ assertFalse(c1.isInRange(Cardinality.INFINITY));
+
+ Cardinality c2 = Cardinality.ZERO_TO_MANY;
+ assertFalse(c2.isInRange(-1));
+ assertTrue(c2.isInRange(0));
+ assertTrue(c2.isInRange(Integer.MAX_VALUE));
+
+ Cardinality c3 = Cardinality.ONE_TO_MANY;
+ assertFalse(c3.isInRange(-1));
+ assertFalse(c3.isInRange(0));
+ assertTrue(c3.isInRange(1));
+ assertTrue(c3.isInRange(Integer.MAX_VALUE));
+
+ Cardinality c4 = Cardinality.createCardinality(Cardinality.INFINITY, Cardinality.INFINITY);
+ assertFalse(c4.isInRange(-1));
+ assertFalse(c4.isInRange(0));
+ assertFalse(c4.isInRange(1));
+ assertFalse(c4.isInRange(10));
+ assertFalse(c4.isInRange(Integer.MAX_VALUE));
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.xml 2007-04-24 10:12:27 UTC (rev 62504)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="testObject" class="org.jboss.test.kernel.inject.support.BadCallbackTestObject">
+ <incallback property="testerInterfaces" cardinality="2..n" whenRequired="Create"/>
+ <uncallback property="testerInterfaces"/>
+ </bean>
+
+ <bean name="tester1" class="org.jboss.test.kernel.inject.support.DuplicateTester"/>
+ <bean name="tester2" class="org.jboss.test.kernel.inject.support.DuplicateTester"/>
+ <bean name="tester3" class="org.jboss.test.kernel.inject.support.DuplicateTester"/>
+
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/BadCallbackTestObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/BadCallbackTestObject.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/support/BadCallbackTestObject.java 2007-04-24 10:12:27 UTC (rev 62504)
@@ -0,0 +1,35 @@
+/*
+* 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.inject.support;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:ales.justin at gmail.com">Ales Justin</a>
+ */
+public class BadCallbackTestObject extends CallbackTestObject
+{
+ public void setTesterInterfaces(Set<TesterInterface> testerInterfaces)
+ {
+ throw new UnsupportedOperationException("DOS test exception.");
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/BadCardinalityCallbackTestCase.java 2007-04-24 10:12:27 UTC (rev 62504)
@@ -0,0 +1,74 @@
+/*
+* 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.inject.test;
+
+import junit.framework.Test;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.kernel.inject.support.CallbackTestObject;
+import org.jboss.test.kernel.junit.ManualMicrocontainerTest;
+
+/**
+ * Cardinality tests.
+ *
+ * @author <a href="mailto:ales.justin at gmail.com">Ales Justin</a>
+ */
+public class BadCardinalityCallbackTestCase extends ManualMicrocontainerTest
+{
+ public BadCardinalityCallbackTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(BadCardinalityCallbackTestCase.class);
+ }
+
+ public void testCallback() throws Throwable
+ {
+ KernelControllerContext context = getControllerContext("testObject", ControllerState.NOT_INSTALLED);
+ assertNull(context.getTarget());
+ assertEquals(ControllerState.NOT_INSTALLED, context.getState());
+
+ change(context, ControllerState.CREATE);
+ CallbackTestObject injectee = (CallbackTestObject)context.getTarget();
+ assertNotNull(injectee);
+ assertNull(injectee.getTesterInterfaces());
+
+ KernelControllerContext tester1 = getControllerContext("tester1", ControllerState.NOT_INSTALLED);
+ assertNotNull(tester1);
+ change(tester1, ControllerState.INSTALLED);
+
+ assertEquals(ControllerState.CONFIGURED, context.getState());
+ assertNull(injectee.getTesterInterfaces());
+
+ KernelControllerContext tester2 = getControllerContext("tester2", ControllerState.NOT_INSTALLED);
+ assertNotNull(tester2);
+ change(tester2, ControllerState.INSTALLED);
+
+ change(context, ControllerState.INSTALLED);
+ assertNull(injectee.getTesterInterfaces());
+ assertEquals(ControllerState.INSTALLED, context.getState());
+ }
+
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionTestSuite.java 2007-04-24 10:02:45 UTC (rev 62503)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/ContextualInjectionTestSuite.java 2007-04-24 10:12:27 UTC (rev 62504)
@@ -49,6 +49,7 @@
suite.addTest(AdditionCallbackTestCase.suite());
suite.addTest(CollectionCallbackTestCase.suite());
suite.addTest(CardinalityCallbackTestCase.suite());
+ suite.addTest(BadCardinalityCallbackTestCase.suite());
return suite;
}
More information about the jboss-cvs-commits
mailing list