diff --git a/.settings b/.settings index d6abd2247..66adb124e 100644 --- a/.settings +++ b/.settings @@ -2,8 +2,7 @@ Count=0 [DebugWindow] -Count=1 -DebugWindow[1]="TestClass" +Count=0 [DebugWindow/$MyContainer] Geometry=[30,98,345,280] @@ -330,12 +329,12 @@ Path="gb.deg.unit.gambas" File[1]=".src/TestRunner/FmRunner.form" File[2]=".src/TestRunner/FmTrace.form" File[3]=".src/TestRunner/FmRunner.class:28.17" -File[4]=".src/TestRunner/FmTrace.class:40.64" -Active=7 +File[4]=".src/TestRunner/FmTrace.class:9.121" +Active=4 Count=24 -File[5]=".src/TesteStartRunner.module:4.12" +File[5]=".src/TesteStartRunner.module:4.14" File[6]=".src/TestMyself/TestErrorsAndFailures.class:0.4" -File[7]=".src/TestRunner/UnitTest.class:0.179" +File[7]=".src/TestRunner/UnitTest.class:36.166" File[8]=".src/TestSuite/TestSuite.class:18.89" File[9]=".src/TestSuite/ITestCase.class:0.3" File[10]=".src/TestSuite/TestCase.class:0.7" @@ -352,7 +351,7 @@ File[20]=".src/TestSuite/TestError.class:0.1" File[21]=".src/TestSuite/TestErrors.class:0.15" File[22]=".src/TestSuite/TestParameter.class:0.1" File[23]=".src/TestSuite/TestParameters.class:0.1" -File[24]=".src/TestSuite/TestResult.class:0.2" +File[24]=".src/TestSuite/TestResult.class:0.125" [Watches] Count=0 diff --git a/.src/TestRunner/FmTrace.class b/.src/TestRunner/FmTrace.class index 4b9eb422a..b7affb012 100644 --- a/.src/TestRunner/FmTrace.class +++ b/.src/TestRunner/FmTrace.class @@ -116,10 +116,10 @@ Public Sub ResultEvent_AfterAddFailure(oError As TestError) If tvTrace["Root"].Picture = $PictureOk Then - Debug "Root";; tvTrace["Root"].Picture - Debug "Error";; $PictureError - Debug "Fail";; $PictureFail - Debug "Set Fail" + 'Debug "Root";; tvTrace["Root"].Picture + 'Debug "Error";; $PictureError + 'Debug "Fail";; $PictureFail + 'Debug "Set Fail" tvTrace["Root"].Picture = $PictureFail Endif diff --git a/.src/TestRunner/UnitTest.class b/.src/TestRunner/UnitTest.class index 1c45e6c1e..09d36ceb8 100644 --- a/.src/TestRunner/UnitTest.class +++ b/.src/TestRunner/UnitTest.class @@ -12,9 +12,9 @@ Private $DoSelfTest As Boolean Public Sub _new() - If UnittestFileNotExist() = False Then - $Suite = New TestSuite - Endif + 'If UnittestFileNotExist() = False Then + $Suite = New TestSuite + 'Endif End @@ -40,10 +40,8 @@ Public Sub ShowTestForm() Dim fm As FmRunner - If UnittestFileNotExist() = False Then - fm = New FmRunner(Null, Me.DoSelfTest) - fm.Show() - Endif + fm = New FmRunner(Null, Me.DoSelfTest) + fm.Show() End '' Runs the Unittest and prints the result to the console. Optional limited to one testclass and/or one testmethod. @@ -52,10 +50,8 @@ Public Sub Test(Optional ContainerName As String, Optional CaseName As String, O Dim Res As New TestResult - If UnittestFileNotExist() = False Then - Me._RunTests(Res, ContainerName, CaseName, ShowDebug, Me.DoSelfTest) - Me._PrintResult(Res) - Endif + Me._RunTests(Res, ContainerName, CaseName, ShowDebug, Me.DoSelfTest) + Me._PrintResult(Res) End @@ -171,7 +167,7 @@ Static Public Function GetAllTestContainerNames(Optional DoSelfTest As Boolean) If TestClass.Parent Then If TestClass.Parent.Name = "ATestContainer" Then strName = String.UCaseFirst(String.Lower(TestClass.Name)) - Debug "Add to testclasses: ";; strName + 'Debug "Add to testclasses: ";; strName TestContainernames.Add(strName) Endif Endif diff --git a/.src/TesteStartRunner.module b/.src/TesteStartRunner.module index a53bea765..1b09d8021 100644 --- a/.src/TesteStartRunner.module +++ b/.src/TesteStartRunner.module @@ -10,7 +10,8 @@ Public Sub Main() ' Do Selftest: r.DoSelfTest = True - r.Test() - 'r.ShowTestForm() + + 'r.Test() + r.ShowTestForm() End diff --git a/unittesthelloworld-0.0.1.tar.gz b/unittesthelloworld-0.0.1.tar.gz index 22198af58..c7b6b15e7 100644 Binary files a/unittesthelloworld-0.0.1.tar.gz and b/unittesthelloworld-0.0.1.tar.gz differ