From: <st...@us...> - 2007-07-31 15:57:47
|
Revision: 4849 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4849&view=rev Author: steve_l Date: 2007-07-31 08:44:07 -0700 (Tue, 31 Jul 2007) Log Message: ----------- SFOS-352 TestCompound doesnt set the status or application status when something fails during startup SFOS-204 Some of the testblock tests are failing Modified Paths: -------------- trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsEventsTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/components.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptyCompound.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptySequence.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailure.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessage.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessageNested.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testRun.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testUnexpectedFailure.sf Added Paths: ----------- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureNested.sf trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testcompounds_sfunit.sf Modified: trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/src/org/smartfrog/test/DeployingTestBase.java 2007-07-31 15:44:07 UTC (rev 4849) @@ -140,7 +140,7 @@ * that point is reached. There is no timeout. * @param testBlock component to spin on * @return the termination record of the component - * @throws Throwable + * @throws Throwable anything that got thrown */ protected TerminationRecord spinUntilFinished(TestBlock testBlock) throws Throwable { return spinUntilFinished(testBlock, getTestTimeout()); Modified: trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java =================================================================== --- trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/src/org/smartfrog/test/SmartFrogTestBase.java 2007-07-31 15:44:07 UTC (rev 4849) @@ -201,7 +201,24 @@ return log; } + /** + * Get the current application or null + * @return the current application + */ + public Prim getApplication() { + return application; + } + + /** + * set the application + * @param application + */ + public void setApplication(Prim application) { + this.application = application; + } + + /** * get a file name relative to the classes dir directory * @param filename short name of the file * @return the resolved file @@ -1005,6 +1022,7 @@ String descriptionText, String throwableClass, String throwableText) { + assertNotNull("Null termination record",record); if(descriptionText!=null) { assertContains(record.description,descriptionText); } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsEventsTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsEventsTest.java 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsEventsTest.java 2007-07-31 15:44:07 UTC (rev 4849) @@ -21,9 +21,9 @@ import org.smartfrog.test.DeployingTestBase; import org.smartfrog.services.assertions.TestCompoundImpl; +import org.smartfrog.services.assertions.TestCompound; import org.smartfrog.services.assertions.events.TestCompletedEvent; import org.smartfrog.sfcore.prim.TerminationRecord; -import org.smartfrog.sfcore.common.SmartFrogException; /** * Date: 30-Apr-2004 @@ -46,19 +46,11 @@ assertTerminationRecordContains(record, "failure message",null,null); } - private TerminationRecord deployToAbnormalTermination(String test) throws Throwable { - TestCompletedEvent event = expectAbnormalTestRun(FILES, test, true, null); - return event.getStatus(); - } - - private TerminationRecord deployToNormalTermination(String test) throws Throwable { - TestCompletedEvent event = expectSuccessfulTestRun(FILES, test); - return event.getStatus(); - } - - public void testUnexpectedFailure() throws Throwable { - deployToAbnormalTermination("testUnexpectedFailure"); + TestCompletedEvent event = expectAbnormalTestRun(FILES, "testUnexpectedFailure", + true, + "FailAbnormal Error Message"); + event.getStatus(); } public void testFailureWrongMessage() throws Throwable { @@ -68,13 +60,38 @@ TestCompoundImpl.TEST_FAILED_WRONG_STATUS); } - public void NotestFailureWrongMessageNested() throws Throwable { - application =deployExpectingSuccess("testFailureWrongMessageNested", - "testFailureWrongMessageNested"); + public void testFailureNested() throws Throwable { + TestCompletedEvent event = expectSuccessfulTestRun(FILES, "testFailureNested"); + TerminationRecord status = event.getStatus(); } + public void testFailureWrongMessageNested() throws Throwable { + TestCompletedEvent event = expectSuccessfulTestRun(FILES, "testFailureWrongMessageNested"); + TerminationRecord status = event.getStatus(); + } - public void testSmartFrogException() throws Throwable { - TerminationRecord record = deployToNormalTermination("testSmartFrogException"); - assertTerminationRecordContains(record, null, "org.smartfrog.sfcore.common.SmartFrogException", "SFE"); + public void testSmartFrogExceptionActionRecord() throws Throwable { + TestCompletedEvent event = expectSuccessfulTestRun(FILES, "testSmartFrogException"); + TestCompound tc=(TestCompound) getApplication(); + assertSFERecord(tc.getActionTerminationRecord(),event,"TestCompound.getActionTerminationRecord()"); } + + + public void testSmartFrogExceptionStatusAttribute() throws Throwable { + TestCompletedEvent event = expectSuccessfulTestRun(FILES, "testSmartFrogException"); + TerminationRecord record = event.getStatus(); + assertSFERecord(record,event,"event status"); + TestCompound tc = (TestCompound) getApplication(); + assertSFERecord(tc.getStatus(),event,"application.getStatus()"); + } + + public void testCompleteSuite() throws Throwable { + expectSuccessfulTestRun(FILES,"testcompounds_sfunit"); + } + + private void assertSFERecord(TerminationRecord actionTR, TestCompletedEvent event,String recordType) { + if(actionTR==null) { + fail("No "+recordType+" record after \n"+event); + } + assertTerminationRecordContains(actionTR,null, "org.smartfrog.sfcore.common.SmartFrogException", "SFE"); + } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/TestCompoundsTest.java 2007-07-31 15:44:07 UTC (rev 4849) @@ -43,7 +43,7 @@ } public void testFailure() throws Throwable { - TerminationRecord record = deployToAbnormalTermination("testFailure"); + TerminationRecord record = deployToNormalTermination("testFailure"); assertTerminationRecordContains(record, "failure message",null,null); } @@ -76,6 +76,6 @@ public void testSmartFrogException() throws Throwable { TerminationRecord record = deployToNormalTermination("testSmartFrogException"); - assertTerminationRecordContains(record, null, SmartFrogException.class.toString(), "SFE"); + assertTerminationRecordContains(record, null, "org.smartfrog.sfcore.common.SmartFrogException", "SFE"); } } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/components.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/components.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/components.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -26,6 +26,93 @@ #include "/org/smartfrog/services/assertions/components.sf" #include "/org/smartfrog/sfcore/workflow/components/doNothing.sf" - Noop extends DoNothing { - time 0; - } \ No newline at end of file + Noop extends DoNothing { + time 0; + } + + testEmptyCompound extends ExpectDeploy { + action extends Compound { + } + } + + testEmptySequence extends ExpectTerminate { + action extends Sequence { + noop extends Noop; + } + } + + /** + * here we deploy a testblock that stays deployed after the run. + * + */ + + testFailure extends TestBlock { + action extends ExpectDeployFailure { + sfShouldTerminate false; + + action extends FailAbnormal { + message "failure message"; + } + exitText action:message; + } + } + + + /** + * here we deploy a testblock that stays deployed after the run. + * + */ + + testFailureNested extends ExpectTerminate { + action extends ExpectDeployFailure { + + action extends FailAbnormal { + message "failure message"; + } + exitText action:message; + } + } + + + testFailureWrongMessage extends ExpectDeployFailure { + description "the inner test looks for the wrong message"; + action extends FailAbnormal { + message "failure message"; + } + exitText "wrong message"; + } + + testFailureWrongMessageNested extends ExpectDeployFailure { + + description "the outer test looks for the covering message"; + + action extends testFailureWrongMessage { + } + + exitText "Expected action to terminate"; + } + + testRun extends ExpectTerminate { + action extends Sequence { + } + } + + testSmartFrogException extends ExpectDeployFailure { + + description "This test is expected to successfuly fail to deploy with a caught exception"; + + action extends SmartFrogException { + message "SFE"; + } + //the exception that we expect to catch + exceptions [["SmartFrogException","SFE"]]; + } + + + testUnexpectedFailure extends ExpectDeploy { + description "fail to deploy"; + action extends FailAbnormal { + message "FailAbnormal Error Message"; + } + } + Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptyCompound.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptyCompound.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptyCompound.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,8 +20,7 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -sfConfig extends ExpectDeploy { - sfShouldTerminate false; - action extends Compound { - } + +sfConfig extends testEmptyCompound { + sfShouldTerminate false; } \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptySequence.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptySequence.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testEmptySequence.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,10 +20,9 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -sfConfig extends ExpectTerminate { - sfShouldTerminate false; - action extends Sequence { - noop extends Noop; - } + + +sfConfig extends testEmptySequence { + sfShouldTerminate false; } \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailure.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailure.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailure.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,20 +20,5 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -/** - * here we deploy a testblock that stays deployed after the run. - * - */ -testFailure extends TestBlock { - action extends ExpectDeployFailure { - sfShouldTerminate false; - - action extends FailAbnormal { - message "failure message"; - } - exitText action:message; - } -} - sfConfig extends testFailure; \ No newline at end of file Added: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureNested.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureNested.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureNested.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -0,0 +1,24 @@ +/** (C) Copyright 1998-2007 Hewlett-Packard Development Company, LP + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY 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 along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +For more information: www.smartfrog.org + +*/ + +#include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; + + +sfConfig extends testFailureNested; \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessage.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessage.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessage.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,12 +20,6 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -sfConfig extends ExpectDeployFailure { - sfShouldTerminate false; - - description "the inner test looks for the wrong message"; - action extends FailAbnormal { - message "failure message"; - } - exitText "wrong message"; -} +sfConfig extends testFailureWrongMessage{ + sfShouldTerminate false; +} \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessageNested.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessageNested.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessageNested.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -18,18 +18,9 @@ */ -#include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; +#include "/org/smartfrog/test/system/assertions/testcompounds/testFailureWrongMessage.sf"; -sfConfig extends ExpectDeploy { + +sfConfig extends testFailureWrongMessageNested { sfShouldTerminate false; - - description "the outer test looks for the covering message"; - action extends ExpectDeployFailure { - description "the inner test looks for the wrong message"; - action extends FailAbnormal { - message "failure message"; - } - exitText "wrong message"; - } - exitText "Expected action to terminate with the status"; -} +} \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testRun.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testRun.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testRun.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -23,9 +23,7 @@ /** * This is a big test run */ -sfConfig extends ExpectTerminate { +sfConfig extends testRun { sfShouldTerminate false; - - action extends Sequence { - } -} \ No newline at end of file +} + \ No newline at end of file Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testSmartFrogException.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,14 +20,7 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -sfConfig extends ExpectDeployFailure { - description "This test is expected to fail with an exception"; +sfConfig extends testSmartFrogException { sfShouldTerminate false; - - action extends SmartFrogException { - message "SFE"; - } - //the exception that we expect to catch - exceptions [["SmartFrogException","SFE"]]; } Modified: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testUnexpectedFailure.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testUnexpectedFailure.sf 2007-07-31 15:42:50 UTC (rev 4848) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testUnexpectedFailure.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -20,11 +20,8 @@ #include "/org/smartfrog/test/system/assertions/testcompounds/components.sf"; -sfConfig extends ExpectDeploy { - sfShouldTerminate false; - description "fail to deploy"; - action extends FailAbnormal { - message "we were expecting success"; - } -} + +sfConfig extends testUnexpectedFailure { + sfShouldTerminate false; + } \ No newline at end of file Added: trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testcompounds_sfunit.sf =================================================================== --- trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testcompounds_sfunit.sf (rev 0) +++ trunk/core/testharness/testcases/org/smartfrog/test/system/assertions/testcompounds/testcompounds_sfunit.sf 2007-07-31 15:44:07 UTC (rev 4849) @@ -0,0 +1,39 @@ +/** (C) Copyright 2007 Hewlett-Packard Development Company, LP + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY 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 along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + For more information: www.smartfrog.org + + */ + +#include "/org/smartfrog/test/system/assertions/testcompounds/components.sf" +#include "/org/smartfrog/services/sfunit/components.sf" + + /** + * this is the complete test suite + */ + TestCompoundTests extends SFUnitTestSuite { + TestEmptyCompound extends testEmptyCompound; + TestEmptySequence extends testEmptySequence; + TestFailure extends testFailure; + TestFailureNested extends testFailureNested; + TestFailureWrongMessage extends testFailureWrongMessage; + TestFailureWrongMessageNested extends testFailureWrongMessageNested; + TestRun extends testRun; + TestSmartFrogException extends testSmartFrogException; + TestUnexpectedFailure extends testUnexpectedFailure; + } + +sfConfig extends TestCompoundTests; \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |