[Shunit-commits] ShUnit TwoSuccessfulTests, NONE, 1.1 shUnit, 1.26, 1.27 shUnitAcceptanceTest, 1.3, 1.4 shuXmlFormatter, 1.1, 1.2

[lacton <la...@us...>]

Update of /cvsroot/shunit/ShUnit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22392

Modified Files:
	shUnit shUnitAcceptanceTest shuXmlFormatter 
Added Files:
	TwoSuccessfulTests 
Log Message:
[add] XML output when 2 successful tests.


--- NEW FILE: TwoSuccessfulTests ---
#! /usr/bin/env sh

FirstSuccessfulTest() {
  shuAssert 'Always true' 0
}

SecondSuccessfulTest() {
  shuAssert 'Always true' 0
}

Suite() {
  shuRegTest FirstSuccessfulTest;
  shuRegTest SecondSuccessfulTest;
}

. "$SHUNIT_HOME/shUnit"
shuStart Suite
Index: shUnitAcceptanceTest
===================================================================
RCS file: /cvsroot/shunit/ShUnit/shUnitAcceptanceTest,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shUnitAcceptanceTest	24 Mar 2008 21:29:38 -0000	1.3
--- shUnitAcceptanceTest	24 Mar 2008 21:49:39 -0000	1.4
***************
*** 21,24 ****
--- 21,25 ----
    shuRegTest TestShuStartWith2Arguments
    shuRegTest TestXmlOutputWithOneSuccessfulTest
+   shuRegTest TestXmlOutputWithTwoSuccessfulTests
  }
  
***************
*** 173,176 ****
--- 174,197 ----
  }
  
+ 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

Index: shuXmlFormatter
===================================================================
RCS file: /cvsroot/shunit/ShUnit/shuXmlFormatter,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shuXmlFormatter	24 Mar 2008 21:29:38 -0000	1.1
--- shuXmlFormatter	24 Mar 2008 21:49:39 -0000	1.2
***************
*** 1,17 ****
  #! /usr/bin/env sh
  
- formatter="$0"
  testScript="$1"
  
  shuSuiteStart() {
    suiteName="`basename $testScript`"
    exec > TEST-$suiteName.xml
    echo "<?xml version=\"1.0\" ?>"
!   echo "<testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"$suiteName\" tests=\"1\">"
!   echo "  <testcase classname=\"OneSuccessfulTest\" name=\"SuccessfulTest\" />"
!   echo "  <system-out><![CDATA[]]></system-out>"
!   echo "  <system-err><![CDATA[]]></system-err>"
!   echo "</testsuite>"
!   echo
  }
  
--- 1,12 ----
  #! /usr/bin/env sh
  
  testScript="$1"
  
  shuSuiteStart() {
+   testCount=$1
    suiteName="`basename $testScript`"
    exec > TEST-$suiteName.xml
    echo "<?xml version=\"1.0\" ?>"
!   echo "<testsuite errors=\"0\" failures=\"0\" hostname=\"`hostname`\" name=\"$suiteName\" tests=\"$testCount\">"
  }
  
***************
*** 30,38 ****
  
  shuTestEnd() {
! :
  }
  
  shuSuiteEnd() {
! :
  }
  
--- 25,36 ----
  
  shuTestEnd() {
!   echo "  <testcase classname=\"$suiteName\" name=\"$testName\" />"
  }
  
  shuSuiteEnd() {
!   echo "  <system-out><![CDATA[]]></system-out>"
!   echo "  <system-err><![CDATA[]]></system-err>"
!   echo "</testsuite>"
!   echo
  }
  

Index: shUnit
===================================================================
RCS file: /cvsroot/shunit/ShUnit/shUnit,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** shUnit	24 Mar 2008 21:29:38 -0000	1.26
--- shUnit	24 Mar 2008 21:49:39 -0000	1.27
***************
*** 93,97 ****
    fi
    
!   shuSuiteStart
  
    SHU_TOTAL_NR_SUCCEEDED=0
--- 93,97 ----
    fi
    
!   shuSuiteStart ${SHU_TOTAL_NR_OF_TESTS}
  
    SHU_TOTAL_NR_SUCCEEDED=0
***************
*** 169,174 ****
  then
    shuSuiteStart() {
      printf "\n****** `basename ${0}` ******\n"
!     shuFmtNbrTests "${SHU_TOTAL_NR_OF_TESTS}"
      printf "%s to run:\n" "$shuRetFmtNbrTests"
    }
--- 169,175 ----
  then
    shuSuiteStart() {
+     testCount=$1
      printf "\n****** `basename ${0}` ******\n"
!     shuFmtNbrTests $testCount
      printf "%s to run:\n" "$shuRetFmtNbrTests"
    }