Merge branch 'develop' into feature/sonar_test_reporter_fix

Pazus · web-flow · commit e8d592346db8 · 2017-08-05T10:44:47.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,7 @@ before_script:
 script:
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples_and_tests.sh; fi
-  - if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then sonar-scanner; 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
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/push_release_version.sh; fi
diff --git a/readme.md b/readme.md
@@ -73,7 +73,7 @@ select * from table(ut.run());
 
 The above commands will run all the suites in the current schema and provide report to dbms_output or as a select statement.
 
-# Command lien clients
+# Command line clients
 
 To have more control over how the tests are invoked, use one of the utPLSQL command line clients: [utPLSQL-sql-cli](https://github.com/utPLSQL/utPLSQL-sql-cli) or [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli).
 
diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb
@@ -128,7 +128,7 @@ create or replace package body ut_metadata as
      -- we fetch the source explicitly as dbms_preprocessor is very sow on 12.1 and 12.2 when grabbing the sources.
      l_lines := sys.dbms_preprocessor.get_post_processed_source(l_lines);
      for i in 1..l_lines.count loop
-       ut_utils.append_to_clob(l_source, l_lines(i));
+       ut_utils.append_to_clob(l_source, replace(l_lines(i), chr(13)||chr(10), chr(10)));
      end loop;
     return l_source;
   end;
diff --git a/tests/RunAll.sql b/tests/RunAll.sql
@@ -49,6 +49,7 @@ exec ut_coverage.coverage_start_develop();
 @@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParsePackageLevelAnnotationWithKeyValue.sql
 @@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParsePackageLevelAnnotationWithMultilineComment.sql
 @@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.spaceBeforeAnnotationParams.sql
+@@lib/RunTest.sql ut_annotations/ut_annotations.parse_package_annotations.ParseAnnotationWithWindowsNewline.sql
 @@lib/RunTest.sql ut_expectation_processor/who_called_expectation.parseStackTrace.sql
 @@lib/RunTest.sql ut_expectation_processor/who_called_expectation.parseStackTraceWith0x.sql
 @@ut_expectations/ut.expect.not_to_be_null.sql
diff --git a/tests/ut_annotations/ut_annotations.parse_package_annotations.ParseAnnotationWithWindowsNewline.sql b/tests/ut_annotations/ut_annotations.parse_package_annotations.ParseAnnotationWithWindowsNewline.sql
@@ -0,0 +1,37 @@
+PROMPT Parse package level annotations with windows newline
+
+--Arrange
+declare
+  l_source clob;
+  l_parsing_result ut_annotations.typ_annotated_package;
+  l_expected ut_annotations.typ_annotated_package;
+  l_ann_param ut_annotations.typ_annotation_param;
+
+begin
+  l_source := 'PACKAGE test_tt AS
+  -- %suite
+  -- %displayname(Name of suite)' || chr(13) || chr(10) 
+|| '  -- %suitepath(all.globaltests)
+END;';
+
+--Act
+  l_parsing_result := ut_annotations.parse_package_annotations(l_source);
+
+--Assert
+  l_ann_param := null;
+  l_ann_param.val := 'Name of suite';
+  l_expected.package_annotations('suite').params := cast( null as ut_annotations.tt_annotation_params);
+  l_expected.package_annotations('displayname').params(1) := l_ann_param;
+
+  l_ann_param := null;
+  l_ann_param.val := 'all.globaltests';
+  l_expected.package_annotations('suitepath').params(1) := l_ann_param;
+
+  check_annotation_parsing(l_expected, l_parsing_result);
+
+  if ut_expectation_processor.get_status = ut_utils.tr_success then
+    :test_result := ut_utils.tr_success;
+  end if;
+
+end;
+/
