Menu
▾
▴
[Shunit-commits] ShUnit shuXmlFormatterTest, NONE, 1.1 shUnitAcceptanceTest, 1.5, 1.6
|
From: lacton <la...@us...> - 2008-03-25 22:10:38
|
Update of /cvsroot/shunit/ShUnit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16219 Modified Files: shUnitAcceptanceTest Added Files: shuXmlFormatterTest Log Message: [refactor] Extracted XML Output related tests to a dedicated test suite. Index: shUnitAcceptanceTest =================================================================== RCS file: /cvsroot/shunit/ShUnit/shUnitAcceptanceTest,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shUnitAcceptanceTest 25 Mar 2008 21:43:50 -0000 1.5 --- shUnitAcceptanceTest 25 Mar 2008 22:10:32 -0000 1.6 *************** *** 20,26 **** shuRegTest Test127FailingTests shuRegTest TestShuStartWith2Arguments - shuRegTest TestXmlOutputWithOneSuccessfulTest - shuRegTest TestXmlOutputWithOneFailingTest - shuRegTest TestXmlOutputWithTwoSuccessfulTests } --- 20,23 ---- *************** *** 156,221 **** } - TestXmlOutputWithOneSuccessfulTest() { - for shell in $available_shells - do - $shell shuXmlFormatter ./OneSuccessfulTest - expectedXml="<?xml version=\"1.0\" ?> - <testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"OneSuccessfulTest\" tests=\"1\"> - <testcase classname=\"OneSuccessfulTest\" name=\"SuccessfulTest\" /> - <system-out><![CDATA[]]></system-out> - <system-err><![CDATA[]]></system-err> - </testsuite>" - [ -f TEST-OneSuccessfulTest.xml ] - shuAssert "XML file created" $? - actualXml=`cat TEST-OneSuccessfulTest.xml` - [ "$expectedXml" = "$actualXml" ] - shuAssert "XML contents as expected" $? - rm -f TEST-OneSuccessfulTest.xml - done - } - - TestXmlOutputWithOneFailingTest() { - for shell in $available_shells - do - $shell shuXmlFormatter ./OneFailingTest - expectedXml="<?xml version=\"1.0\" ?> - <testsuite errors=\"0\" failures=\"1\" hostname=\"`hostname`\" name=\"OneFailingTest\" tests=\"1\"> - <testcase classname=\"OneFailingTest\" name=\"FailingTest\"> - <failure message=\"Intentional failure\"> - Intentional failure at OneFailingTest.FailingTest(./OneFailingTest) - </failure> - </testcase> - <system-out><![CDATA[]]></system-out> - <system-err><![CDATA[]]></system-err> - </testsuite>" - [ -f TEST-OneFailingTest.xml ] - shuAssert "XML file created" $? - actualXml=`cat TEST-OneFailingTest.xml` - [ "$expectedXml" = "$actualXml" ] - shuAssert "XML contents as expected" $? - rm -f TEST-OneFailingTest.xml - done - } - - TestXmlOutputWithTwoSuccessfulTests() { - for shell in $available_shells - do - $shell shuXmlFormatter ./TwoSuccessfulTests - expectedXml="<?xml version=\"1.0\" ?> - <testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"TwoSuccessfulTests\" tests=\"2\"> - <testcase classname=\"TwoSuccessfulTests\" name=\"FirstSuccessfulTest\" /> - <testcase classname=\"TwoSuccessfulTests\" name=\"SecondSuccessfulTest\" /> - <system-out><![CDATA[]]></system-out> - <system-err><![CDATA[]]></system-err> - </testsuite>" - [ -f TEST-TwoSuccessfulTests.xml ] - shuAssert "XML file created" $? - actualXml=`cat TEST-TwoSuccessfulTests.xml` - [ "$expectedXml" = "$actualXml" ] - shuAssert "XML contents as expected" $? - rm -f TEST-TwoSuccessfulTests.xml - done - } - # # Support Functions --- 153,156 ---- --- NEW FILE: shuXmlFormatterTest --- #! /usr/bin/env sh # # Unit tests for shuXmlFormatter. # # # Test Cases # Suite() { shuRegTest TestOneSuccessfulTest shuRegTest TestOneFailingTest shuRegTest TestTwoSuccessfulTests } TestOneSuccessfulTest() { for shell in $available_shells do $shell shuXmlFormatter ./OneSuccessfulTest expectedXml="<?xml version=\"1.0\" ?> <testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"OneSuccessfulTest\" tests=\"1\"> <testcase classname=\"OneSuccessfulTest\" name=\"SuccessfulTest\" /> <system-out><![CDATA[]]></system-out> <system-err><![CDATA[]]></system-err> </testsuite>" [ -f TEST-OneSuccessfulTest.xml ] shuAssert "XML file created" $? actualXml=`cat TEST-OneSuccessfulTest.xml` [ "$expectedXml" = "$actualXml" ] shuAssert "XML contents as expected" $? rm -f TEST-OneSuccessfulTest.xml done } TestOneFailingTest() { for shell in $available_shells do $shell shuXmlFormatter ./OneFailingTest expectedXml="<?xml version=\"1.0\" ?> <testsuite errors=\"0\" failures=\"1\" hostname=\"`hostname`\" name=\"OneFailingTest\" tests=\"1\"> <testcase classname=\"OneFailingTest\" name=\"FailingTest\"> <failure message=\"Intentional failure\"> Intentional failure at OneFailingTest.FailingTest(./OneFailingTest) </failure> </testcase> <system-out><![CDATA[]]></system-out> <system-err><![CDATA[]]></system-err> </testsuite>" [ -f TEST-OneFailingTest.xml ] shuAssert "XML file created" $? actualXml=`cat TEST-OneFailingTest.xml` [ "$expectedXml" = "$actualXml" ] shuAssert "XML contents as expected" $? rm -f TEST-OneFailingTest.xml done } TestTwoSuccessfulTests() { for shell in $available_shells do $shell shuXmlFormatter ./TwoSuccessfulTests expectedXml="<?xml version=\"1.0\" ?> <testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"TwoSuccessfulTests\" tests=\"2\"> <testcase classname=\"TwoSuccessfulTests\" name=\"FirstSuccessfulTest\" /> <testcase classname=\"TwoSuccessfulTests\" name=\"SecondSuccessfulTest\" /> <system-out><![CDATA[]]></system-out> <system-err><![CDATA[]]></system-err> </testsuite>" [ -f TEST-TwoSuccessfulTests.xml ] shuAssert "XML file created" $? actualXml=`cat TEST-TwoSuccessfulTests.xml` [ "$expectedXml" = "$actualXml" ] shuAssert "XML contents as expected" $? rm -f TEST-TwoSuccessfulTests.xml done } # # Support Functions # getAvailableShellsAmong() { # TODO Duplication with shUnitAcceptanceTest known_shells="$1" for shell in $known_shells do if (exec $shell -c exit 2>/dev/null) then echo -n "$shell " fi done } # # Main # available_shells=`getAvailableShellsAmong "sh bash ksh93 pdksh ash dash"` echo "Available shells: $available_shells" >&2 . "$SHUNIT_HOME/shUnit" shuStart Suite |
