renameв ut_suite_reporter to ut_reporter

Pazus · Pavel Kaplya · commit fb338b4a33a0 · 2016-08-26T15:04:55.000+03:00
diff --git a/examples/RunExampleTestSuiteWithCustomDBMSOutputReporter.sql b/examples/RunExampleTestSuiteWithCustomDBMSOutputReporter.sql
@@ -42,6 +42,6 @@ end;
 
 
 --FIXME this drop is causing issues when executing script several times within single session
---drop type ut_custom_reporter;
+drop type ut_custom_reporter;
 drop package ut_exampletest;
 drop package ut_exampletest2;
diff --git a/examples/RunExampleTestThroughBaseClass.sql b/examples/RunExampleTestThroughBaseClass.sql
@@ -9,7 +9,7 @@ set echo off
 
 declare
   simple_test ut_test;
-  reporter    ut_suite_reporter;
+  reporter    ut_reporter;
 begin
 
   simple_test := ut_test(a_object_name        => 'ut_exampletest'
diff --git a/source/install.sql b/source/install.sql
@@ -7,7 +7,7 @@ whenever oserror exit failure rollback
 @@types/ut_executable.tps
 @@types/ut_assert_result.tps
 @@ut_assert.pks
-@@types/ut_suite_reporter.tps
+@@types/ut_reporter.tps
 @@types/ut_reporters_list.tps
 @@types/ut_composite_reporter.tps
 @@types/ut_test_object.tps
@@ -21,7 +21,7 @@ whenever oserror exit failure rollback
 
 @@ut_utils.pkb
 @@types/ut_assert_result.tpb
-@@types/ut_suite_reporter.tpb
+@@types/ut_reporter.tpb
 @@types/ut_object.tpb
 @@types/ut_composite_object.tpb
 @@types/ut_test.tpb
diff --git a/source/types/ut_composite_reporter.tpb b/source/types/ut_composite_reporter.tpb
@@ -8,7 +8,7 @@ create or replace type body ut_composite_reporter is
     return;
   end;
 
-  member procedure add_reporter(self in out nocopy ut_composite_reporter, a_reporter ut_suite_reporter) is
+  member procedure add_reporter(self in out nocopy ut_composite_reporter, a_reporter ut_reporter) is
   begin
     self.reporters.extend(1);
     self.reporters(self.reporters.last) := a_reporter;
diff --git a/source/types/ut_composite_reporter.tps b/source/types/ut_composite_reporter.tps
@@ -1,10 +1,10 @@
-create or replace type ut_composite_reporter under ut_suite_reporter
+create or replace type ut_composite_reporter under ut_reporter
 (
   reporters ut_reporters_list,
 
   constructor function ut_composite_reporter(a_reporters ut_reporters_list default ut_reporters_list())
     return self as result,
-  member procedure add_reporter(self in out nocopy ut_composite_reporter, a_reporter ut_suite_reporter),
+  member procedure add_reporter(self in out nocopy ut_composite_reporter, a_reporter ut_reporter),
   member procedure remove_reporter(self in out nocopy ut_composite_reporter, a_index pls_integer),
 
   overriding member procedure begin_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object),
diff --git a/source/types/ut_dbms_output_suite_reporter.tps b/source/types/ut_dbms_output_suite_reporter.tps
@@ -1,4 +1,4 @@
-create or replace type ut_dbms_output_suite_reporter force under ut_suite_reporter
+create or replace type ut_dbms_output_suite_reporter force under ut_reporter
 (
 
   constructor function ut_dbms_output_suite_reporter return self as result,
diff --git a/source/types/ut_reporter.tpb b/source/types/ut_reporter.tpb
@@ -0,0 +1,30 @@
+create or replace type body ut_reporter is
+
+  -- Member procedures and functions
+  member procedure begin_suite(self in out nocopy ut_reporter, a_suite in ut_object) is
+  begin
+    null;
+  end begin_suite;
+
+  member procedure begin_test(self in out nocopy ut_reporter, a_test in ut_object) is
+  begin
+    null;
+  end begin_test;
+
+  member procedure on_assert(self in out nocopy ut_reporter, a_assert in ut_object) is
+  begin
+    null;
+  end on_assert;
+
+  member procedure end_test(self in out nocopy ut_reporter, a_test in ut_object) is
+  begin
+    null;
+  end end_test;
+
+  member procedure end_suite(self in out nocopy ut_reporter, a_suite in ut_object) is
+  begin
+    null;
+  end end_suite;
+
+end;
+/
diff --git a/source/types/ut_reporter.tps b/source/types/ut_reporter.tps
@@ -0,0 +1,13 @@
+create or replace type ut_reporter force as object
+(
+  name varchar2(250 char),
+
+  member procedure begin_suite(self in out nocopy ut_reporter, a_suite in ut_object),
+  member procedure begin_test(self in out nocopy ut_reporter, a_test in ut_object),
+	member procedure on_assert(self in out nocopy ut_reporter, a_assert in ut_object),
+  member procedure end_test(self in out nocopy ut_reporter, a_test in ut_object),
+  member procedure end_suite(self in out nocopy ut_reporter, a_suite in ut_object)
+
+)
+not instantiable not final
+/
diff --git a/source/types/ut_reporter_decorator.tpb b/source/types/ut_reporter_decorator.tpb
@@ -1,12 +1,12 @@
 create or replace type body ut_reporter_decorator is
 
-  constructor function ut_reporter_decorator(a_decorated_reporter ut_suite_reporter) return self as result is
+  constructor function ut_reporter_decorator(a_decorated_reporter ut_reporter) return self as result is
   begin
     init(a_decorated_reporter);
     return;
   end ut_reporter_decorator;
 
-  member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_suite_reporter) is
+  member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_reporter) is
   begin
     self.decorated_reporter := a_decorated_reporter;
   end;
