You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/01/22 14:47:35 UTC
svn commit: r1436924 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/deployment/
test/java/org/apache/webbeans/newtests/managed/instance/beans/
test/java/org/apache/webbeans/newtests/performance/
Author: struberg
Date: Tue Jan 22 13:47:34 2013
New Revision: 1436924
URL: http://svn.apache.org/viewvc?rev=1436924&view=rev
Log:
OWB-344 do some performance tests and remove unused test class
Removed:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/instance/beans/UnparameterizedInstanceBean.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/performance/StartupPerformanceTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=1436924&r1=1436923&r2=1436924&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Tue Jan 22 13:47:34 2013
@@ -48,19 +48,19 @@ import org.apache.webbeans.util.Annotati
*/
public class StereoTypeModel implements IStereoTypeModel
{
- /**Name of the stereotype model. It is usd for registering model with StereoTypeManager*/
+ /** Name of the stereotype model. It is usd for registering model with StereoTypeManager */
private String name;
- /**Default deployment type*/
+ /** Default deployment type */
private Annotation defaultDeploymentType;
- /**Default scope type*/
+ /** Default scope type */
private Annotation defaultScopeType;
- /**Interceptor Bindings*/
+ /** Interceptor Bindings */
private Set<Annotation> interceptorBindingTypes = new HashSet<Annotation>();
- /**Inherit StereoType annotations*/
+ /** Inherit StereoType annotations */
private Set<Annotation> inherits = new HashSet<Annotation>();
private static final Logger logger = WebBeansLoggerFacade.getLogger(StereoTypeModel.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/performance/StartupPerformanceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/performance/StartupPerformanceTest.java?rev=1436924&r1=1436923&r2=1436924&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/performance/StartupPerformanceTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/performance/StartupPerformanceTest.java Tue Jan 22 13:47:34 2013
@@ -22,13 +22,26 @@ import java.util.ArrayList;
import java.util.Collection;
import org.apache.webbeans.newtests.AbstractUnitTest;
+import org.apache.webbeans.newtests.concepts.alternatives.common.AlternativeBean;
+import org.apache.webbeans.newtests.concepts.alternatives.common.Pencil;
+import org.apache.webbeans.newtests.concepts.alternatives.common.PencilProducerBean;
+import org.apache.webbeans.newtests.concepts.alternatives.common.SimpleBean;
+import org.apache.webbeans.newtests.concepts.alternatives.common.SimpleInjectionTarget;
import org.apache.webbeans.newtests.contexts.session.common.PersonalDataBean;
import org.apache.webbeans.newtests.injection.circular.beans.CircularApplicationScopedBean;
import org.apache.webbeans.newtests.injection.circular.beans.CircularDependentScopedBean;
+import org.apache.webbeans.newtests.managed.instance.beans.DependentBean;
+import org.apache.webbeans.newtests.managed.instance.beans.DependentBeanProducer;
+import org.apache.webbeans.newtests.managed.instance.beans.InstanceForDependentBean;
import org.apache.webbeans.newtests.managed.instance.beans.InstanceInjectedComponent;
import org.apache.webbeans.newtests.profields.beans.classproducer.MyProductBean;
import org.apache.webbeans.newtests.profields.beans.classproducer.MyProductProducer;
import org.apache.webbeans.newtests.profields.beans.classproducer.ProductInjectedBean;
+import org.apache.webbeans.newtests.profields.beans.stringproducer.GetterStringFieldInjector;
+import org.apache.webbeans.newtests.profields.beans.stringproducer.GetterStringProducerBean;
+import org.apache.webbeans.newtests.profields.beans.stringproducer.InformationConsumerBean;
+import org.apache.webbeans.newtests.profields.beans.stringproducer.MultipleListProducer;
+import org.apache.webbeans.newtests.profields.beans.stringproducer.StringProducerBean;
import org.apache.webbeans.newtests.promethods.beans.PersonProducerBean;
import org.apache.webbeans.newtests.promethods.common.Person;
import org.apache.webbeans.newtests.specalization.AdvancedPenProducer;
@@ -47,9 +60,20 @@ import org.junit.Test;
*/
public class StartupPerformanceTest extends AbstractUnitTest
{
+ private static final int NUMBER_ITERATIONS = 2;
+
+
@Test
public void testPerformance()
{
+ for (int i=0; i < NUMBER_ITERATIONS; i++)
+ {
+ startupWithClasses();
+ }
+ }
+
+ private void startupWithClasses()
+ {
Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
@@ -70,6 +94,26 @@ public class StartupPerformanceTest exte
beanClasses.add(PersonalDataBean.class);
beanClasses.add(CircularDependentScopedBean.class);
beanClasses.add(CircularApplicationScopedBean.class);
+ beanClasses.add(AlternativeBean.class);
+ beanClasses.add(Pencil.class);
+ beanClasses.add(PencilProducerBean.class);
+ beanClasses.add(SimpleBean.class);
+ beanClasses.add(SimpleInjectionTarget.class);
+ beanClasses.add(DependentBean.class);
+ beanClasses.add(DependentBeanProducer.class);
+ beanClasses.add(InstanceForDependentBean.class);
+
+
+ beanClasses.add(MyProductBean.class);
+ beanClasses.add(MyProductProducer.class);
+ beanClasses.add(ProductInjectedBean.class);
+
+ beanClasses.add(StringProducerBean.class);
+ beanClasses.add(GetterStringFieldInjector.class);
+ beanClasses.add(GetterStringProducerBean.class);
+ beanClasses.add(InformationConsumerBean.class);
+ beanClasses.add(MultipleListProducer.class);
+ beanClasses.add(GetterStringProducerBean.class);
startContainer(beanClasses, beanXmls);