Merge pull request #33 from BallAerospace/bugfix/27-dont-destroy-cust…

…omtestsuite #27 Don't clear CustomTestSuite in build_test_suites. Fix bug in result...
BallAerospace · Feb 2, 2015 · ecced16 · ecced16
2 parents 613152c + b81f8fd
commit ecced16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/demo/procedures/example_test.rb b/demo/procedures/example_test.rb
@@ -11,9 +11,6 @@ def setup
     wait(2)
   end
 
-
-
-
   # test_1 verifies requirement 1
   def test_case_with_long_name_1
     puts "Running test_1"

diff --git a/lib/cosmos/tools/test_runner/results_writer.rb b/lib/cosmos/tools/test_runner/results_writer.rb
@@ -94,7 +94,7 @@ def process_result(results)
           @file.puts "  Exceptions:"
           result.exceptions.each_with_index do |error, index|
             error.formatted(true).each_line do |line|
-              break if line =~ /cosmos_test.rb/
+              break if line =~ /test_runner\/test.rb/
               next  if line =~ cosmos_lib
               if line =~ /[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F-\xFF]/
                 line.chomp!

diff --git a/lib/cosmos/tools/test_runner/test_runner.rb b/lib/cosmos/tools/test_runner/test_runner.rb
@@ -1033,9 +1033,10 @@ def build_test_suites
       end
 
       # Build list of TestSuites and Tests
-      @@test_suites = []
+      @@test_suites = @@test_suites.select {|my_suite| my_suite.name == 'Cosmos::CustomTestSuite'}
       tests         = []
       ObjectSpace.each_object(Class) do |object|
+        next if object.name == 'Cosmos::CustomTestSuite'
         if (object.ancestors.include?(TestSuite) &&
             object != TestSuite &&
             !ignored_test_suite_classes.include?(object))
@@ -1125,7 +1126,7 @@ def build_test_suites
             end
           end
         end
-        @@suites[suite.name.split('::')[-1]] = cur_suite
+        @@suites[suite.name.split('::')[-1]] = cur_suite unless suite.name == 'Cosmos::CustomTestSuite'
       end
       Qt.execute_in_main_thread(true) { @test_runner_chooser.test_suites = @@suites }
     end