Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 61219 invoked from network); 4 Jan 2009 23:34:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jan 2009 23:34:29 -0000 Received: (qmail 39780 invoked by uid 500); 4 Jan 2009 23:34:28 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 39725 invoked by uid 500); 4 Jan 2009 23:34:28 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 39716 invoked by uid 99); 4 Jan 2009 23:34:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jan 2009 15:34:27 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jan 2009 23:34:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD88323888A6; Sun, 4 Jan 2009 15:34:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731386 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml: ./ env/jexl/ invoke/ io/ issues/ model/ Date: Sun, 04 Jan 2009 23:34:06 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090104233406.CD88323888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Sun Jan 4 15:34:05 2009 New Revision: 731386 URL: http://svn.apache.org/viewvc?rev=731386&view=rev Log: Prepare for changes to SCXMLTestHelper Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java Sun Jan 4 15:34:05 2009 @@ -56,7 +56,7 @@ * Set up instance variables required by this test case. */ @Override - public void setUp() { + public void setUp() throws Exception { datamodel03jexl = this.getClass().getClassLoader(). getResource("org/apache/commons/scxml/env/jexl/datamodel-03.xml"); datamodel03jsp = this.getClass().getClassLoader(). Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java Sun Jan 4 15:34:05 2009 @@ -155,7 +155,7 @@ checkMicrowave02Sample(); } - public void testSCXMLExecutorPrefix01Sample() { + public void testSCXMLExecutorPrefix01Sample() throws Exception { exec = SCXMLTestHelper.getExecutor(prefix01); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java Sun Jan 4 15:34:05 2009 @@ -88,7 +88,7 @@ /** * Test the implementation */ - public void testTieBreaker01() { + public void testTieBreaker01() throws Exception { exec = SCXMLTestHelper.getExecutor(tiebreaker01); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); @@ -99,7 +99,7 @@ assertEquals("twenty", currentStates.iterator().next().getId()); } - public void testTieBreaker02() { + public void testTieBreaker02() throws Exception { exec = SCXMLTestHelper.getExecutor(tiebreaker02); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); @@ -110,7 +110,7 @@ assertEquals("thirty", currentStates.iterator().next().getId()); } - public void testTieBreaker03() { + public void testTieBreaker03() throws Exception { exec = SCXMLTestHelper.getExecutor(tiebreaker03); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); @@ -121,7 +121,7 @@ assertEquals("forty", currentStates.iterator().next().getId()); } - public void testTieBreaker04() { + public void testTieBreaker04() throws Exception { exec = SCXMLTestHelper.getExecutor(tiebreaker04); assertNotNull(exec); Set currentStates = SCXMLTestHelper.fireEvent(exec, "event_2"); @@ -130,7 +130,7 @@ assertEquals(1, currentStates.size()); } - public void testTieBreaker05() { + public void testTieBreaker05() throws Exception { exec = SCXMLTestHelper.getExecutor(tiebreaker05); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); @@ -149,7 +149,7 @@ } } - public void testTieBreaker06() { + public void testTieBreaker06() throws Exception { exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(tiebreaker06)); assertNotNull(exec); Set currentStates = exec.getCurrentStatus().getStates(); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java Sun Jan 4 15:34:05 2009 @@ -62,7 +62,7 @@ staticmethod = null; } - public void testJexlStaticMethodInvocation() { + public void testJexlStaticMethodInvocation() throws Exception { Context jc = new JexlContext(); jc.set("System", System.class); SCXMLExecutor exec = SCXMLTestHelper.getExecutor(staticmethod, Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeParamNameTest.java Sun Jan 4 15:34:05 2009 @@ -58,7 +58,7 @@ static Map lastParams; @Override - public void setUp() { + public void setUp() throws Exception { invoker04 = this.getClass().getClassLoader(). getResource("org/apache/commons/scxml/invoke/invoker-04.xml"); exec = SCXMLTestHelper.getExecutor(invoker04, Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLParserTest.java Sun Jan 4 15:34:05 2009 @@ -91,49 +91,49 @@ /** * Test the implementation */ - public void testSCXMLParserMicrowave01Sample() { + public void testSCXMLParserMicrowave01Sample() throws Exception { scxml = SCXMLTestHelper.parse(microwave01); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserMicrowave02Sample() { + public void testSCXMLParserMicrowave02Sample() throws Exception { scxml = SCXMLTestHelper.parse(microwave02); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserMicrowave03Sample() { + public void testSCXMLParserMicrowave03Sample() throws Exception { scxml = SCXMLTestHelper.parse(microwave03); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserMicrowave04Sample() { + public void testSCXMLParserMicrowave04Sample() throws Exception { scxml = SCXMLTestHelper.parse(microwave04); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserTransitions01Sample() { + public void testSCXMLParserTransitions01Sample() throws Exception { scxml = SCXMLTestHelper.parse(transitions01); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserPrefix01Sample() { + public void testSCXMLParserPrefix01Sample() throws Exception { scxml = SCXMLTestHelper.parse(prefix01); assertNotNull(scxml); scxmlAsString = serialize(scxml); assertNotNull(scxmlAsString); } - public void testSCXMLParserSend01Sample() { + public void testSCXMLParserSend01Sample() throws Exception { // Digest scxml = SCXMLTestHelper.parse(send01); State ten = (State) scxml.getInitialTarget(); @@ -156,7 +156,7 @@ */ } - public void testSCXMLParserInitialAttr() { + public void testSCXMLParserInitialAttr() throws Exception { scxml = SCXMLTestHelper.parse(scxmlinitialattr); assertNotNull(scxml); scxmlAsString = serialize(scxml); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java Sun Jan 4 15:34:05 2009 @@ -80,7 +80,7 @@ /** * Test the implementation */ - public void testRecursiveSrcInclude() { + public void testRecursiveSrcInclude() throws Exception { scxml = SCXMLTestHelper.parse(src01); assertNotNull(scxml); exec = SCXMLTestHelper.getExecutor(scxml); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java Sun Jan 4 15:34:05 2009 @@ -69,7 +69,7 @@ exec = null; } - public void test01issue62() { + public void test01issue62() throws Exception { exec = SCXMLTestHelper.getExecutor(test01); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); @@ -77,17 +77,17 @@ SCXMLTestHelper.assertPostTriggerState(exec, "foo", "s1.1"); } - public void test02issue62() { + public void test02issue62() throws Exception { exec = SCXMLTestHelper.getExecutor(test02); fragmenttest(); } - public void test03issue62() { + public void test03issue62() throws Exception { exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(test03)); fragmenttest(); } - private void fragmenttest() { + private void fragmenttest() throws Exception { Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); assertEquals("s1", currentStates.iterator().next().getId()); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java Sun Jan 4 15:34:05 2009 @@ -65,12 +65,12 @@ exec = null; } - public void test01issue64() { + public void test01issue64() throws Exception { exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(works)); SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end"); } - public void test02issue64() { + public void test02issue64() throws Exception { exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(fails)); SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end"); } Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ActionsTest.java Sun Jan 4 15:34:05 2009 @@ -88,22 +88,22 @@ /** * Test the implementation */ - public void testStateActions() { + public void testStateActions() throws Exception { SCXML scxml = SCXMLTestHelper.parse(actionsSample01); runTest(scxml); } - public void testParallelActions() { + public void testParallelActions() throws Exception { SCXML scxml = SCXMLTestHelper.parse(actionsSample02); runTest(scxml); } - public void testInitialActions() { + public void testInitialActions() throws Exception { SCXML scxml = SCXMLTestHelper.parse(actionsSample03); runTest(scxml); } - private void runTest(SCXML scxml) { + private void runTest(SCXML scxml) throws Exception { exec = SCXMLTestHelper.getExecutor(scxml, ctx, evaluator); ELContext ctx = (ELContext) SCXMLTestHelper.lookupContext(exec, "actionsTest"); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java Sun Jan 4 15:34:05 2009 @@ -71,7 +71,7 @@ /** * Test the implementation */ - public void testAssignSrc() { + public void testAssignSrc() throws Exception { exec = SCXMLTestHelper.getExecutor(assign01); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); @@ -79,7 +79,7 @@ assertTrue(exec.getCurrentStatus().isFinal()); } - public void testAssignDeep() { + public void testAssignDeep() throws Exception { exec = SCXMLTestHelper.getExecutor(assign02); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java Sun Jan 4 15:34:05 2009 @@ -128,7 +128,7 @@ } // Hello World example using the SCXML action - public void testHelloWorld() { + public void testHelloWorld() throws Exception { // (1) Get a SCXMLExecutor exec = SCXMLTestHelper.getExecutor(hello01); // (2) Single, final state @@ -138,7 +138,7 @@ } // Hello World example using a custom action - public void testCustomActionHelloWorld() { + public void testCustomActionHelloWorld() throws Exception { // (1) Form a list of custom actions defined in the SCXML // document (and any included documents via "src" attributes) CustomAction ca1 = @@ -164,7 +164,7 @@ // Hello World example using custom action // as part of an external state source (src attribute) - public void testCustomActionExternalSrcHelloWorld() { + public void testCustomActionExternalSrcHelloWorld() throws Exception { // (1) Form a list of custom actions defined in the SCXML // document (and any included documents via "src" attributes) CustomAction ca = @@ -183,7 +183,7 @@ // Hello World example using custom action // (overriding SCXML local name "send") - public void testCustomActionOverrideLocalName() { + public void testCustomActionOverrideLocalName() throws Exception { // (1) List of custom actions, use same local name as SCXML action CustomAction ca = new CustomAction("http://my.custom-actions.domain/CUSTOM", @@ -207,7 +207,7 @@ // Hello World example using custom action that generates an // event which has the payload examined with JEXL expressions - public void testCustomActionEventPayloadHelloWorldJexl() { + public void testCustomActionEventPayloadHelloWorldJexl() throws Exception { // (1) Form a list of custom actions defined in the SCXML // document (and any included documents via "src" attributes) CustomAction ca = @@ -239,7 +239,7 @@ // Hello World example using custom action that generates an // event which has the payload examined with EL expressions - public void testCustomActionEventPayloadHelloWorldEL() { + public void testCustomActionEventPayloadHelloWorldEL() throws Exception { // (1) Form a list of custom actions defined in the SCXML // document (and any included documents via "src" attributes) CustomAction ca = Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java Sun Jan 4 15:34:05 2009 @@ -116,7 +116,7 @@ runtest(); } - public void testDatamodel04Jexl() { + public void testDatamodel04Jexl() throws Exception { exec01 = SCXMLTestHelper.getExecutor(datamodel04jexl, new JexlContext(), new JexlEvaluator()); assertNotNull(exec01); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java Sun Jan 4 15:34:05 2009 @@ -98,7 +98,7 @@ runHistoryFlow(); } - public void testHistoryDefaults01() { + public void testHistoryDefaults01() throws Exception { exec = SCXMLTestHelper.getExecutor(defaults01); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); @@ -129,7 +129,7 @@ next()).getId()); } - private String pauseAndResume() { + private String pauseAndResume() throws Exception { Set currentStates = SCXMLTestHelper.fireEvent(exec, "flow.pause"); assertEquals(1, currentStates.size()); assertEquals("interrupted", currentStates.iterator().next().getId()); @@ -140,7 +140,7 @@ return ((State)currentStates.iterator().next()).getId(); } - private String nextPhase() { + private String nextPhase() throws Exception { Set currentStates = SCXMLTestHelper.fireEvent(exec, "phase.done"); assertEquals(1, currentStates.size()); return ((State)currentStates.iterator().next()).getId(); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ScriptTest.java Sun Jan 4 15:34:05 2009 @@ -67,14 +67,14 @@ /** * Test JEXL script execution. */ - public void testJexlScriptExecution() { + public void testJexlScriptExecution() throws Exception { SCXMLExecutor exec = SCXMLTestHelper.getExecutor(script01jexl); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); assertEquals("end", currentStates.iterator().next().getId()); } - public void testJavaScriptExecution() { + public void testJavaScriptExecution() throws Exception { SCXMLExecutor exec = SCXMLTestHelper.getExecutor(script01js, new JSEvaluator()); Set currentStates = exec.getCurrentStatus().getStates(); assertEquals(1, currentStates.size()); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java Sun Jan 4 15:34:05 2009 @@ -172,7 +172,7 @@ assertFalse(state.isRegion()); } - public void testInitialAttribute() { + public void testInitialAttribute() throws Exception { SCXML scxml = SCXMLTestHelper.parse(state01); assertNotNull(scxml); exec = SCXMLTestHelper.getExecutor(scxml); Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java?rev=731386&r1=731385&r2=731386&view=diff ============================================================================== --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java Sun Jan 4 15:34:05 2009 @@ -58,7 +58,7 @@ * Set up instance variables required by this test case. */ @Override - public void setUp() { + public void setUp() throws Exception { stateless01jexl = this.getClass().getClassLoader(). getResource("org/apache/commons/scxml/env/jexl/stateless-01.xml"); stateless01jsp = this.getClass().getClassLoader().