fixed all examples

Pazus · Pazus · commit 7da9de246cef · 2016-08-01T19:43:17.000+03:00
deleted execution result, replaced with result in ut_object and start_time/end_time in ut_test_object.tps
ut_test_call_params renamed to ut_executable
diff --git a/examples/RunExampleTestSuite.sql b/examples/RunExampleTestSuite.sql
@@ -38,7 +38,7 @@ begin
     test_item := treat(suite.items(test_idx) as ut_test);
     dbms_output.put_line('---------------------------------------------------');
     dbms_output.put_line('Test:' || test_item.test.form_name);
-    dbms_output.put_line('Result: ' || test_item.execution_result.result_to_char);
+    dbms_output.put_line('Result: ' || test_item.result_to_char);
     dbms_output.put_line('Assert Results:');
     for i in test_item.items.first .. test_item.items.last loop
 			assert := treat(test_item.items(i) as ut_assert_result);
diff --git a/examples/TestOwnerName.sql b/examples/TestOwnerName.sql
@@ -21,7 +21,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result != ut_utils.tr_error then
+  if simple_test.result != ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
@@ -42,7 +42,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result = ut_utils.tr_error then
+  if simple_test.result = ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
diff --git a/examples/TestPackageName.sql b/examples/TestPackageName.sql
@@ -14,7 +14,7 @@ begin
 	simple_test.execute();
 
 --Assert
-	if simple_test.execution_result.result = ut_utils.tr_error then
+	if simple_test.result = ut_utils.tr_error then
 		dbms_output.put_line('  Success');
 	else
 		dbms_output.put_line('  Failure');
@@ -34,7 +34,7 @@ begin
 	simple_test.execute();
 
 --Assert
-	if simple_test.execution_result.result = ut_utils.tr_error then
+	if simple_test.result = ut_utils.tr_error then
 		dbms_output.put_line('  Success');
 	else
 		dbms_output.put_line('  Failure');
@@ -69,7 +69,7 @@ begin
 	simple_test.execute();
 
 --Assert
-	if simple_test.execution_result.result = ut_utils.tr_error then
+	if simple_test.result = ut_utils.tr_error then
 		dbms_output.put_line('  Success');
 	else
 		dbms_output.put_line('  Failure');
diff --git a/examples/TestProcedureName.sql b/examples/TestProcedureName.sql
@@ -20,7 +20,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result = ut_utils.tr_error then
+  if simple_test.result = ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
@@ -40,7 +40,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result = ut_utils.tr_error then
+  if simple_test.result = ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
diff --git a/examples/TestSetupProcedureName.sql b/examples/TestSetupProcedureName.sql
@@ -21,7 +21,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result != ut_utils.tr_error then
+  if simple_test.result != ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
@@ -42,7 +42,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result = ut_utils.tr_error then
+  if simple_test.result = ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
diff --git a/examples/TestTeardownProcedureName.sql b/examples/TestTeardownProcedureName.sql
@@ -21,7 +21,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result != ut_utils.tr_error then
+  if simple_test.result != ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
@@ -42,7 +42,7 @@ begin
   simple_test.execute();
 
 --Assert
-  if simple_test.execution_result.result = ut_utils.tr_error then
+  if simple_test.result = ut_utils.tr_error then
     dbms_output.put_line('  Success');
   else
     dbms_output.put_line('  Failure');
diff --git a/source/install.sql b/source/install.sql
@@ -1,29 +1,27 @@
-@@types/ut_execution_result.tps
 @@types/ut_object.tps
 @@types/ut_objects_list.tps
 @@types/ut_composite_object.tps
-@@types/ut_test_call_params.tps
+@@types/ut_executable.tps
 @@types/ut_assert_result.tps
---@@types/ut_assert_list.tps
 @@ut_metadata.pks
 @@ut_assert.pks
 @@types/ut_suite_reporter.tps
 @@types/ut_reporters_list.tps
 @@types/ut_composite_reporter.tps
 @@types/ut_test_object.tps
