addressed comments

Pazus · Pazus · commit f2ca323ad13c · 2017-07-01T22:20:52.000+03:00
fixed additional recent tests
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -84,7 +84,7 @@ create or replace package body ut_suite_manager is
         l_suite_name         := l_annotation_data.package_annotations('suite').text;
       end if;
 
-      if l_annotation_data.package_annotations.exists('suitepath') and trim(l_annotation_data.package_annotations('suitepath').text) is not null then
+      if l_annotation_data.package_annotations.exists('suitepath') and l_annotation_data.package_annotations('suitepath').text is not null then
         l_suite_path := l_annotation_data.package_annotations('suitepath').text || '.' || lower(l_object_name);
       end if;
 
diff --git a/tests/ut_annotations/ut_annotations.parse_package_annotations.spaceBeforeAnnotationParams.sql b/tests/ut_annotations/ut_annotations.parse_package_annotations.spaceBeforeAnnotationParams.sql
@@ -21,8 +21,6 @@ END;';
   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_ann_param := null;
diff --git a/tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql b/tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql
@@ -17,9 +17,16 @@ set termout on
 
 declare
   l_objects_to_run ut_suite_items;
+  l_suite          ut_suite;
 begin
   --act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with$dollar'));
+  
+  --Assert
+  ut.expect(l_objects_to_run.count).to_equal(1);
+
+  l_suite := treat(l_objects_to_run(1) as ut_suite);
+  ut.expect(l_suite.name).to_equal('tst_package_with$dollar');
  
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
diff --git a/tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql b/tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql
@@ -17,11 +17,18 @@ set termout on
 
 declare
   l_objects_to_run ut_suite_items;
+  l_suite          ut_suite;
 begin
 
   --act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with#hash'));
   
+  --Assert
+  ut.expect(l_objects_to_run.count).to_equal(1);
+
+  l_suite := treat(l_objects_to_run(1) as ut_suite);
+  ut.expect(l_suite.name).to_equal('tst_package_with#hash');  
+  
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
   end if;
diff --git a/tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql b/tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql
@@ -9,17 +9,30 @@ end;
 
 create or replace package body tst_package_with_dollar_test as
   procedure test$1 is begin ut.expect(1).to_equal(1); end;
-  procedure test$2 is begin ut.expect(1).to_equal(1); end;
 end;
 /
 
 set termout on
 
 declare
   l_objects_to_run ut_suite_items;
+  l_suite          ut_suite;
+  l_test           ut_test;
 begin
   --act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_dollar_test.test$1'));
+  
+  --Assert
+  ut.expect(l_objects_to_run.count).to_equal(1);
+
+  l_suite := treat(l_objects_to_run(1) as ut_suite);
+
+  ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test');
+  ut.expect(l_suite.items.count).to_equal(1);
+
+  l_test := treat(l_suite.items(1) as ut_test);
+
+  ut.expect(l_test.name).to_equal('test$1');
     
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
diff --git a/tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql b/tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql
@@ -9,18 +9,31 @@ end;
 
 create or replace package body tst_package_with_hash_test as
   procedure test#1 is begin ut.expect(1).to_equal(1); end;
-  procedure test#2 is begin ut.expect(1).to_equal(1); end;
 end;
 /
 
 set termout on
 
 declare
   l_objects_to_run ut_suite_items;
+  l_suite          ut_suite;
+  l_test           ut_test;
 begin
 
   --act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_hash_test.test#1'));
+  
+  --Assert
+  ut.expect(l_objects_to_run.count).to_equal(1);
+
+  l_suite := treat(l_objects_to_run(1) as ut_suite);
+
+  ut.expect(l_suite.name).to_equal('tst_package_with_hash_test');
+  ut.expect(l_suite.items.count).to_equal(1);
+
+  l_test := treat(l_suite.items(1) as ut_test);
+
+  ut.expect(l_test.name).to_equal('test#1');
 
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
diff --git a/tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql b/tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql
@@ -4,23 +4,31 @@ create or replace package tst_empty_suite_path as
   --%suitepath
 
   --%test
-  procedure test#1;
+  procedure test1;
 end;
 /
 
 create or replace package body tst_empty_suite_path as
-  procedure test#1 is begin ut.expect(1).to_equal(1); end;
+  procedure test1 is begin ut.expect(1).to_equal(1); end;
 end;
 /
 
 set termout on
 
 declare
   l_objects_to_run ut_suite_items;
+  l_suite          ut_suite;
 begin
 
   --act
   l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_empty_suite_path'));
+  
+  --Assert
+  ut.expect(l_objects_to_run.count).to_equal(1);
+
+  l_suite := treat(l_objects_to_run(1) as ut_suite);
+
+  ut.expect(l_suite.name).to_equal('tst_empty_suite_path');
 
   if ut_expectation_processor.get_status = ut_utils.tr_success then
     :test_result := ut_utils.tr_success;
