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 2009/12/19 22:47:16 UTC
svn commit: r892509 - in /incubator/openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/lifecycle/
main/java/org/apache/webbeans/lifecycle/test/
test/java/org/apache/webbeans/newtests/ test/java/org/apache/webbeans/test/
test/java/org/a...
Author: struberg
Date: Sat Dec 19 21:47:15 2009
New Revision: 892509
URL: http://svn.apache.org/viewvc?rev=892509&view=rev
Log:
OWB-190 Make the TestLifeCycles available in webbeans-impl
I moved the test lifecycle and a few Mock interfaces it needs
from the test to the main classes. This way they can be used
in unit tests of other projects easily.
Added:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java (with props)
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockHttpSession.java
- copied, changed from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockHttpSession.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContext.java
- copied, changed from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContextEvent.java
- copied, changed from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContextEvent.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestLifeCycle.java
- copied, changed from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestLifecycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
- copied, changed from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestMetaDataDiscoveryService.java
Removed:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestLifecycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestMetaDataDiscoveryService.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockHttpSession.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContextEvent.java
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java Sat Dec 19 21:47:15 2009
@@ -122,7 +122,13 @@
if(currentSession == null)
{
//To activate session context
- httpRequest.getSession();
+ try
+ {
+ httpRequest.getSession();
+ }
+ catch(Exception e) {
+ logger.error("Got an Exception while starting a fresh session! ", e);
+ }
}
}
}
Added: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java?rev=892509&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java Sat Dec 19 21:47:15 2009
@@ -0,0 +1,77 @@
+/*
+ * 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.lifecycle.test;
+
+import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.exception.WebBeansException;
+import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
+import org.apache.webbeans.spi.se.deployer.MetaDataDiscoveryStandard;
+
+/**
+ * Ease the writing of the tests. Simulates container
+ * startup and stop functionality. This will scan all
+ * classes on the classpaths which have a beans.xml file.
+ * @version $Rev$ $Date$
+ */
+public class EnterpriseTestLifeCycle extends StandaloneLifeCycle {
+ private MockServletContextEvent servletContextEvent;
+
+ private MockHttpSession mockHttpSession;
+
+ public EnterpriseTestLifeCycle()
+ {
+ super();
+ }
+
+ @Override
+ public void init()
+ {
+ this.mockHttpSession = new MockHttpSession();
+ this.servletContextEvent = new MockServletContextEvent();
+
+ ContextFactory.initRequestContext(null);
+ ContextFactory.initSessionContext(mockHttpSession);
+ ContextFactory.initConversationContext(null);
+ ContextFactory.initApplicationContext(this.servletContextEvent.getServletContext());
+
+ this.discoveryService = new MetaDataDiscoveryStandard();
+
+ this.beanManager.setXMLConfigurator(this.xmlConfig);
+ }
+
+ @Override
+ public void applicationEnded(Object endObject)
+ {
+ ContextFactory.destroyRequestContext(null);
+ ContextFactory.destroySessionContext(this.mockHttpSession);
+ ContextFactory.destroyConversationContext();
+
+ super.applicationEnded(this.servletContextEvent);
+
+ ContextFactory.destroyApplicationContext(this.servletContextEvent.getServletContext());
+ }
+
+ @Override
+ public void applicationStarted(Object startupObject) throws WebBeansException
+ {
+ super.applicationStarted(this.servletContextEvent);
+ }
+
+}
Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/EnterpriseTestLifeCycle.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockHttpSession.java (from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockHttpSession.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockHttpSession.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockHttpSession.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockHttpSession.java&r1=889483&r2=892509&rev=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockHttpSession.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockHttpSession.java Sat Dec 19 21:47:15 2009
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.webbeans.test.mock;
+package org.apache.webbeans.lifecycle.test;
import java.util.Enumeration;
import java.util.concurrent.atomic.AtomicInteger;
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContext.java (from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContext.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContext.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContext.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContext.java&r1=889483&r2=892509&rev=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContext.java Sat Dec 19 21:47:15 2009
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.webbeans.test.mock;
+package org.apache.webbeans.lifecycle.test;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -168,4 +168,97 @@
attributes.put(name, object);
}
+ /*--- NEW SERVLET 3.0 FUNCTIONS! -- */
+ /*
+ public Dynamic addFilter(String arg0, String arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Dynamic addFilter(String arg0, Filter arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+ String arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+ Servlet arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+ Class<? extends Servlet> arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T extends Filter> T createFilter(Class<T> arg0)
+ throws ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T extends Servlet> T createServlet(Class<T> arg0)
+ throws ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public FilterRegistration getFilterRegistration(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map<String, FilterRegistration> getFilterRegistrations() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ServletRegistration getServletRegistration(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map<String, ServletRegistration> getServletRegistrations() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public SessionCookieConfig getSessionCookieConfig() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean setInitParameter(String arg0, String arg1) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ */
+
}
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContextEvent.java (from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContextEvent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContextEvent.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContextEvent.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContextEvent.java&r1=889483&r2=892509&rev=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockServletContextEvent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/MockServletContextEvent.java Sat Dec 19 21:47:15 2009
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.webbeans.test.mock;
+package org.apache.webbeans.lifecycle.test;
import javax.servlet.ServletContextEvent;
+
public class MockServletContextEvent extends ServletContextEvent
{
private static final long serialVersionUID = 1L;
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestLifeCycle.java (from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestLifecycle.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestLifeCycle.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestLifeCycle.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestLifecycle.java&r1=889483&r2=892509&rev=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestLifecycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestLifeCycle.java Sat Dec 19 21:47:15 2009
@@ -11,31 +11,32 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.webbeans.newtests;
+package org.apache.webbeans.lifecycle.test;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
-import org.apache.webbeans.test.mock.MockHttpSession;
-import org.apache.webbeans.test.mock.MockServletContextEvent;
/**
* Ease the writing of the tests. Simulates container
- * startup and stop functionality.
+ * startup and stop functionality and allow injection of
+ * classes which should be scanned by using the
+ * {@link OpenWebBeansTestMetaDataDiscoveryService}.
* @version $Rev$ $Date$
*
*/
-public class OpenWebBeansTestLifecycle extends StandaloneLifeCycle
+public class OpenWebBeansTestLifeCycle extends StandaloneLifeCycle
{
private MockServletContextEvent servletContextEvent;
private MockHttpSession mockHttpSession;
- public OpenWebBeansTestLifecycle()
+ public OpenWebBeansTestLifeCycle()
{
- super();
+ super();
}
+ @Override
public void init()
{
this.mockHttpSession = new MockHttpSession();
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java (from r889483, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestMetaDataDiscoveryService.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestMetaDataDiscoveryService.java&r1=889483&r2=892509&rev=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/OpenWebBeansTestMetaDataDiscoveryService.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java Sat Dec 19 21:47:15 2009
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.webbeans.newtests;
+package org.apache.webbeans.lifecycle.test;
import java.io.IOException;
import java.net.URL;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java Sat Dec 19 21:47:15 2009
@@ -18,11 +18,14 @@
import javax.enterprise.inject.spi.BeanManager;
+import org.apache.webbeans.lifecycle.test.OpenWebBeansTestLifeCycle;
+import org.apache.webbeans.lifecycle.test.OpenWebBeansTestMetaDataDiscoveryService;
+
public abstract class AbstractUnitTest
{
- private OpenWebBeansTestLifecycle testLifecycle;
+ private OpenWebBeansTestLifeCycle testLifecycle;
protected AbstractUnitTest()
{
@@ -32,7 +35,7 @@
protected void startContainer(Collection<Class<?>> beanClasses)
{
//Creates a new container
- testLifecycle = new OpenWebBeansTestLifecycle();
+ testLifecycle = new OpenWebBeansTestLifeCycle();
//Deploy bean classes
OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getDiscoveryService();
@@ -45,7 +48,7 @@
protected void startContainer(Collection<Class<?>> beanClasses, Collection<URL> beanXmls)
{
//Creates a new container
- testLifecycle = new OpenWebBeansTestLifecycle();
+ testLifecycle = new OpenWebBeansTestLifeCycle();
//Deploy bean classes
OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getDiscoveryService();
@@ -67,7 +70,7 @@
}
}
- protected OpenWebBeansTestLifecycle getLifecycle()
+ protected OpenWebBeansTestLifeCycle getLifecycle()
{
return this.testLifecycle;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sat Dec 19 21:47:15 2009
@@ -51,6 +51,7 @@
import org.apache.webbeans.intercept.InterceptorUtil;
import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
+import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.plugins.PluginLoader;
import org.apache.webbeans.portable.AnnotatedElementFactory;
@@ -64,7 +65,6 @@
import org.apache.webbeans.test.component.intercept.webbeans.WebBeansInterceptor;
import org.apache.webbeans.test.component.intercept.webbeans.WebBeanswithMetaInterceptor;
import org.apache.webbeans.test.containertests.ComponentResolutionByTypeTest;
-import org.apache.webbeans.test.mock.MockHttpSession;
import org.apache.webbeans.test.mock.MockManager;
import org.apache.webbeans.test.servlet.ITestContext;
import org.apache.webbeans.test.servlet.TestListener;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java Sat Dec 19 21:47:15 2009
@@ -16,9 +16,9 @@
import java.util.List;
import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.disposal.Disposal1;
-import org.apache.webbeans.test.mock.MockHttpSession;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java Sat Dec 19 21:47:15 2009
@@ -21,10 +21,10 @@
import junit.framework.Assert;
import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.intercept.webbeans.SecureAndTransactionalComponent;
import org.apache.webbeans.test.component.intercept.webbeans.SecureAndTransactionalInterceptor;
-import org.apache.webbeans.test.mock.MockHttpSession;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Sat Dec 19 21:47:15 2009
@@ -22,10 +22,10 @@
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.intercept.InterceptorsManager;
+import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.intercept.webbeans.ShoppingCard;
import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor;
-import org.apache.webbeans.test.mock.MockHttpSession;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java Sat Dec 19 21:47:15 2009
@@ -28,12 +28,12 @@
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.lifecycle.test.MockServletContext;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.portable.events.discovery.BeforeShutdownImpl;
import org.apache.webbeans.test.component.library.BookShop;
import org.apache.webbeans.test.component.portable.events.MyExtension;
import org.apache.webbeans.test.component.producer.primitive.PrimitiveProducer;
-import org.apache.webbeans.test.mock.MockServletContext;
import org.junit.Test;
/**
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java?rev=892509&r1=892508&r2=892509&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java Sat Dec 19 21:47:15 2009
@@ -23,6 +23,7 @@
import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.producer.ParametrizedModel1;
import org.apache.webbeans.test.component.producer.ParametrizedModel2;
@@ -32,7 +33,6 @@
import org.apache.webbeans.test.component.producer.Producer3;
import org.apache.webbeans.test.component.producer.Producer4;
import org.apache.webbeans.test.component.producer.Producer4ConsumerComponent;
-import org.apache.webbeans.test.mock.MockHttpSession;
import org.junit.Before;
import org.junit.Test;