diff --git a/source/types/ut_reporter_decorator.tps b/source/types/ut_reporter_decorator.tps
@@ -1,9 +1,9 @@
-create or replace type ut_reporter_decorator under ut_suite_reporter 
+create or replace type ut_reporter_decorator under ut_reporter 
 (
-  decorated_reporter ut_suite_reporter,
+  decorated_reporter ut_reporter,
   
-  constructor function ut_reporter_decorator(a_decorated_reporter ut_suite_reporter) return self as result,
-  member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_suite_reporter)
+  constructor function ut_reporter_decorator(a_decorated_reporter ut_reporter) return self as result,
+  member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_reporter)
 	
 ) not final not instantiable
 /
diff --git a/source/types/ut_reporters_list.tps b/source/types/ut_reporters_list.tps
@@ -1,2 +1,2 @@
-create or replace type ut_reporters_list as table of ut_suite_reporter;
+create or replace type ut_reporters_list as table of ut_reporter;
 /
diff --git a/source/types/ut_suite_reporter.tpb b/source/types/ut_suite_reporter.tpb
diff --git a/source/types/ut_suite_reporter.tps b/source/types/ut_suite_reporter.tps
diff --git a/source/types/ut_test.tpb b/source/types/ut_test.tpb
@@ -30,13 +30,13 @@ create or replace type body ut_test is
                                                                                    teardown.is_valid('teardown'));
   end is_valid;
 
-  overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_suite_reporter) is
-    l_reporter ut_suite_reporter := a_reporter;
+  overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_reporter) is
+    l_reporter ut_reporter := a_reporter;
   begin
     l_reporter := execute(l_reporter);
   end;
-  overriding member function execute(self in out nocopy ut_test, a_reporter ut_suite_reporter) return ut_suite_reporter is
-    l_reporter ut_suite_reporter := a_reporter;
+  overriding member function execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter is
+    l_reporter ut_reporter := a_reporter;
   begin
     if l_reporter is not null then
       l_reporter.begin_test(self);
