Author: rahul
Date: Sat Mar 24 10:46:13 2007
New Revision: 522065
URL: http://svn.apache.org/viewvc?view=rev&rev=522065
Log:
Add utility methods for test cases which use the new (and yet incomplete)
parser.
Modified:
jakarta/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Modified:
jakarta/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java?view=diff&rev=522065&r1=522064&r2=522065
==============================================================================
---
jakarta/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
(original)
+++
jakarta/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Sat Mar 24 10:46:13 2007
@@ -36,6 +36,7 @@
import org.apache.commons.scxml.env.jexl.JexlContext;
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
import org.apache.commons.scxml.io.SCXMLDigester;
+import org.apache.commons.scxml.io.SCXMLParser;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.TransitionTarget;
import org.xml.sax.ErrorHandler;
@@ -83,6 +84,34 @@
return roundtrip;
}
+ public static SCXML parse(final URL url) {
+ return parse(url, null, null);
+ }
+
+ public static SCXML parse(final URL url, final List customActions) {
+ return parse(url, null, customActions);
+ }
+
+ public static SCXML parse(final URL url, final ErrorHandler errHandler) {
+ return parse(url, errHandler, null);
+ }
+
+ public static SCXML parse(final URL url, final ErrorHandler errHandler,
+ final List customActions) {
+ Assert.assertNotNull(url);
+ // SAX ErrorHandler may be null
+ SCXML scxml = null;
+ try {
+ scxml = SCXMLParser.parse(url, errHandler, customActions);
+ } catch (Exception e) {
+ Log log = LogFactory.getLog(SCXMLTestHelper.class);
+ log.error(e.getMessage(), e);
+ Assert.fail(e.getMessage());
+ }
+ Assert.assertNotNull(scxml);
+ SCXML roundtrip = testModelSerializability(scxml);
+ return roundtrip;
+ }
public static SCXMLExecutor getExecutor(final URL url) {
SCXML scxml = digest(url);
Evaluator evaluator = new JexlEvaluator();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
