You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/03 19:51:07 UTC
svn commit: r525221 - in /incubator/tuscany/java/sca/modules/core: pom.xml
src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
Author: rfeng
Date: Tue Apr 3 10:51:06 2007
New Revision: 525221
URL: http://svn.apache.org/viewvc?view=rev&rev=525221
Log:
Fix a test case failure
Modified:
incubator/tuscany/java/sca/modules/core/pom.xml
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
Modified: incubator/tuscany/java/sca/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/pom.xml?view=diff&rev=525221&r1=525220&r2=525221
==============================================================================
--- incubator/tuscany/java/sca/modules/core/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core/pom.xml Tue Apr 3 10:51:06 2007
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
+ <artifactId>easymock</artifactId>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=525221&r1=525220&r2=525221
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Tue Apr 3 10:51:06 2007
@@ -18,12 +18,12 @@
*/
package org.apache.tuscany.core.component.scope;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.WorkContext;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.component.SimpleWorkContext;
import org.easymock.EasyMock;
/**
@@ -32,7 +32,7 @@
public class WorkContextTestCase extends TestCase {
public void testSetCurrentAtomicComponent() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
AtomicComponent component2 = EasyMock.createNiceMock(AtomicComponent.class);
ctx.setCurrentAtomicComponent(component);
@@ -42,19 +42,19 @@
}
public void testNonSetCurrentAtomicComponent() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
assertNull(ctx.getCurrentAtomicComponent());
}
public void testIndentifier() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
Object id = new Object();
ctx.setIdentifier(this, id);
assertEquals(id, ctx.getIdentifier(this));
}
public void testClearIndentifier() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
Object id = new Object();
ctx.setIdentifier(this, id);
ctx.clearIdentifier(this);
@@ -62,7 +62,7 @@
}
public void testClearIndentifiers() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
Object id = new Object();
Object id2 = new Object();
ctx.setIdentifier(id, id);
@@ -73,12 +73,12 @@
}
public void testClearNonExistentIndentifier() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
ctx.clearIdentifier(this);
}
public void testNullIndentifier() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
Object id = new Object();
ctx.setIdentifier(this, id);
ctx.clearIdentifier(null);
@@ -86,12 +86,12 @@
}
public void testNoIndentifier() throws Exception {
- WorkContext ctx = new SimpleWorkContext();
+ WorkContext ctx = new WorkContextImpl();
assertNull(ctx.getIdentifier(this));
}
public void testSetGetCorrelationId() {
- WorkContext context = new SimpleWorkContext();
+ WorkContext context = new WorkContextImpl();
context.setCorrelationId("msg-005");
assertEquals(context.getCorrelationId(), "msg-005");
context.setCorrelationId(null);
@@ -99,7 +99,7 @@
}
public void testSetGetCorrelationIdInNewThread() throws InterruptedException {
- WorkContext context = new SimpleWorkContext();
+ WorkContext context = new WorkContextImpl();
context.setCorrelationId("msg-005");
assertEquals(context.getCorrelationId(), "msg-005");
context.setIdentifier("TX", "002");
@@ -113,7 +113,7 @@
public void testCurrentAtomicComponentDoesNotPropagateToChildThread() throws InterruptedException {
// NOTE should behaviour be to propagate?
- WorkContext context = new SimpleWorkContext();
+ WorkContext context = new WorkContextImpl();
context.setCurrentAtomicComponent(EasyMock.createNiceMock(AtomicComponent.class));
TestCurrentAtomicComponentChildThread t = new TestCurrentAtomicComponentChildThread(context);
t.start();
@@ -136,7 +136,7 @@
try {
assertNull(context.getCorrelationId());
assertEquals("002", context.getIdentifier("TX"));
- } catch (AssertionError e) {
+ } catch (AssertionFailedError e) {
passed = false;
}
}
@@ -155,7 +155,7 @@
public void run() {
try {
assertNull(context.getCurrentAtomicComponent());
- } catch (AssertionError e) {
+ } catch (AssertionFailedError e) {
passed = false;
}
}
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java?view=diff&rev=525221&r1=525220&r2=525221
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java Tue Apr 3 10:51:06 2007
@@ -58,7 +58,7 @@
final CountDownLatch latch = new CountDownLatch(1);
RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
listener.onEvent(EasyMock.isA(StoreExpirationEvent.class));
- org.easymock.classextension.EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
+ EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
latch.countDown();
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org