You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/17 12:26:19 UTC
svn commit: r735274 [2/2] - in
/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test:
annotation/deployment/ component/ component/disposal/
component/event/broken/ component/event/normal/ component/exception/
component/newc...
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java?rev=735274&r1=735273&r2=735274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java Sat Jan 17 03:26:18 2009
@@ -46,7 +46,7 @@
public void testDefinition1()
{
clear();
-
+
XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition1.xml");
Assert.assertEquals("definition1", compDef.getName());
@@ -57,12 +57,11 @@
Assert.assertTrue(instance instanceof Definition1);
}
-
@Test
public void testDefinition2()
{
clear();
-
+
XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition2.xml");
Object instance = compDef.create();
@@ -75,26 +74,26 @@
public void testDefinition3()
{
clear();
-
+
XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition3.xml");
-
+
// we have to additionally define the PaymentProcessor and SystemConfig
- // which would in real world parsed by the scanner
+ // which would in real world parsed by the scanner
defineSimpleWebBean(PaymentProcessor.class);
defineSimpleWebBean(SystemConfig.class);
-
+
Assert.assertEquals("asyncCreditCardPaymentProcessor", compDef.getName());
-
+
Object instance = compDef.create();
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof MockAsynchronousCreditCardPaymentProcessor);
-
+
MockAsynchronousCreditCardPaymentProcessor ccProcessor = (MockAsynchronousCreditCardPaymentProcessor) instance;
-
+
SystemConfig config = ccProcessor.getConfig();
Assert.assertEquals("default", config.getValue());
-
+
PaymentProcessor paymentProcesor = ccProcessor.getPaymentProcessor();
Assert.assertNotNull(paymentProcesor);
}
@@ -103,50 +102,48 @@
public void testWebBeanUnnamed()
{
clear();
-
+
XMLComponentImpl<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanUnnamed.xml");
-
- // an unnamed bean must not have a name
+
+ // an unnamed bean must not have a name
Assert.assertNull(compDef.getName());
-
+
Object instance = compDef.create();
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanUnnamed);
}
-
+
@Test
- public void testConstructorInjection1()
+ public void testConstructorInjection1()
{
clear();
-
- AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor1.xml",
- TstBeanConstructor.class);
+
+ AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor1.xml", TstBeanConstructor.class);
Object instance = compDef.create();
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanConstructor);
-
+
TstBeanConstructor tbc = (TstBeanConstructor) instance;
Assert.assertEquals(4200, tbc.getVal1());
- Assert.assertEquals(13 , tbc.getVal2());
+ Assert.assertEquals(13, tbc.getVal2());
}
-
+
@Test
- public void testConstructorInjection2()
+ public void testConstructorInjection2()
{
clear();
-
+
ContextFactory.initRequestContext(null);
-
- AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml",
- TstBeanConstructor.class);
+
+ AbstractComponent<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml", TstBeanConstructor.class);
Object instance = compDef.create();
Assert.assertNotNull(instance);
Assert.assertTrue(instance instanceof TstBeanConstructor);
-
+
TstBeanConstructor tbc = (TstBeanConstructor) instance;
Assert.assertEquals(0, tbc.getVal1());
- Assert.assertEquals(40 , tbc.getVal2());
- }
+ Assert.assertEquals(40, tbc.getVal2());
+ }
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/CtParameter.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/CtParameter.java?rev=735274&r1=735273&r2=735274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/CtParameter.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/CtParameter.java Sat Jan 17 03:26:18 2009
@@ -1,18 +1,15 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
*/
package org.apache.webbeans.test.xml.definition;
@@ -26,4 +23,4 @@
{
return 42;
}
-}
\ No newline at end of file
+}
\ No newline at end of file
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/PaymentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/PaymentProcessor.java?rev=735274&r1=735273&r2=735274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/PaymentProcessor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/PaymentProcessor.java Sat Jan 17 03:26:18 2009
@@ -17,7 +17,7 @@
import org.apache.webbeans.test.annotation.binding.Synchronous;
@Synchronous
-@PayBy(value="CREDIT_CARD")
+@PayBy(value = "CREDIT_CARD")
public class PaymentProcessor
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanConstructor.java?rev=735274&r1=735273&r2=735274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanConstructor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanConstructor.java Sat Jan 17 03:26:18 2009
@@ -13,10 +13,8 @@
*/
package org.apache.webbeans.test.xml.definition;
-
-
/**
- * This test WebBean has a constructor which should be injected via XML
+ * This test WebBean has a constructor which should be injected via XML
*/
public class TstBeanConstructor
{
@@ -25,9 +23,9 @@
public TstBeanConstructor()
{
-
+
}
-
+
public TstBeanConstructor(CtParameter ctParam)
{
this.val1 = ctParam.getValue() * 100;
@@ -42,13 +40,12 @@
{
this.val1 = ctParam * multiplier;
}
-
+
public int getVal1()
{
return val1;
}
-
-
+
public void setVal1(int val1)
{
this.val1 = val1;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanUnnamed.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanUnnamed.java?rev=735274&r1=735273&r2=735274&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanUnnamed.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/xml/definition/TstBeanUnnamed.java Sat Jan 17 03:26:18 2009
@@ -14,7 +14,8 @@
package org.apache.webbeans.test.xml.definition;
/**
- * This test WebBean has no Named section neither via Annotation nor via XML definition.
+ * This test WebBean has no Named section neither via Annotation nor via XML
+ * definition.
*/
public class TstBeanUnnamed
{