Author: objectiser
Date: 2008-07-07 06:13:28 -0400 (Mon, 07 Jul 2008)
New Revision: 123
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java
Removed:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestModelListener.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
Log:
Added unit tests related to ESBService plus some additional tests for each of the
actions.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -35,13 +35,12 @@
*/
public class DefaultESBService extends ModelObject implements ESBService {
+ protected static final String ROOT_PROPERTY = "root";
+ protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
+ protected static final String CONVERSATION_TYPE_PROPERTY =
"conversationType";
+ protected static final String SERVICE_NAME_PROPERTY = "serviceName";
+ private static final String SERVICE_ANNOTATION =
"org.jboss.soa.overlord.jbossesb.actions.Service";
private static final String SERVICE_ELEMENT = "service";
- private static final String SERVICE_NAME_PROPERTY = "serviceName";
- private static final String ROOT_PROPERTY = "root";
- private static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
- private static final String CONVERSATION_TYPE_PROPERTY = "conversationType";
- private static final String ACTION_PACKAGE =
"org.jboss.soa.overlord.jbossesb.actions.";
- private static final String CREATE_SESSION_ACTION_CLASS =
"org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction";
private static final String RETRIEVE_SESSION_ACTION_CLASS =
"org.jboss.soa.overlord.jbossesb.actions.RetrieveSessionAction";
private static final String ACTION_ELEMENT = "action";
private static final String ACTIONS_ELEMENT = "actions";
@@ -206,13 +205,13 @@
i < annotations.length; i++) {
try {
if (annotations[i].annotationType().getName().equals(
- "org.jboss.soa.overlord.jbossesb.actions.Service")) {
+ SERVICE_ANNOTATION)) {
ret = annotations[i];
}
} catch(Throwable ex) {
- // Ignore
- System.err.println("ANNOTATION: "+annotations[i].annotationType());
- ex.printStackTrace();
+ logger.log(java.util.logging.Level.SEVERE,
+ "ANNOTATION: "+
+ annotations[i].annotationType(), ex);
}
}
@@ -251,8 +250,8 @@
boolean ret=false;
ESBAction action=getFirstSessionBasedAction();
- if (action != null && action.getActionClass() != null) {
- if (action.getActionClass().equals(CREATE_SESSION_ACTION_CLASS)) {
+ if (action != null) {
+ if (action.isCreateSession()) {
String bool=action.getPropertyValue(ROOT_PROPERTY);
if (bool != null) {
ret = bool.equalsIgnoreCase("true");
@@ -265,7 +264,8 @@
if (annotation != null) {
try {
java.lang.reflect.Method method=
- annotation.getClass().getMethod("root", (Class<?>[])null);
+ annotation.getClass().getMethod(ROOT_PROPERTY,
+ (Class<?>[])null);
Object val=method.invoke(annotation, (Object[])null);
@@ -294,10 +294,8 @@
boolean ret=false;
ESBAction action=getFirstSessionBasedAction();
- if (action != null && action.getActionClass() != null) {
- if (action.getActionClass().equals(CREATE_SESSION_ACTION_CLASS)) {
- ret = true;
- }
+ if (action != null) {
+ ret = action.isCreateSession();
}
return(ret);
@@ -334,8 +332,8 @@
ESBAction action=getFirstSessionBasedAction();
if (action != null) {
- if (action.getActionClass().equals(CREATE_SESSION_ACTION_CLASS) ||
- action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS)) {
+ if (action.isCreateSession() || (action.getActionClass() != null &&
+ action.getActionClass().equals(RETRIEVE_SESSION_ACTION_CLASS))) {
ret = action.getPropertyValue(SERVICE_NAME_PROPERTY);
if (ret == null) {
@@ -377,7 +375,7 @@
ESBAction action=getFirstSessionBasedAction();
if (action != null) {
- if (action.getActionClass().equals(CREATE_SESSION_ACTION_CLASS)) {
+ if (action.isCreateSession()) {
ret = action.getPropertyValue(CONVERSATION_TYPE_PROPERTY);
if (ret == null) {
@@ -389,7 +387,8 @@
if (annotation != null) {
try {
java.lang.reflect.Method method=
- annotation.getClass().getMethod("conversationType",
(Class<?>[])null);
+ annotation.getClass().getMethod(CONVERSATION_TYPE_PROPERTY,
+ (Class<?>[])null);
Object val=method.invoke(annotation, (Object[])null);
@@ -418,8 +417,7 @@
String ret=null;
ESBAction action=getFirstSessionBasedAction();
- if (action != null &&
- action.getActionClass().startsWith(ACTION_PACKAGE)) {
+ if (action != null) {
ret = action.getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBAction.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -56,6 +56,14 @@
public boolean isSessionBased();
/**
+ * This method determines whether the ESB action represents
+ * a CreateSessionAction.
+ *
+ * @return Whether the action is a CreateSessionAction
+ */
+ public boolean isCreateSession();
+
+ /**
* This method indicates whether this action performs another
* sub-conversation.
*
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -201,6 +201,16 @@
}
/**
+ * This method determines whether the ESB action represents
+ * a CreateSessionAction.
+ *
+ * @return Whether the action is a CreateSessionAction
+ */
+ public boolean isCreateSession() {
+ return(false);
+ }
+
+ /**
* This method indicates whether this action performs another
* sub-conversation.
*
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -29,8 +29,6 @@
*/
public class CreateSessionAction extends AbstractESBAction {
- private static final String CONVERSATION_TYPE = "conversationType";
-
/**
* The constructor for the action.
*
@@ -44,6 +42,16 @@
}
/**
+ * This method determines whether the ESB action represents
+ * a CreateSessionAction.
+ *
+ * @return Whether the action is a CreateSessionAction
+ */
+ public boolean isCreateSession() {
+ return(true);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/DefaultESBServiceTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -0,0 +1,219 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.jbossesb.model;
+
+import junit.framework.TestCase;
+
+public class DefaultESBServiceTest extends TestCase {
+
+ public void testValidateSessionClassRequired() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ TestModelListener l=new TestModelListener();
+
+ l.addExpectedError(org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "_NOT_SPECIFIED_SESSION_CLASS",
+ new String[]{}));
+
+ service.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testValidateSessionClassNotRequired() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestModelListener l=new TestModelListener();
+
+ service.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
+ public void testIsLoop() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setLoop(true);
+
+ service.getActions().add(act1);
+
+ if (service.isLoop() == false) {
+ fail("Service should be loop");
+ }
+ }
+
+ public void testIsLoopFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ if (service.isLoop()) {
+ fail("Service is not a loop");
+ }
+ }
+
+ public void testIsRoot() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.ROOT_PROPERTY, "true");
+
+ service.getActions().add(act1);
+
+ if (service.isRoot() == false) {
+ fail("Service should be root");
+ }
+ }
+
+ public void testIsRootFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isRoot()) {
+ fail("Service should NOT be root");
+ }
+ }
+
+ public void testIsSessionBased() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+
+ service.getActions().add(act1);
+
+ if (service.isSessionBased() == false) {
+ fail("Service should be SessionBased");
+ }
+ }
+
+ public void testIsSessionBasedFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isSessionBased()) {
+ fail("Service should NOT be SessionBased");
+ }
+ }
+
+ public void testIsCreateSession() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+
+ service.getActions().add(act1);
+
+ if (service.isCreateSession() == false) {
+ fail("Service should be 'create session'");
+ }
+ }
+
+ public void testIsCreateSessionFalse() {
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+
+ service.getActions().add(act1);
+
+ if (service.isCreateSession()) {
+ fail("Service should NOT be 'create session'");
+ }
+ }
+
+ public void testGetServiceName() {
+ String name="serviceName1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.SERVICE_NAME_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getServiceName().equals(name) == false) {
+ fail("Service name '"+service.getServiceName()+
+ "' invalid, expecting: "+name);
+ }
+ }
+
+ public void testGetConversationType() {
+ String name="convType1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setCreateSession(true);
+ act1.setPropertyValue(DefaultESBService.CONVERSATION_TYPE_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getConversationType().equals(name) == false) {
+ fail("Conversation type '"+service.getConversationType()+
+ "' invalid, expecting: "+name);
+ }
+ }
+
+ public void testGetSessionName() {
+ String name="session1";
+
+ DefaultESBService service=new DefaultESBService(null, null);
+
+ TestESBAction act1=new TestESBAction();
+ act1.setSessionBased(true);
+ act1.setPropertyValue(DefaultESBService.BUSINESS_OBJECT_TYPE_PROPERTY,
+ name);
+
+ service.getActions().add(act1);
+
+ if (service.getSessionName().equals(name) == false) {
+ fail("Session name '"+service.getSessionName()+
+ "' invalid, expecting: "+name);
+ }
+ }
+}
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestESBAction.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.jbossesb.model;
+
+import java.util.List;
+
+import org.scribble.model.Activity;
+import org.scribble.model.ModelListener;
+import org.w3c.dom.Element;
+
+public class TestESBAction implements ESBAction {
+
+ public void convert(List<Activity> activities, ConversionContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Element getAction() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getActionClass() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getPropertyValue(String property) {
+ return(m_property.get(property));
+ }
+
+ public void setPropertyValue(String property, String value) {
+ m_property.put(property, value);
+ }
+
+ public void initializeLinks() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean isLoop() {
+ return(m_loop);
+ }
+
+ public void setLoop(boolean bool) {
+ m_loop = bool;
+ }
+
+ public boolean isPerform() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean isSessionBased() {
+ return(m_sessionBased);
+ }
+
+ public void setSessionBased(boolean bool) {
+ m_sessionBased = bool;
+ }
+
+ public boolean isCreateSession() {
+ return(m_createSession);
+ }
+
+ public void setCreateSession(boolean bool) {
+ m_createSession = bool;
+ }
+
+ public void validate(ModelListener l) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private boolean m_sessionBased=false;
+ private boolean m_loop=false;
+ private boolean m_createSession=false;
+ private java.util.Map<String,String> m_property=new java.util.Hashtable<String,
String>();
+}
Copied:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java
(from rev 122,
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestModelListener.java)
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/TestModelListener.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.tools.overlord.jbossesb.model;
+
+import java.util.Properties;
+
+import org.scribble.model.ModelObject;
+
+public class TestModelListener implements org.scribble.model.ModelListener {
+
+ public void error(ModelObject modelObject, String mesg, Properties props) {
+ reported(mesg);
+ }
+
+ public void warning(ModelObject modelObject, String mesg, Properties props) {
+ reported(mesg);
+ }
+
+ protected void reported(String mesg) {
+ if (mesg != null) {
+
+ // Check if in the list of messages to be
+ // detected
+ if (m_errorsToDetect.contains(mesg)) {
+ m_errorsToDetect.remove(mesg);
+ } else {
+ m_unexpectedErrors.add(mesg);
+ }
+ }
+ }
+
+ public void addExpectedError(String mesg) {
+ m_errorsToDetect.add(mesg);
+ }
+
+ public boolean isValid() {
+ // If there are no more errors to detect, and no
+ // unexpected errors have been reported, then
+ // the expression has been validated as expected
+ return(m_errorsToDetect.size() == 0 &&
+ m_unexpectedErrors.size() == 0);
+ }
+
+ public String invalidMessage() {
+ String ret="\r\n";
+
+ if (m_errorsToDetect.size() > 0) {
+ ret += "Errors not detected:\r\n";
+
+ for (int i=0; i < m_errorsToDetect.size(); i++) {
+ ret += m_errorsToDetect.get(i)+"\r\n";
+ }
+ }
+
+ if (m_unexpectedErrors.size() > 0) {
+ ret += "Unexpected Errors:\r\n";
+
+ for (int i=0; i < m_unexpectedErrors.size(); i++) {
+ ret += m_unexpectedErrors.get(i)+"\r\n";
+ }
+ }
+
+ return(ret);
+ }
+
+ private java.util.List<String> m_errorsToDetect=new
java.util.Vector<String>();
+ private java.util.List<String> m_unexpectedErrors=new
java.util.Vector<String>();
+ private java.util.List<String> m_messages=new java.util.Vector<String>();
+}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,8 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+
import junit.framework.TestCase;
public class CreateSessionActionTest extends TestCase {
@@ -120,4 +122,24 @@
fail(l.invalidMessage());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ CreateSessionAction action=new CreateSessionAction(service, null);
+
+ if (action.isCreateSession() == false) {
+ fail("Action is not flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ CreateSessionAction action=new CreateSessionAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -18,6 +18,8 @@
package org.jboss.tools.overlord.jbossesb.model.actions;
import junit.framework.TestCase;
+
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
import org.scribble.model.*;
import org.scribble.conversation.model.*;
@@ -449,4 +451,24 @@
fail("Else block should have be empty");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ IfAction action=new IfAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ IfAction action=new IfAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,8 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+
import junit.framework.TestCase;
public class MessageRouterActionTest extends TestCase {
@@ -244,4 +246,24 @@
fail(l.invalidMessage());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ MessageRouterAction action=new MessageRouterAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ MessageRouterAction action=new MessageRouterAction(service, null);
+
+ if (action.isSessionBased() == true) {
+ fail("Action is flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -451,4 +451,24 @@
fail("Activity after parallel should be act3");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ ParallelAction action=new ParallelAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ ParallelAction action=new ParallelAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,7 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
import org.scribble.conversation.model.*;
import org.scribble.model.Activity;
@@ -338,4 +339,24 @@
fail("Subsequent activity after run was not act2");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ PerformAction action=new PerformAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ PerformAction action=new PerformAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -263,4 +263,24 @@
fail("Local type should be '"+lp+"', but found:
"+ref.getLocalpart());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ ReceiveMessageAction action=new ReceiveMessageAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,8 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+
import junit.framework.TestCase;
public class RetrieveSessionActionTest extends TestCase {
@@ -100,4 +102,24 @@
fail(l.invalidMessage());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ RetrieveSessionAction action=new RetrieveSessionAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ RetrieveSessionAction action=new RetrieveSessionAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -233,4 +233,24 @@
fail("Should be no activities, but found: "+activities.size());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ ScheduleStateAction action=new ScheduleStateAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ ScheduleStateAction action=new ScheduleStateAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -18,6 +18,7 @@
package org.jboss.tools.overlord.jbossesb.model.actions;
import org.jboss.tools.overlord.jbossesb.model.DefaultConversionContext;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
import org.scribble.model.Activity;
import org.scribble.model.Interaction;
import org.scribble.model.TypeReference;
@@ -336,4 +337,24 @@
fail("Local type should be '"+lp+"', but found:
"+ref.getLocalpart());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SendMessageAction action=new SendMessageAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SendMessageAction action=new SendMessageAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,8 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+
import junit.framework.TestCase;
public class SetMessageActionTest extends TestCase {
@@ -47,4 +49,24 @@
fail(l.invalidMessage());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SetMessageAction action=new SetMessageAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SetMessageAction action=new SetMessageAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,8 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
+
import junit.framework.TestCase;
public class SetStateActionTest extends TestCase {
@@ -206,4 +208,24 @@
fail(l.invalidMessage());
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SetStateAction action=new SetStateAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SetStateAction action=new SetStateAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,7 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
import org.scribble.conversation.model.If;
import org.scribble.model.Activity;
@@ -355,4 +356,24 @@
fail("Else block should not be defined");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ SwitchAction action=new SwitchAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ SwitchAction action=new SwitchAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Deleted:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestModelListener.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestModelListener.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/TestModelListener.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.tools.overlord.jbossesb.model.actions;
-
-import java.util.Properties;
-
-import org.scribble.model.ModelObject;
-
-public class TestModelListener implements org.scribble.model.ModelListener {
-
- public void error(ModelObject modelObject, String mesg, Properties props) {
- reported(mesg);
- }
-
- public void warning(ModelObject modelObject, String mesg, Properties props) {
- reported(mesg);
- }
-
- protected void reported(String mesg) {
- if (mesg != null) {
-
- // Check if in the list of messages to be
- // detected
- if (m_errorsToDetect.contains(mesg)) {
- m_errorsToDetect.remove(mesg);
- } else {
- m_unexpectedErrors.add(mesg);
- }
- }
- }
-
- public void addExpectedError(String mesg) {
- m_errorsToDetect.add(mesg);
- }
-
- public boolean isValid() {
- // If there are no more errors to detect, and no
- // unexpected errors have been reported, then
- // the expression has been validated as expected
- return(m_errorsToDetect.size() == 0 &&
- m_unexpectedErrors.size() == 0);
- }
-
- public String invalidMessage() {
- String ret="\r\n";
-
- if (m_errorsToDetect.size() > 0) {
- ret += "Errors not detected:\r\n";
-
- for (int i=0; i < m_errorsToDetect.size(); i++) {
- ret += m_errorsToDetect.get(i)+"\r\n";
- }
- }
-
- if (m_unexpectedErrors.size() > 0) {
- ret += "Unexpected Errors:\r\n";
-
- for (int i=0; i < m_unexpectedErrors.size(); i++) {
- ret += m_unexpectedErrors.get(i)+"\r\n";
- }
- }
-
- return(ret);
- }
-
- private java.util.List<String> m_errorsToDetect=new
java.util.Vector<String>();
- private java.util.List<String> m_unexpectedErrors=new
java.util.Vector<String>();
- private java.util.List<String> m_messages=new java.util.Vector<String>();
-}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -17,6 +17,7 @@
*/
package org.jboss.tools.overlord.jbossesb.model.actions;
+import org.jboss.tools.overlord.jbossesb.model.TestModelListener;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
@@ -450,4 +451,24 @@
fail("Third conditional block should have 1 activity = act3");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ WhenAction action=new WhenAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ WhenAction action=new WhenAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-04
14:48:55 UTC (rev 122)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-07
10:13:28 UTC (rev 123)
@@ -451,4 +451,24 @@
fail("Activity following while should be act2");
}
}
+
+ public void testIsCreateSession() {
+ TestESBService service=new TestESBService();
+
+ WhileAction action=new WhileAction(service, null);
+
+ if (action.isCreateSession() == true) {
+ fail("Action is flagged as a 'CreateSession'");
+ }
+ }
+
+ public void testIsSessionBased() {
+ TestESBService service=new TestESBService();
+
+ WhileAction action=new WhileAction(service, null);
+
+ if (action.isSessionBased() == false) {
+ fail("Action is not flagged as a 'SessionBased'");
+ }
+ }
}