@@ -100,7 +100,7 @@ create or replace type body ut_test is
   end;
 
   overriding member procedure execute(self in out nocopy ut_test) is
-    l_null_reporter ut_suite_reporter;
+    l_null_reporter ut_reporter;
   begin
     self.execute(l_null_reporter);
   end execute;
diff --git a/source/types/ut_test.tps b/source/types/ut_test.tps
@@ -9,8 +9,8 @@ create or replace type ut_test force under ut_test_object
 
   member function is_valid return boolean,
 
-  overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_suite_reporter),
-  overriding member function execute(self in out nocopy ut_test, a_reporter ut_suite_reporter) return ut_suite_reporter,
+  overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_reporter),
+  overriding member function execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter,
   overriding member procedure execute(self in out nocopy ut_test)
 
 )
diff --git a/source/types/ut_test_object.tps b/source/types/ut_test_object.tps
@@ -3,9 +3,9 @@ create or replace type ut_test_object force under ut_composite_object
   start_time  timestamp with time zone,
   end_time    timestamp with time zone,
   object_name varchar2(32),
-  not instantiable member procedure execute(self in out nocopy ut_test_object, a_reporter ut_suite_reporter),
-  not instantiable member function execute(self in out nocopy ut_test_object, a_reporter ut_suite_reporter)
-    return ut_suite_reporter,
+  not instantiable member procedure execute(self in out nocopy ut_test_object, a_reporter ut_reporter),
+  not instantiable member function execute(self in out nocopy ut_test_object, a_reporter ut_reporter)
+    return ut_reporter,
   not instantiable member procedure execute(self in out nocopy ut_test_object)
 )
 not instantiable not final
diff --git a/source/types/ut_test_suite.tpb b/source/types/ut_test_suite.tpb
@@ -33,15 +33,15 @@ create or replace type body ut_test_suite is
     return l_is_valid;
   end is_valid;
 
-  overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_suite_reporter) is
-    l_reporter ut_suite_reporter := a_reporter;
+  overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_reporter) is
+    l_reporter ut_reporter := a_reporter;
   begin
     l_reporter := execute(l_reporter);
   end;
 
-  overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_suite_reporter)
-    return ut_suite_reporter is
-    l_reporter    ut_suite_reporter := a_reporter;
+  overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
+    return ut_reporter is
+    l_reporter    ut_reporter := a_reporter;
     l_test_object ut_test_object;
   begin
     if l_reporter is not null then
@@ -82,7 +82,7 @@ create or replace type body ut_test_suite is
   end;
 
   overriding member procedure execute(self in out nocopy ut_test_suite) is
-    l_null_reporter ut_suite_reporter;
+    l_null_reporter ut_reporter;
   begin
     self.execute(l_null_reporter);
   end;
diff --git a/source/types/ut_test_suite.tps b/source/types/ut_test_suite.tps
@@ -12,9 +12,9 @@ create or replace type ut_test_suite force under ut_test_object
   member procedure set_suite_teardown(self in out nocopy ut_test_suite, a_object_name in varchar2, a_proc_name in varchar2, a_owner_name varchar2 default null),
   member function is_valid return boolean,
 
-  overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_suite_reporter),
-  overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_suite_reporter)
-    return ut_suite_reporter,
+  overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_reporter),
+  overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
+    return ut_reporter,
   overriding member procedure execute(self in out nocopy ut_test_suite)
 )
 not final
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -20,7 +20,7 @@ drop type ut_composite_reporter;
 
 drop type ut_reporters_list;
 
-drop type ut_suite_reporter force;
+drop type ut_reporter force;
 
 drop type ut_assert_result;
 
diff --git a/source/ut_suite_manager.pkb b/source/ut_suite_manager.pkb
@@ -232,7 +232,7 @@ create or replace package body ut_suite_manager is
   
   end config_schema;
 
