svn commit: r1434480 - /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java

[st...@apache.org]

Author: struberg
Date: Wed Jan 16 23:20:00 2013
New Revision: 1434480

URL: http://svn.apache.org/viewvc?rev=1434480&view=rev
Log:
OWB-344 fix another broken test. 

Modified:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java?rev=1434480&r1=1434479&r2=1434480&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java Wed Jan 16 23:20:00 2013
@@ -18,66 +18,34 @@
  */
 package org.apache.webbeans.test.unittests.intercept;
 
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractOwbBean;
-import org.apache.webbeans.component.ManagedBean;
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.intercept.InterceptorData;
-import org.apache.webbeans.test.TestContext;
+import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
 import org.apache.webbeans.test.component.PostConstructInterceptorComponent;
-import org.junit.Before;
 import org.junit.Test;
 
-public class PostConstructInterceptorComponentTest extends TestContext
+public class PostConstructInterceptorComponentTest extends AbstractUnitTest
 {
-    public PostConstructInterceptorComponentTest()
-    {
-        super(PostConstructInterceptorComponentTest.class.getSimpleName());
-    }
 
-    @Before
-    public void init()
-    {
-        super.init();
-    }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void testTypedComponent() throws Throwable
     {
-        clear();
-
-        defineManagedBean(CheckWithCheckPayment.class);
-        defineManagedBean(PostConstructInterceptorComponent.class);
-        List<AbstractOwbBean<?>> comps = getComponents();
-
-        ContextFactory contextFactory = WebBeansContext.getInstance().getContextFactory();
-        contextFactory.initRequestContext(null);
+        Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+        beanClasses.add(CheckWithCheckPayment.class);
+        beanClasses.add(PostConstructInterceptorComponent.class);
 
-        Assert.assertEquals(2, comps.size());
+        startContainer(beanClasses, null);
 
-        Object object = getManager().getInstance(comps.get(0));
-        Object object2 = getManager().getInstance(comps.get(1));
-
-        Assert.assertTrue(object instanceof CheckWithCheckPayment);
-        Assert.assertTrue(object2 instanceof PostConstructInterceptorComponent);
-
-        PostConstructInterceptorComponent pcc = (PostConstructInterceptorComponent) object2;
-
-        ManagedBean<PostConstructInterceptorComponent> s = (ManagedBean<PostConstructInterceptorComponent>) comps.get(1);
+        PostConstructInterceptorComponent pcc = getInstance(PostConstructInterceptorComponent.class);
 
         Assert.assertNotNull(pcc.getP());
 
-        List<InterceptorData> stack = s.getInterceptorStack();
-
-        Assert.assertEquals(2, stack.size());
-
-        contextFactory.destroyRequestContext(null);
+        shutDownContainer();
     }
 
 }