Merge branch 'develop' into feature/color_reporter

jgebal · jgebal · commit 517245f7a3ce · 2017-01-18T18:24:49.000Z
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@
 .idea/
 site/
 pages/
+release/
+*.gz
+*.zip
diff --git a/.travis.yml b/.travis.yml
@@ -58,10 +58,23 @@ script:
   - bash .travis/run_examples_as_owner.sh
   - bash .travis/run_test_as_owner.sh
   - bash .travis/run_examples_as_user.sh
+  - bash .travis/create_release.sh
 #  - bash .travis/run_test_as_user.sh
 #  - bash .travis/build_docs.sh
 #  - bash .travis/push_docs_to_gh_pages.sh
 
+deploy:
+  provider: releases
+  api_key: $github_api_token
+  file: 
+     - utPLSQL$TRAVIS_TAG.zip
+     - utPLSQL$TRAVIS_TAG.tar.gz
+  skip_cleanup: true
+  on:
+     repo: utPLSQL/utPLSQL
+     tags: true
+
 notifications:
   slack: utplsql:oiMuXO95TvKeAUENuDt4cPrB
 
+
diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
+# Change working directory to script directory
+cd "${0%/*}"
+# Change back to root
+cd ..
 mkdocs build --clean --strict
diff --git a/.travis/create_release.sh b/.travis/create_release.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Change working directory to script directory
+cd "${0%/*}"
+chmod +x ./build_docs.sh
+chmod +x ./create_release_archive.sh
+./build_docs.sh
+./create_release_archive.sh
diff --git a/.travis/create_release_archive.sh b/.travis/create_release_archive.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Change working directory to script directory
+cd "${0%/*}"
+# Change back to root
+cd ..
+# Remove old release directory (Typically only on developer machine)
+rm -rf release
+# Create needed directories
+mkdir -p release/docs/html
+mkdir release/docs/markdown
+mkdir release/source
+# Copy files to various directories
+cp -r docs release/docs/markdown
+cp -r site release/docs/html 
+cp -r source release/source
+cp -r examples release/examples
+cp -r readme.md release/ 
+cp -r LICENSE release/
+cp -r authors.md release/
+cp -r CONTRIBUTING.md release/
+cd release
+#Although the $TRAVIS_TAG versions are the only one used.  They are conditional,
+#and we want the process always run to insure we don't have problems with building archive
+#when we finally tag a release
+zip -r ../utPLSQL.zip *
+tar -zcvf ../utPLSQL.tar.gz *
+#Name of archive will match tag name for a release.
+if [ -n "$TRAVIS_TAG" ]; then 
+cd ..
+cp utPLSQL.zip utPLSQL$TRAVIS_TAG.zip
+cp utPLSQL.tar.gz utPLSQL$TRAVIS_TAG.tar.gz
+fi
diff --git a/readme.md b/readme.md
@@ -1,12 +1,15 @@
 #utPLSQL v3<sub><sup> | Powerful PL/SQL Unit Testing Framework </sup></sub>