-
 @@types/ut_test.tps
 @@types/ut_test_suite.tps
 @@types/ut_reporter_decorator.tps
 @@types/ut_dbms_output_suite_reporter.tps
 @@ut_utils.pks
+
 @@ut_utils.pkb
 @@types/ut_assert_result.tpb
-@@types/ut_execution_result.tpb
+@@types/ut_object.tpb
 @@types/ut_composite_object.tpb
 @@types/ut_test.tpb
 @@types/ut_test_suite.tpb
-@@types/ut_test_call_params.tpb
+@@types/ut_executable.tpb
 @@types/ut_composite_reporter.tpb
 @@types/ut_reporter_decorator.tpb
 @@types/ut_dbms_output_suite_reporter.tpb
diff --git a/source/types/ut_assert_result.tpb b/source/types/ut_assert_result.tpb
@@ -10,10 +10,5 @@ create or replace type body ut_assert_result is
     return;
   end ut_assert_result;
 
-  member function result_to_char(self in ut_assert_result) return varchar2 is
-  begin
-    return ut_utils.test_result_to_char(result);
-  end;
-
 end;
 /
diff --git a/source/types/ut_assert_result.tps b/source/types/ut_assert_result.tps
@@ -1,12 +1,9 @@
 create or replace type ut_assert_result force under ut_object
 (
-  result  integer(1),
   message varchar2(4000 char),
 
   constructor function ut_assert_result(a_result varchar2, a_message varchar2, a_name varchar2 default null)
-    return self as result,
-
-  member function result_to_char(self in ut_assert_result) return varchar2
+    return self as result
 )
 not final
 /
diff --git a/source/types/ut_composite_object.tpb b/source/types/ut_composite_object.tpb
@@ -3,10 +3,10 @@ create or replace type body ut_composite_object is
     v_result integer(1) := ut_utils.tr_success;
   begin
     for i in 1 .. self.items.count loop
-      v_result := greatest(self.items(i).execution_result.result, v_result);
+      v_result := greatest(self.items(i).result, v_result);
       exit when v_result = ut_utils.tr_error;
     end loop;
-    self.execution_result.result := v_result;
+    self.result := v_result;
   end;
 
 end;
diff --git a/source/types/ut_dbms_output_suite_reporter.tpb b/source/types/ut_dbms_output_suite_reporter.tpb
@@ -51,7 +51,7 @@ create or replace type body ut_dbms_output_suite_reporter is
     test   ut_test := treat(a_test as ut_test);
     assert ut_assert_result;
   begin
-    print('result: ' || test.execution_result.result_to_char);
+    print('result: ' || test.result_to_char);
     print('asserts');
     for i in test.items.first .. test.items.last loop
       assert := treat(test.items(i) as ut_assert_result);
diff --git a/source/types/ut_executable.tpb b/source/types/ut_executable.tpb
@@ -1,4 +1,4 @@
-create or replace type body ut_test_call_params is
+create or replace type body ut_executable is
 
   static procedure execute_call(a_owner varchar2, a_object varchar2, a_procedure_name varchar2) is
     stmt varchar2(200);
@@ -16,7 +16,7 @@ create or replace type body ut_test_call_params is
     stmt := 'begin ' || ut_metadata.form_name(owner, object_name, procedure_name) || '; end;';
   
     $if $$ut_trace $then
-    dbms_output.put_line('ut_test_call_params.execute_call stmt:' || stmt);
+    dbms_output.put_line('ut_executable.execute_call stmt:' || stmt);
     $end
   
     i := dbms_sql.open_cursor;
@@ -31,32 +31,7 @@ create or replace type body ut_test_call_params is
       raise;
   end;
 
