Merge branch 'develop' into feature/add_version_check

jgebal · web-flow · commit 3b7c40cc7fa8 · 2017-08-22T13:35:09.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ addons:
     branches:
       - develop
       - master
-      - feature/using_released_to_test_develop
 
 services:
   - docker
@@ -67,7 +66,7 @@ before_install:
   - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
   # download latest utPLSQL release
   #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
-  - git clone --depth=1 --branch=develop https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
+  - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
   # download utPLSQL-cli develop
   - curl -Lk -o utPLSQL-cli.zip https://bintray.com/viniciusam/utPLSQL-cli/download_file?file_path=utPLSQL-cli-develop-test3.zip
 
diff --git a/test/ut_annotations/test_annotations.pkb b/test/ut_annotations/test_annotations.pkb
@@ -510,5 +510,70 @@ END;';
     check_annotation_parsing(l_expected, l_parsing_result);
   end;
 
+  procedure test_windows_newline
+  as
+    l_source clob;
+    l_parsing_result ut3.ut_annotations.typ_annotated_package;
+    l_expected ut3.ut_annotations.typ_annotated_package;
+    l_ann_param ut3.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 := ut3.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 ut3.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);
+  end;
+
+  procedure test_annot_very_long_name
+  as
+    l_source clob;
+    l_parsing_result ut3.ut_annotations.typ_annotated_package;
+    l_expected ut3.ut_annotations.typ_annotated_package;
+    l_ann_param ut3.ut_annotations.typ_annotation_param;
+  begin
+    l_source := 'PACKAGE test_tt AS
+      -- %suite
+      -- %displayname(Name of suite)
+      -- %suitepath(all.globaltests)
+    
+      --%test
+      procedure very_long_procedure_name_valid_for_oracle_12_so_utplsql_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_ditit;
+    END;';
+    
+    --Act
+    l_parsing_result := ut3.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 ut3.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;
+  
+    l_expected.procedure_annotations(1).name := 'very_long_procedure_name_valid_for_oracle_12_so_utplsql_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_ditit';
+    l_expected.procedure_annotations(1).annotations('test').params := cast( null as ut3.ut_annotations.tt_annotation_params);
+  
+    check_annotation_parsing(l_expected, l_parsing_result);
+  end;
+
+
 end test_annotations;
 /
diff --git a/test/ut_annotations/test_annotations.pks b/test/ut_annotations/test_annotations.pks
@@ -36,5 +36,11 @@ create or replace package test_annotations is
   --%test(Test space before annotation params)
   procedure test_space_Before_Annot_Params;
 
+  -- %test(Test annotations with windows newline)
+  procedure test_windows_newline;
+
+  -- %test(Test annotation function with very long name)
+  procedure test_annot_very_long_name;
+
 end test_annotations;
 /
