formatting changes

Pazus · Pazus · commit b2adb7f00092 · 2017-01-07T13:05:24.000+03:00
changed listener way of calling reporters
diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps
@@ -11,12 +11,12 @@ create or replace type ut_executable force as object
   member function is_valid return boolean,
   member function is_defined return boolean,
   member function form_name return varchar2,
-	member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface),
+  member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface),
   /**
   * executes the defines executable
   * returns true if executed without exceptions
   * returns false if exceptions were raised
   */
-	member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface) return boolean
+  member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface) return boolean
 ) final
 /
diff --git a/source/core/types/ut_execution_listener.tpb b/source/core/types/ut_execution_listener.tpb
@@ -7,29 +7,29 @@ create or replace type body ut_execution_listener is
   end;
 
   overriding member procedure fire_before_event(self in out nocopy ut_execution_listener, a_event_name varchar2, a_item ut_suite_item) is
-    begin
-      self.fire_event('before', a_event_name, a_item);
-    end;
+  begin
+    self.fire_event('before', a_event_name, a_item);
+  end;
 
   overriding member procedure fire_after_event(self in out nocopy ut_execution_listener, a_event_name varchar2, a_item ut_suite_item) is
-    begin
-      self.fire_event('after', a_event_name, a_item);
-    end;
+  begin
+    self.fire_event('after', a_event_name, a_item);
+  end;
 
   overriding member procedure fire_event(self in out nocopy ut_execution_listener, a_event_timing varchar2, a_event_name varchar2, a_item ut_suite_item) is
-      l_method varchar2(250) := a_event_timing||'_calling_'||a_event_name;
-    begin
-      execute immediate
-        'declare ' || chr(10) ||
-        '  l_listener ut_execution_listener := :a_listener;'  || chr(10) ||
-        'begin ' || chr(10) ||
-        '  for i in 1 .. l_listener.reporters.count loop' || chr(10) ||
-        '      l_listener.reporters(i).'||l_method||'( :a_item );' || chr(10) ||
-        '  end loop;' || chr(10) ||
-        '  :a_result := l_listener;' || chr(10) ||
-        'end;'
-      using in self, in a_item, out self;
-    end;
+    l_method varchar2(250) := a_event_timing||'_calling_'||a_event_name;
+    l_reporter ut_reporter;
+    l_call_stmt varchar2(32767 byte);
+  begin
+    l_call_stmt := 'begin :a_reporter.'||l_method||'( :a_item ); end;';
+    
+    for i in 1..self.reporters.count loop
+      l_reporter := self.reporters(i);
+      execute immediate l_call_stmt using in out l_reporter, in a_item;
+      self.reporters(i) := l_reporter;
+    end loop;
+
+  end;
 
 end;
 /
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -30,16 +30,16 @@ create or replace type body ut_suite as
     l_item_index   pls_integer := self.items.first;
     c_lowered_name constant varchar2(4000 char) := lower(trim(a_name));
     l_result       pls_integer;
-    begin
-      while l_item_index is not null loop
-        if self.items(l_item_index).name = c_lowered_name then
-          l_result := l_item_index;
-          exit;
-        end if;
-        l_item_index := self.items.next(l_item_index);
-      end loop;
-      return l_result;
-    end item_index;
+  begin
+    while l_item_index is not null loop
+      if self.items(l_item_index).name = c_lowered_name then
+        l_result := l_item_index;
+        exit;
+      end if;
+      l_item_index := self.items.next(l_item_index);
+    end loop;
+    return l_result;
+  end item_index;
 
   member procedure add_item(self in out nocopy ut_suite, a_item ut_suite_item) is
   begin
@@ -129,19 +129,19 @@ create or replace type body ut_suite as
 
   member procedure calc_execution_result(self in out nocopy ut_suite) is
     l_result integer(1);
-    begin
-      if self.items is not null and self.items.count > 0 then
-        l_result := ut_utils.tr_ignore;
-        for i in 1 .. self.items.count loop
-          l_result := greatest(self.items(i).result, l_result);
-          exit when l_result = ut_utils.tr_error;
-        end loop;
-      else
-        l_result := ut_utils.tr_success;
-      end if;
+  begin
+    if self.items is not null and self.items.count > 0 then
+      l_result := ut_utils.tr_ignore;
+      for i in 1 .. self.items.count loop
+        l_result := greatest(self.items(i).result, l_result);
+        exit when l_result = ut_utils.tr_error;
+      end loop;
+    else
+      l_result := ut_utils.tr_success;
+    end if;
 
-      self.result := l_result;
-    end;
+    self.result := l_result;
+  end;
 
 end;
 /