-  /*
-  member function is_valid(self in ut_test_call_params) return boolean is
-  begin
-    if self.test_procedure is null then
-      return false;
-    end if;
-  
-    if not ut_metadata.do_resolve(self.owner_name, self.object_name, self.test_procedure) then
-      return false;
-    end if;
-  
-    if self.setup_procedure is not null and
-       not ut_metadata.do_resolve(self.owner_name, self.object_name, self.setup_procedure) then
-      return false;
-    end if;
-  
-    if self.teardown_procedure is not null and
-       not ut_metadata.do_resolve(self.owner_name, self.object_name, self.teardown_procedure) then
-      return false;
-    end if;
-  
-    return true;
-  end is_valid;
-  */
-
-  member function validate_params(a_proc_type varchar2) return boolean is
+  member function is_valid(a_proc_type varchar2) return boolean is
     a_result boolean := true;
   begin
   
@@ -85,16 +60,16 @@ create or replace type body ut_test_call_params is
     end if;
   
     return a_result;
-  end validate_params;
+  end is_valid;
 
   member function form_name return varchar2 is
   begin
     return ut_metadata.form_name(owner_name, object_name, procedure_name);
   end;
 
-  member procedure execute(self in ut_test_call_params) is
+  member procedure execute(self in ut_executable) is
   begin
-    ut_test_call_params.execute_call(self.owner_name, self.object_name, self.procedure_name);
+    ut_executable.execute_call(self.owner_name, self.object_name, self.procedure_name);
   end execute;
 
 end;
diff --git a/source/types/ut_executable.tps b/source/types/ut_executable.tps
@@ -1,12 +1,12 @@
-create or replace type ut_test_call_params force as object
+create or replace type ut_executable force as object
 (
   owner_name         varchar2(32 char),
   object_name        varchar2(32 char),
   procedure_name     varchar2(32 char),
 		
   static procedure execute_call(a_owner varchar2, a_object varchar2, a_procedure_name varchar2),
-  member function validate_params(a_proc_type varchar2) return boolean,
+  member function is_valid(a_proc_type varchar2) return boolean,
 	member function form_name return varchar2,
-	member procedure execute(self in ut_test_call_params)
+	member procedure execute(self in ut_executable)
 ) final
 /
diff --git a/source/types/ut_execution_result.tpb b/source/types/ut_execution_result.tpb
diff --git a/source/types/ut_execution_result.tps b/source/types/ut_execution_result.tps
diff --git a/source/types/ut_object.tpb b/source/types/ut_object.tpb
@@ -0,0 +1,9 @@
+create or replace type body ut_object is
+
+  member function result_to_char return varchar2 is
+  begin
+    return ut_utils.test_result_to_char(self.result);
+  end;
+
+end;
+/
diff --git a/source/types/ut_object.tps b/source/types/ut_object.tps
@@ -1,7 +1,10 @@
 create or replace type ut_object as object
 (
   name varchar2(250 char),
-  execution_result ut_execution_result,
-  object_type integer(1) --0 - assert, 1 -- test, 2 -- suite
+  --execution_result ut_execution_result,
+	result integer(1),
+  object_type integer(1), --0 - assert, 1 -- test, 2 -- suite
+	
+	member function result_to_char return varchar2
 ) not final not instantiable
 /
diff --git a/source/types/ut_test.tpb b/source/types/ut_test.tpb
diff --git a/source/types/ut_test.tps b/source/types/ut_test.tps
diff --git a/source/types/ut_test_object.tps b/source/types/ut_test_object.tps
diff --git a/source/types/ut_test_suite.tpb b/source/types/ut_test_suite.tpb
diff --git a/source/uninstall.sql b/source/uninstall.sql

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`	`1`	`create or replace type ut_assert_result force under ut_object`
`2`	`2`	`(`
`3`		`- result integer(1),`
`4`	`3`	`message varchar2(4000 char),`
`5`	`4`
`6`	`5`	`constructor function ut_assert_result(a_result varchar2, a_message varchar2, a_name varchar2 default null)`
`7`		`- return self as result,`
`8`		`-`
`9`		`- member function result_to_char(self in ut_assert_result) return varchar2`
	`6`	`+ return self as result`
`10`	`7`	`)`
`11`	`8`	`not final`
`12`	`9`	`/`