Merge branch 'develop' of github.com:utPLSQL/utPLSQL into feature/enable_throw_variable

lwasylow · lwasylow · commit 02af1ccde003 · 2018-06-01T22:57:52.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -97,6 +97,7 @@ before_script:
 
 script:
   - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
+  - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
   - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
   - bash .travis/build_docs.sh
diff --git a/.travis/validate_report_files.sh b/.travis/validate_report_files.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+echo "validate html" 
+
+HTML_FILENAME="coverage.html"
+#Exclude existing issue with OL nested in PRE
+EXCLUSION_REGEX=".*Element\s.?ol.?\snot\sallowed\sas\schild\sof\selement\s.?pre.*"
+HTML_VALIDATOR_URL="https://validator.w3.org/nu/"
+VALIDATOR_OUT="gnu"
+WARNING_REGEX="info warning:"
+ERROR_REGEX="error:"
+
+VALIDATION_RESULTS=$(curl -H "Content-Type: text/html; charset=utf-8" --data-binary @$HTML_FILENAME "$HTML_VALIDATOR_URL?out=$VALIDATOR_OUT&filterpattern=$EXCLUSION_REGEX")
+
+ERROR_COUNT=`echo "$VALIDATION_RESULTS" | grep -c "$ERROR_REGEX"`
+WARNING_COUNT=`echo "$VALIDATION_RESULTS" | grep -c "$WARNING_REGEX"`
+
+echo "There are $ERROR_COUNT errors, $WARNING_COUNT warning  in $HTML_FILENAME"
+
+if [ $ERROR_COUNT -gt 0 ]; then
+ echo "$VALIDATION_RESULTS" | grep "$ERROR_REGEX"
+ exit 1
+else
+ exit 0
+fi
diff --git a/docs/userguide/install.md b/docs/userguide/install.md
@@ -70,7 +70,7 @@ cd source
 sqlplus sys/sys_pass@db as sysdba @install_headless.sql utp3 my_verySecret_password utp3_tablespace   
 ```
 
-The script needs to be executed by SYSDBA, in order to grant access to DBMS_LOCK system package.
+The script needs to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages.
 
 
 # Recommended Schema
@@ -88,7 +88,7 @@ If the installation and utPLSQL owner user is one and the same, the user must ha
   - CREATE SYNONYM
   - ALTER SESSION
   
-In addition the user must be granted the execute privilege on `DBMS_LOCK` package.
+In addition the user must be granted the execute privilege on `DBMS_LOCK` and `DBMS_CRYPTO` packages.
     
 utPLSQL is using [DBMS_PROFILER tables](https://docs.oracle.com/cd/E18283_01/appdev.112/e16760/d_profil.htm#i999476) for code coverage. The tables required by DBMS_PROFILER will be created in the installation schema unless they already exist.
 The uninstall process will **not** drop profiler tables, as they can potentially be shared and reused for profiling PLSQL code.
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -437,28 +437,29 @@ procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab,
   procedure save_dbms_output_to_cache is
     l_status number;
     l_line   varchar2(32767);
-    l_line_no integer := 1;
+    l_offset integer := 0;
     l_lines  ut_varchar2_rows := ut_varchar2_rows();
     c_lines_limit constant integer := 100;
     pragma autonomous_transaction;
 
-    procedure flush_lines is
+    procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is
     begin
       insert into ut_dbms_output_cache (seq_no,text)
-        select rownum, column_value
-        from table(l_lines);
-      l_lines.delete;
+        select rownum+a_offset, column_value
+        from table(a_lines);
     end;
   begin
     loop
       dbms_output.get_line(line => l_line, status => l_status);
       exit when l_status = 1;
       l_lines := l_lines multiset union all ut_utils.convert_collection(ut_utils.clob_to_table(l_line||chr(7),4000));
       if l_lines.count > c_lines_limit then
-        flush_lines();
+        flush_lines(l_lines, l_offset);
+        l_offset := l_offset + l_lines.count;
+        l_lines.delete;
       end if;
     end loop;
-    flush_lines();
+    flush_lines(l_lines, l_offset);
     commit;
   end;
 
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.2.1939-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.2.1964-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);
diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb
@@ -241,7 +241,7 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a
                    '<span class="' ||line_hits_css_class(executions_per_line(a_coverage.executions
                                                              ,a_coverage.uncovered_lines + a_coverage.covered_lines)) || '">' ||
                       executions_per_line(a_coverage.executions, a_coverage.uncovered_lines + a_coverage.covered_lines)
-                     || '</span></span> hits/line)</h2>' || '<a name="' || l_id || '"></a>' || '<div><b>' ||
+                     || '</span></span> hits/line)</h2>' || '<a id="a_' || l_id || '"></a>' || '<div><b>' ||
                       a_coverage.objects.count || '</b> files in total. </div><div>' || '<b>' || 
                       (a_coverage.uncovered_lines + a_coverage.covered_lines)
                    || '</b> relevant lines. ' || '<span class="green"><b>' || a_coverage.covered_lines ||
@@ -306,9 +306,9 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a
     --TODO - build main file containing total run data and per schema data
     l_file_part := '<!DOCTYPE html><html xmlns=''http://www.w3.org/1999/xhtml''><head>' || '<title>' || l_title ||
                    '</title>' || '<meta http-equiv="content-type" content="text/html; charset=utf-8" />' ||
-                   '<script src=''' || a_assets_path || 'application.js'' type=''text/javascript''></script>' ||
+                   '<script src=''' || a_assets_path || 'application.js''></script>' ||
                    '<link href=''' || a_assets_path ||
-                   'application.css'' media=''screen, projection, print'' rel=''stylesheet'' type=''text/css''>' ||
+                   'application.css'' media=''screen, print'' rel=''stylesheet'' type=''text/css''/>' ||
                    '<link rel="shortcut icon" type="image/png" href="' || a_assets_path || 'favicon_' ||
                    coverage_css_class(l_coverage_pct) || '.png" />' || '<link rel="icon" type="image/png" href="' ||
                    a_assets_path || 'favicon_' || coverage_css_class(l_coverage_pct) || '.png" />' || '</head>' ||
@@ -339,7 +339,7 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a
       l_unit := a_coverage_data.objects.next(l_unit);
     end loop;
   
-    l_file_part := '</div></div></body></html>';
+    l_file_part := '</div></div></div></body></html>';
   
     ut_utils.append_to_clob(l_result, l_file_part);
     return l_result;
diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb
@@ -180,25 +180,35 @@ end;';
   procedure run_keep_dbms_output_buffer is
     l_expected         dbmsoutput_linesarray;
     l_actual           dbmsoutput_linesarray;
-    l_lines            number := 100;
+    l_results          ut3.ut_varchar2_list;
+    l_lines            number := 10000;
   begin
     --Arrange
     create_test_spec();
     create_test_body(0);
+
     l_expected := dbmsoutput_linesarray(
         'A text placed into DBMS_OUTPUT',
         'Another line',
         lpad('A very long line',10000,'a')
     );
-    dbms_output.put_line(l_expected(1));
-    dbms_output.put_line(l_expected(2));
-    dbms_output.put_line(l_expected(3));
+    for i in 1 .. 300 loop
+      l_expected.extend;
+      l_expected(l_expected.last) := 'line '||i;
+    end loop;
+
+    for i in 1 .. l_expected.count loop
+      dbms_output.put_line(l_expected(i));
+    end loop;
+
     --Act
-    ut3.ut.run('test_cache');
+    select *
+      bulk collect into l_results
+      from table(ut3.ut.run('test_cache'));
 
     --Assert
     dbms_output.get_lines(lines => l_actual, numlines => l_lines);
-    for i in 1 .. l_expected.count loop
+    for i in 1 .. l_lines loop
       ut.expect(l_actual(i)).to_equal(l_expected(i));
     end loop;
     drop_test_package();

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.2.1939-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.2.1964-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`