svn commit: r517500 - in /incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope: BasicHttpSessionScopeTestCase.java HttpSessionScopeInitDestroyErrorTestCase.java

[jb...@apache.org]

Author: jboynes
Date: Mon Mar 12 19:32:17 2007
New Revision: 517500

URL: http://svn.apache.org/viewvc?view=rev&rev=517500
Log:
still more clean up of scope unit tests

Removed:
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInitDestroyErrorTestCase.java
Modified:
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java?view=diff&rev=517500&r1=517499&r2=517500
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java Mon Mar 12 19:32:17 2007
@@ -24,20 +24,25 @@
 import org.easymock.EasyMock;
 
 import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.event.HttpSessionStart;
+import org.apache.tuscany.core.component.event.HttpSessionEnd;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.TargetNotFoundException;
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.TargetDestructionException;
 import org.apache.tuscany.spi.model.Scope;
 
 /**
  * @version $$Rev$$ $$Date$$
  */
 public class BasicHttpSessionScopeTestCase extends TestCase {
+    private ScopeContainerMonitor monitor;
+    private ScopeContainer scopeContainer;
     private AtomicComponent component;
     private InstanceWrapper wrapper;
-    private ScopeContainer scopeContainer;
     private WorkContext workContext;
 
     public void testLifecycleManagement() throws Exception {
@@ -100,13 +105,30 @@
         EasyMock.verify(component, wrapper);
     }
 
+    public void testDestroyErrorMonitor() throws Exception {
+        TargetDestructionException ex = new TargetDestructionException("oops", "again");
+        monitor.destructionError(ex);
+        EasyMock.expect(component.createInstanceWrapper()).andReturn(wrapper);
+        wrapper.stop();
+        EasyMock.expectLastCall().andThrow(ex);
+        EasyMock.replay(component, wrapper, monitor);
+
+        Object id = new Object();
+        scopeContainer.onEvent(new HttpSessionStart(this, id));
+        workContext.setIdentifier(Scope.SESSION, id);
+        assertSame(wrapper, scopeContainer.getWrapper(component));
+        scopeContainer.onEvent(new HttpSessionEnd(this, id));
+        EasyMock.verify(component, wrapper, monitor);
+    }
+
     protected void setUp() throws Exception {
         super.setUp();
         component = EasyMock.createNiceMock(AtomicComponent.class);
         wrapper = EasyMock.createNiceMock(InstanceWrapper.class);
 
         workContext = new WorkContextImpl();
-        scopeContainer = new HttpSessionScopeContainer(workContext, null);
+        monitor = EasyMock.createMock(ScopeContainerMonitor.class);
+        scopeContainer = new HttpSessionScopeContainer(workContext, monitor);
         scopeContainer.start();
 
         component.addListener(scopeContainer);



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org