[Smartfrog-checkins] SF.net SVN: smartfrog: [4807] trunk/core/testharness/testcases/org/ smartfrog/test/system/workflow/conditional/ConditionalTest.java

[<st...@us...>]

Revision: 4807
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4807&view=rev
Author:   steve_l
Date:     2007-07-26 09:07:43 -0700 (Thu, 26 Jul 2007)

Log Message:
-----------
add better cleanup on failure.

Modified Paths:
--------------
    trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java

Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java
===================================================================
--- trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java	2007-07-26 16:02:38 UTC (rev 4806)
+++ trunk/core/testharness/testcases/org/smartfrog/test/system/workflow/conditional/ConditionalTest.java	2007-07-26 16:07:43 UTC (rev 4807)
@@ -35,34 +35,27 @@
         super(s);
     }
 
-/*
     public void testParseConditionFile() throws Throwable {
         runTestsToCompletion(FILES,"testParseConditionFile");
     }
-*/
 
     public void testPassingIf() throws Throwable {
-        application = deployExpectingSuccess(FILES + "testPassingIf.sf", "testPassingIf");
-        expectSuccessfulTermination((TestBlock) application);
+        expectSuccessfulTestRun(FILES, "testPassingIf");
     }
 
     public void testPassingWaitFor() throws Throwable {
-        application=deployExpectingSuccess(FILES +"testPassingWaitFor.sf","testPassingWaitFor");
-        expectSuccessfulTermination((TestBlock) application);
+        expectSuccessfulTestRun(FILES, "testPassingWaitFor");
     }
 
     public void testOneWaitFor() throws Throwable {
-        application = deployExpectingSuccess(FILES + "testOneWaitFor.sf", "testOneWaitFor");
-        expectSuccessfulTermination((TestBlock) application);
+        expectSuccessfulTestRun(FILES, "testOneWaitFor");
     }
 
     public void testOneIf() throws Throwable {
-        application = deployExpectingSuccess(FILES + "testOneIf.sf", "testOneIf");
-        expectSuccessfulTermination((TestBlock) application);
+        expectSuccessfulTestRun(FILES, "testOneIf");
     }
 
     public void testFailingWaitFor() throws Throwable {
-        TestCompletedEvent event =
-            expectAbnormalTestRun(FILES, "testFailingWaitFor", false, WAITFOR_FAILED);
+        expectAbnormalTestRun(FILES, "testFailingWaitFor", false, WAITFOR_FAILED);
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.