-[![chat](http://img.shields.io/badge/version_status-pre--alpha-blue.svg)](http://utplsql-slack-invite.herokuapp.com/)
-[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/version3.svg?label=version3%20build)](https://travis-ci.org/utPLSQL/utPLSQL)
-[![license](http://img.shields.io/badge/license-apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
+[![chat](http://img.shields.io/badge/version_status-alpha-blue.svg)](http://utplsql-slack-invite.herokuapp.com/)
+[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/master.svg?label=master%20branch)](https://travis-ci.org/utPLSQL/utPLSQL)
+[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/develop.svg?label=develop%20branch)](https://travis-ci.org/utPLSQL/utPLSQL)
+
+[![license](http://img.shields.io/badge/license-apache%202.0-blue.svg)]
+(https://www.apache.org/licenses/LICENSE-2.0)
 [![chat](http://img.shields.io/badge/chat-slack-blue.svg)](http://utplsql-slack-invite.herokuapp.com/)
 [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL)
 
 ----------
-Version 3 is a complete rewrite of utPLSQL from scratch.  Version 2 still supports older versions of Oracle that are no longer available.   This has lead to difficult to maintain code.  Yet many developers wanted to take it to the next level.  The community that had developed on GitHub, decided that a new internal architecture was needed, from that version 3 was born.  Currently version 3 is not complete and is not ready for a production environment as the API is not stable and changing.   However it is quickly taking shape.  We welcome new developers to join our community and help utPLSQL grow.
+Version 3 is a complete rewrite of utPLSQL from scratch.  [Version 2](https://github.com/utPLSQL/utPLSQL/tree/version2) still supports older versions of Oracle that are no longer available.   This has lead to difficult to maintain code.  Yet many developers wanted to take it to the next level.  The community that had developed on GitHub, decided that a new internal architecture was needed, from that version 3 was born.  Currently version 3 is not complete and is not ready for a production environment as the API is not stable and changing.   However it is quickly taking shape.  We welcome new developers to join our community and help utPLSQL grow.
 
 Primary Goals:
  - Easier to maintain 
@@ -19,6 +22,11 @@ Primary Goals:
  - Easily called from current PL/SQL development tools
  - More permissive License to allow vendors easier ability to integrate utPLSQL. 
 
+__Download__
+
+Published releases are available for download on the [utPLSQL GitHub Releases Page.](https://github.com/utPLSQL/utPLSQL/releases)
+
+
 __Version 2 to Version 3 Comparison__
 
 The following table is a work in progress right now, and **will** change.   If you have great idea that you would like to see in version 3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [Slack chat rooms](http://utplsql-slack-invite.herokuapp.com/).  
diff --git a/source/core/types/ut_assert_result.tpb b/source/core/types/ut_assert_result.tpb
@@ -59,13 +59,13 @@ create or replace type body ut_assert_result is
 
       if self.result != ut_utils.tr_success then
         if self.actual_value_string is not null or self.actual_type is not null then
-          l_actual_val_msg := '  expected (actual value): ';
+          l_actual_val_msg := '  expected this: ';
           l_actual_val := self.actual_value_string || '(' || self.actual_type || ')';
         end if;
 
-        l_expected_msg := '  '||self.matcher_name || self.additional_info;
+        l_expected_msg := '  ' || self.matcher_name || self.additional_info;
         if self.expected_value_string is not null or self.expected_type is not null then
-          l_expected_msg := l_expected_msg || ' (expected value): ';
+          l_expected_msg := l_expected_msg || ': ';
           l_expected_val := self.expected_value_string||'('||self.expected_type||')';
           if length(l_expected_msg) > length(l_actual_val_msg) then
             l_actual_val_msg := rpad(l_actual_val_msg , length(l_expected_msg));
diff --git a/source/core/ut_annotations.pkb b/source/core/ut_annotations.pkb
diff --git a/source/core/ut_annotations.pks b/source/core/ut_annotations.pks
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -411,6 +411,8 @@ create or replace package body ut_suite_manager is
     for i in 1 .. l_paths.count loop
       l_path   := l_paths(i);
       l_schema := regexp_substr(l_path, '^(\w+)(\.|:|$)', 1, 1, null, 1);
+      
+      l_schema := sys.dbms_assert.schema_name(upper(l_schema));
 
       l_schema_suites := get_schema_suites(upper(l_schema));
 
@@ -434,6 +436,11 @@ create or replace package body ut_suite_manager is
             l_procedure_name := regexp_substr(l_path, '^\w+\.(\w+)(\.(\w+))?$', subexpression => 3);
 
             l_temp_suite := config_package(l_schema, l_package_name);
+            
+            if l_temp_suite is null then
+              raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_package_name|| ' not found');
+            end if;
+            
             l_path       := rtrim(l_schema || ':' || l_temp_suite.path || '.' || l_procedure_name, '.');
           end;
         end if;
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -49,6 +49,10 @@ create or replace package ut_utils authid definer is
   gc_invalid_path_format constant pls_integer := -20202;
   pragma exception_init(ex_invalid_path_format, -20202);
   
+  ex_suite_package_not_found exception;
+  gc_suite_package_not_found constant pls_integer := -20204;
+  pragma exception_init(ex_suite_package_not_found, -20204);
+  
   -- Reporting event time not supported
   ex_invalid_rep_event_time exception;
   gc_invalid_rep_event_time constant pls_integer := -20210;
diff --git a/source/expectations/matchers/ut_be_between.tpb b/source/expectations/matchers/ut_be_between.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_between is
 
   member procedure init(self in out nocopy ut_be_between, a_lower_bound ut_data_value, a_upper_bound ut_data_value) is
   begin
-    self.name            := lower($$plsql_unit);
+    self.name            := 'be between';
     self.lower_bound     := a_lower_bound;
     self.upper_bound     := a_upper_bound;
     self.additional_info := 'between ' || a_lower_bound.to_string || ' and ' || a_upper_bound.to_string;
diff --git a/source/expectations/matchers/ut_be_false.tpb b/source/expectations/matchers/ut_be_false.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_false as
 
   constructor function ut_be_false(self in out nocopy ut_be_false) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be false';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tpb b/source/expectations/matchers/ut_be_greater_or_equal.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_greater_or_equal AS
 
   member procedure init(self in out nocopy ut_be_greater_or_equal, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be greater or equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_greater_than.tpb b/source/expectations/matchers/ut_be_greater_than.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_greater_than AS
 
   member procedure init(self in out nocopy ut_be_greater_than, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be greater than';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_less_or_equal.tpb b/source/expectations/matchers/ut_be_less_or_equal.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_less_or_equal AS
 
   member procedure init(self in out nocopy ut_be_less_or_equal, a_expected ut_data_value) is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be less or equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_less_than.tpb b/source/expectations/matchers/ut_be_less_than.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_less_than as
 
   member procedure init(self in out nocopy ut_be_less_than, a_expected ut_data_value) is
   begin
-    self.name     := lower($$plsql_unit);
+    self.name     := 'be less than';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_be_like.tpb b/source/expectations/matchers/ut_be_like.tpb
@@ -8,7 +8,7 @@ create or replace type body ut_be_like as
        self.additional_info := self.additional_info ||' escape '''||a_escape_char||'''';
      end if;
     end if;
-    self.name        := lower($$plsql_unit);
+    self.name        := 'be like';
     self.mask        := a_mask;
     self.escape_char := a_escape_char;
     return;
diff --git a/source/expectations/matchers/ut_be_not_null.tpb b/source/expectations/matchers/ut_be_not_null.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_not_null as
 
   constructor function ut_be_not_null(self in out nocopy ut_be_not_null) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be not null';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_null.tpb b/source/expectations/matchers/ut_be_null.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_null as
 
   constructor function ut_be_null(self in out nocopy ut_be_null) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be null';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_be_true.tpb b/source/expectations/matchers/ut_be_true.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_be_true as
 
   constructor function ut_be_true(self in out nocopy ut_be_true) return self as result is
   begin
-    self.name := lower($$plsql_unit);
+    self.name := 'be true';
     return;
   end;
 
diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb
@@ -3,7 +3,7 @@ create or replace type body ut_equal as
   member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean) is
   begin
     self.nulls_are_equal_flag := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_assert_processor.nulls_are_equal()) );
-    self.name := lower($$plsql_unit);
+    self.name := 'equal';
     self.expected := a_expected;
   end;
 
diff --git a/source/expectations/matchers/ut_match.tpb b/source/expectations/matchers/ut_match.tpb
@@ -8,7 +8,7 @@ create or replace type body ut_match as
        self.additional_info := self.additional_info ||', modifiers '''||a_modifiers||'''';
      end if;
     end if;
-    self.name      := lower($$plsql_unit);
+    self.name      := 'match';
     self.pattern   := a_pattern;
     self.modifiers := a_modifiers;
     return;
diff --git a/source/install.sql b/source/install.sql
@@ -48,8 +48,8 @@ whenever oserror exit failure rollback
 @@core/types/ut_reporters.tps
 @@core/types/ut_event_listener.tps
 --annoations
-@@core/annotations/ut_annotations.pks
-@@core/annotations/ut_annotations.pkb
+@@core/ut_annotations.pks
+@@core/ut_annotations.pkb
 
 --suite manager
 @@core/ut_suite_manager.pks

-Original file line number
+Diff line change
 .idea/
 site/
 pages/
 +release/
 +*.gz
 +*.zip