RunExampleTestSuite.sql is now functional

Shoelace · Shoelace · commit 3bf698c9ba75 · 2016-07-15T11:39:51.000+01:00
diff --git a/examples/RunExampleTestSuite.sql b/examples/RunExampleTestSuite.sql
@@ -1,52 +1,49 @@
 --Shows how to create a test suite in code and call the test runner.
 --No tables are used for this.   
 --Suite Management packages are when developed will make this easier.
-DECLARE
-   testtoexecute ut_types.singletest;
-   Suite UT_TYPES.TestSuite;
-   TestResults ut_types.TestSuiteResults;
-BEGIN
-   Suite.SuiteName := 'Test Suite Name';
-   Suite.Tests := ut_Types.TestList();
+Clear Screen
+Set Serveroutput On Size Unlimited
+
+Declare
+   testtoexecute ut_types.single_test;
+   Suite Ut_Types.Test_Suite;
+   testresults ut_types.test_suite_results;
+Begin
+   Suite.Suite_name := 'Test Suite Name';
+   Suite.Tests := ut_Types.Test_List();
    
-   TestToExecute.TypeOfTest := ut_Types.TT_Package;
-   TestToExecute.ObjectName := 'ut_exampletest';
-   TestToExecute.SetupMethod := 'Setup';
-   TestToExecute.TearDownMethod := 'TearDown';
-   TestToExecute.TestMethod := 'ut_exampletest';
+   Testtoexecute.object_name := 'ut_exampletest';
+   Testtoexecute.setup_procedure := 'Setup';
+   TestToExecute.teardown_procedure := 'TearDown';
+   TestToExecute.test_procedure := 'ut_exampletest';
 
    Suite.Tests.Extend;
-   Suite.Tests(Suite.Tests.LAST) := TestToExecute;
-   /
-   TestToExecute.TypeOfTest := ut3Types.TT_Package;
-   TestToExecute.ObjectName := 'ut_exampletest2';
-   TestToExecute.SetupMethod := 'Setup';
-   TestToExecute.TearDownMethod := 'TearDown';
-   TestToExecute.TestMethod := 'ut_exampletest';
+   Suite.Tests(Suite.Tests.Last) := Testtoexecute;
+
+   Testtoexecute.object_name := 'ut_exampletest2';
+   Testtoexecute.setup_procedure := 'Setup';
+   TestToExecute.teardown_procedure := 'TearDown';
+   TestToExecute.test_procedure := 'ut_exampletest';
    
    Suite.Tests.Extend;   
    Suite.Tests(Suite.Tests.LAST) := TestToExecute;
-         
-   ut3TestRunner.ExecuteTests(Suite,null,TestResults);
+
+   ut_Test_Runner.Execute_Tests(Suite,null,TestResults);
       
    -- No reporter used in this example so outputing the results manually.
    FOR test_idx in TestResults.first .. TestResults.last
    LOOP
-       dbms_output.put_line('---------------------------------------------------');
-       dbms_output.put_line('Test:' || TestResults(test_idx).Test.ObjectName || '.' || TestResults(test_idx).Test.TestMethod ); 
-       dbms_output.put_line('Result: ' || TestResults(test_idx).result);
-       dbms_output.put_line('Assert Results:');
-       FOR I in TestResults(test_idx).AssertResults.First .. TestResults(test_idx).AssertResults.Last
-       LOOP
-          dbms_output.put_line(I || ' - result: ' ||  TestResults(test_idx).AssertResults(I).AssertResult);
-          dbms_output.put_line(I || ' - Message: ' ||  TestResults(test_idx).AssertResults(I).Message);
+       Dbms_Output.Put_Line('---------------------------------------------------');
+       Dbms_Output.Put_Line('Test:' || Testresults(Test_Idx).Test.Object_Name || '.' || Testresults(Test_Idx).Test.Test_Procedure ); 
+       dbms_output.put_line('Result: ' || Ut_Types.Test_Result_To_Char(TestResults(test_idx).result) );
+       Dbms_Output.Put_Line('Assert Results:');
+       FOR I in TestResults(test_idx).Assert_Results.First .. TestResults(test_idx).Assert_Results.Last
+       Loop
+          Dbms_Output.Put_Line(I || ' - result: ' ||  Ut_Types.Test_Result_To_Char(Testresults(Test_Idx).Assert_Results(I).Result) );
+          dbms_output.put_line(I || ' - Message: ' ||  TestResults(test_idx).Assert_Results(I).Message);
        END LOOP;   
    END LOOP;
    dbms_output.put_line('---------------------------------------------------');
-END;
-
-
-
-
-
+End;
+/
 
diff --git a/examples/ut_exampletest2.pkb b/examples/ut_exampletest2.pkb
@@ -16,8 +16,8 @@ AS
  procedure ut_exampletest
  as
  begin
-    ut3assert.areEqual('Test 1 Should Pass',1,1);
-    ut3assert.areEqual('Test 2 Should Pass',2,2); 
+    ut_assert.are_Equal('Test 1 Should Pass',1,1);
+    ut_assert.are_Equal('Test 2 Should Pass',2,2); 
  end;
  
 END;
