You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2007/10/10 00:56:34 UTC
svn commit: r583316 - in
/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test:
InsertObjectTest.java SelectObjectTest.java
Author: vanto
Date: Tue Oct 9 15:56:30 2007
New Revision: 583316
URL: http://svn.apache.org/viewvc?rev=583316&view=rev
Log:
compiles again...
Modified:
ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
Modified: ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java?rev=583316&r1=583315&r2=583316&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java (original)
+++ ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java Tue Oct 9 15:56:30 2007
@@ -32,6 +32,8 @@
import org.apache.ode.bpel.dao.ScopeDAO;
import org.apache.ode.bpel.dao.ScopeStateEnum;
import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
+import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.utils.DOMUtils;
@@ -98,11 +100,11 @@
}
private MessageExchangeDAO createMessageExchange(ProcessDAO p, ProcessInstanceDAO pi, PartnerLinkDAO pl ) throws SAXException, IOException {
- MessageExchangeDAO me = pi.getConnection().createMessageExchange('0');
+ MessageExchangeDAO me = pi.getConnection().createMessageExchange("testId", MessageExchangeDAO.DIR_BPEL_INVOKES_PARTNERROLE);
me.setCallee(new QName(TEST_NS,"testCallee"));
me.setChannel("testChannel");
- me.setCorrelationId("testCorrelationId");
+ //me.setCorrelationId("testCorrelationId");
me.setCorrelationStatus("testCorrelationStatus");
me.setEPR(DOMUtils.stringToDOM("<testEPR>EPR</testEPR>"));
me.setFault(new QName("testFault"));
@@ -111,14 +113,14 @@
me.setOperation("testOperation");
me.setPartnerLink(pl);
me.setPartnerLinkModelId(1);
- me.setPattern("testPattern");
+ me.setPattern(MessageExchangePattern.UNKNOWN);
me.setPortType(new QName(TEST_NS,"testPortType"));
me.setProcess(p);
me.setProperty("testProp1Key", "testProp1");
me.setProperty("testProp2Key", "testProp2");
me.setRequest(createMessage(me,"testRequest"));
me.setResponse(createMessage(me,"testResponse"));
- me.setStatus("testStatus");
+ me.setStatus(Status.NEW);
return me;
}
Modified: ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java?rev=583316&r1=583315&r2=583316&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java (original)
+++ ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java Tue Oct 9 15:56:30 2007
@@ -35,6 +35,8 @@
import org.apache.ode.bpel.dao.ScopeDAO;
import org.apache.ode.bpel.dao.ScopeStateEnum;
import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
+import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.utils.GUID;
@@ -200,11 +202,12 @@
MessageExchangeDAO me = ic.dequeueMessage(key1);
assertNotNull(me);
assertEquals(me.getCallee(),new QName(TEST_NS,"testCallee"));
- assertEquals(me.getPropagateTransactionFlag(),false);
+ //XXX assertEquals(me.getPropagateTransactionFlag(),false);
assertEquals(me.getChannel(),"testChannel");
- assertEquals(me.getCorrelationId(),"testCorrelationId");
+ //XXX assertEquals(me.getCorrelationId(),"testCorrelationId");
//assertNotNull(me.getCreateTime());
- assertEquals(me.getDirection(),'0');
+ assertEquals(me.getDirection(), MessageExchangeDAO.DIR_BPEL_INVOKES_PARTNERROLE);
+ assertEquals(me.getMessageExchangeId(), "testId");
assertNotNull(me.getEPR());
assertEquals(me.getFault().toString(),"testFault");
assertEquals(me.getFaultExplanation(),"testFaultExplanation");
@@ -212,18 +215,18 @@
assertEquals(me.getOperation(),"testOperation");
assertNotNull(me.getPartnerLink());
assertEquals(me.getPartnerLinkModelId(),1);
- assertEquals(me.getPattern(),"testPattern");
+ assertEquals(me.getPattern(), MessageExchangePattern.UNKNOWN);
assertEquals(me.getPortType(),new QName(TEST_NS,"testPortType"));
assertSame(me.getProcess(),p);
assertEquals(me.getProperty("testProp1Key"),"testProp1");
assertNotNull(me.getRequest());
assertNotNull(me.getResponse());
- assertEquals(me.getStatus(),"testStatus");
+ assertEquals(me.getStatus(), Status.NEW);
// Assert MessageDAO
MessageDAO m = me.getRequest();
assertNotNull(m.getData());
- assertSame(m.getMessageExchange(),me);
+ //XXX assertSame(m.getMessageExchange(),me);
assertEquals(m.getType(),new QName(TEST_NS,"testRequest"));