-  procedure run_schema_suites(a_owner_name varchar2, a_reporter in out nocopy ut_suite_reporter) is
+  procedure run_schema_suites(a_owner_name varchar2, a_reporter in out nocopy ut_reporter) is
     l_ind   varchar2(4000 char);
     l_suite ut_test_suite;
   begin
@@ -255,20 +255,20 @@ create or replace package body ut_suite_manager is
   
   end run_schema_suites;
 
-  procedure run_schema_suites_static(a_owner_name varchar2, a_reporter in ut_suite_reporter) is
-    l_temp_reported ut_suite_reporter;
+  procedure run_schema_suites_static(a_owner_name varchar2, a_reporter in ut_reporter) is
+    l_temp_reported ut_reporter;
   begin
     l_temp_reported := a_reporter;
     run_schema_suites(a_owner_name, l_temp_reported);
   end run_schema_suites_static;
 
-  procedure run_cur_schema_suites(a_reporter in out nocopy ut_suite_reporter) is
+  procedure run_cur_schema_suites(a_reporter in out nocopy ut_reporter) is
   begin
     run_schema_suites(sys_context('userenv', 'current_schema'), a_reporter);
   end run_cur_schema_suites;
 
-  procedure run_cur_schema_suites_static(a_reporter in ut_suite_reporter) is
-    l_temp_reported ut_suite_reporter;
+  procedure run_cur_schema_suites_static(a_reporter in ut_reporter) is
+    l_temp_reported ut_reporter;
   begin
     l_temp_reported := a_reporter;
     run_schema_suites(sys_context('userenv', 'current_schema'), l_temp_reported);
diff --git a/source/ut_suite_manager.pks b/source/ut_suite_manager.pks
@@ -4,13 +4,13 @@ create or replace package ut_suite_manager is
 
   procedure config_schema(a_owner_name varchar2);
 
-  procedure run_schema_suites(a_owner_name varchar2, a_reporter in out nocopy ut_suite_reporter);
+  procedure run_schema_suites(a_owner_name varchar2, a_reporter in out nocopy ut_reporter);
 
-  procedure run_schema_suites_static(a_owner_name varchar2, a_reporter in ut_suite_reporter);
+  procedure run_schema_suites_static(a_owner_name varchar2, a_reporter in ut_reporter);
 
-  procedure run_cur_schema_suites(a_reporter in out nocopy ut_suite_reporter);
+  procedure run_cur_schema_suites(a_reporter in out nocopy ut_reporter);
 
-  procedure run_cur_schema_suites_static(a_reporter in ut_suite_reporter);
+  procedure run_cur_schema_suites_static(a_reporter in ut_reporter);
 
 end ut_suite_manager;
 /

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-create or replace type ut_dbms_output_suite_reporter force under ut_suite_reporter`
	`1`	`+create or replace type ut_dbms_output_suite_reporter force under ut_reporter`
`2`	`2`	`(`
`3`	`3`
`4`	`4`	`constructor function ut_dbms_output_suite_reporter return self as result,`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-create or replace type ut_reporter_decorator under ut_suite_reporter`
	`1`	`+create or replace type ut_reporter_decorator under ut_reporter`
`2`	`2`	`(`
`3`		`- decorated_reporter ut_suite_reporter,`
	`3`	`+ decorated_reporter ut_reporter,`
`4`	`4`
`5`		`- constructor function ut_reporter_decorator(a_decorated_reporter ut_suite_reporter) return self as result,`
`6`		`- member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_suite_reporter)`
	`5`	`+ constructor function ut_reporter_decorator(a_decorated_reporter ut_reporter) return self as result,`
	`6`	`+ member procedure init(self in out nocopy ut_reporter_decorator, a_decorated_reporter ut_reporter)`
`7`	`7`
`8`	`8`	`) not final not instantiable`
`9`	`9`	`/`