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/03/13 18:51:32 UTC
svn commit: r753326 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test:
component/exception/stero/ unittests/exception/
Author: struberg
Date: Fri Mar 13 17:51:22 2009
New Revision: 753326
URL: http://svn.apache.org/viewvc?rev=753326&view=rev
Log:
OWB-83 passivatable scopes have to be serializable
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java?rev=753326&r1=753325&r2=753326&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithDifferentScopeSteros.java Fri Mar 13 17:51:22 2009
@@ -13,6 +13,8 @@
*/
package org.apache.webbeans.test.component.exception.stero;
+import java.io.Serializable;
+
import javax.context.SessionScoped;
import javax.inject.Production;
@@ -23,7 +25,7 @@
@SessionScoped
@StereoWithSessionScope
@StereoWithRequestScope
-public class ComponentDefaultScopeWithDifferentScopeSteros
+public class ComponentDefaultScopeWithDifferentScopeSteros implements Serializable
{
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java?rev=753326&r1=753325&r2=753326&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentDefaultScopeWithNonScopeStero.java Fri Mar 13 17:51:22 2009
@@ -13,6 +13,8 @@
*/
package org.apache.webbeans.test.component.exception.stero;
+import java.io.Serializable;
+
import javax.context.SessionScoped;
import javax.inject.Production;
@@ -21,7 +23,7 @@
@Production
@StereoWithNonScope
@SessionScoped
-public class ComponentDefaultScopeWithNonScopeStero
+public class ComponentDefaultScopeWithNonScopeStero implements Serializable
{
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java?rev=753326&r1=753325&r2=753326&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/stero/ComponentWithSameScopeSteros.java Fri Mar 13 17:51:22 2009
@@ -13,6 +13,8 @@
*/
package org.apache.webbeans.test.component.exception.stero;
+import java.io.Serializable;
+
import javax.inject.Production;
import org.apache.webbeans.test.sterotype.StereoWithSessionScope;
@@ -21,7 +23,7 @@
@Production
@StereoWithSessionScope
@StereoWithSessionScope2
-public class ComponentWithSameScopeSteros
+public class ComponentWithSameScopeSteros implements Serializable
{
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java?rev=753326&r1=753325&r2=753326&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java Fri Mar 13 17:51:22 2009
@@ -61,24 +61,11 @@
@Test
public void testComponentWithNonScopeStero()
{
- WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentWithNonScopeStero.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(Dependent.class, bean.getScopeType());
-
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
+ defineSimpleWebBean(ComponentWithNonScopeStero.class);
+ Bean<?> bean = getComponents().get(0);
- }
-
- Assert.assertNull(exc);
+ Assert.assertEquals(Dependent.class, bean.getScopeType());
}
@Test
@@ -86,45 +73,20 @@
{
WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentDefaultScopeWithNonScopeStero.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(SessionScoped.class, bean.getScopeType());
+ defineSimpleWebBean(ComponentDefaultScopeWithNonScopeStero.class);
+ Bean<?> bean = getComponents().get(0);
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
-
- }
-
- Assert.assertNull(exc);
+ Assert.assertEquals(SessionScoped.class, bean.getScopeType());
}
@Test
public void testComponentWithDefaultScopeStero()
{
- WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentWithDefaultScopeStero.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(RequestScoped.class, bean.getScopeType());
-
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
+ defineSimpleWebBean(ComponentWithDefaultScopeStero.class);
+ Bean<?> bean = getComponents().get(0);
- }
-
- Assert.assertNull(exc);
+ Assert.assertEquals(RequestScoped.class, bean.getScopeType());
}
@Test
@@ -150,70 +112,31 @@
@Test
public void testComponentWithoutScopeStero()
{
- WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentWithoutScopeStero.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(Dependent.class, bean.getScopeType());
-
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
-
- }
+ defineSimpleWebBean(ComponentWithoutScopeStero.class);
+ Bean<?> bean = getComponents().get(0);
- Assert.assertNull(exc);
+ Assert.assertEquals(Dependent.class, bean.getScopeType());
}
@Test
public void testComponentWithSameScopeSteros()
{
- WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentWithSameScopeSteros.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(SessionScoped.class, bean.getScopeType());
-
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
+ defineSimpleWebBean(ComponentWithSameScopeSteros.class);
+ Bean<?> bean = getComponents().get(0);
- }
-
- Assert.assertNull(exc);
+ Assert.assertEquals(SessionScoped.class, bean.getScopeType());
}
@Test
public void testComponentDefaultScopeWithDifferentScopeSteros()
{
- WebBeansConfigurationException exc = null;
clear();
- try
- {
- defineSimpleWebBean(ComponentDefaultScopeWithDifferentScopeSteros.class);
- Bean<?> bean = getComponents().get(0);
-
- Assert.assertEquals(SessionScoped.class, bean.getScopeType());
-
- }
- catch (WebBeansConfigurationException e)
- {
- System.out.println(e.getMessage());
- exc = e;
+ defineSimpleWebBean(ComponentDefaultScopeWithDifferentScopeSteros.class);
+ Bean<?> bean = getComponents().get(0);
- }
-
- Assert.assertNull(exc);
+ Assert.assertEquals(SessionScoped.class, bean.getScopeType());
}
@Test
@@ -228,9 +151,7 @@
}
catch (WebBeansConfigurationException e)
{
- System.out.println(e.getMessage());
exc = e;
-
}
Assert.assertNotNull(exc);