Moves warning about invalid targets into 'invalid_targets' in result

test/analyzer/gyptest-analyzer.py

 #!/usr/bin/env python
 # Copyright (c) 2014 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tests for analyzer
 """
 
 import json
 import TestGyp
@@ skipping 58 matching lines @@
   test.run_gyp('test4.gyp', *args, **kw)
 
 
 def EnsureContains(targets=set(), matched=False, build_targets=set()):
   """Verifies output contains |targets|."""
   result = _ReadOutputFileContents()
   if result.get('error', None):
     print 'unexpected error', result.get('error')
     test.fail_test()
 
-  if result.get('warning', None):
-    print 'unexpected warning', result.get('warning')
+  if result.get('invalid_targets', None):
+    print 'unexpected invalid_targets', result.get('invalid_targets')
     test.fail_test()
 
   actual_targets = set(result['targets'])
   if actual_targets != targets:
     print 'actual targets:', actual_targets, '\nexpected targets:', targets
     test.fail_test()
 
   actual_build_targets = set(result['build_targets'])
   if actual_build_targets != build_targets:
     print 'actual build_targets:', actual_build_targets, \
            '\nexpected build_targets:', build_targets
     test.fail_test()
 
   if matched and result['status'] != found:
     print 'expected', found, 'got', result['status']
     test.fail_test()
   elif not matched and result['status'] != not_found:
     print 'expected', not_found, 'got', result['status']
     test.fail_test()
 
 
 def EnsureMatchedAll(targets):
   result = _ReadOutputFileContents()
   if result.get('error', None):
     print 'unexpected error', result.get('error')
     test.fail_test()
 
-  if result.get('warning', None):
-    print 'unexpected warning', result.get('warning')
+  if result.get('invalid_targets', None):
+    print 'unexpected invalid_targets', result.get('invalid_targets')
     test.fail_test()
 
   if result['status'] != found_all:
     print 'expected', found_all, 'got', result['status']
     test.fail_test()
 
   actual_targets = set(result['targets'])
   if actual_targets != targets:
     print 'actual targets:', actual_targets, '\nexpected targets:', targets
     test.fail_test()
 
 
 def EnsureError(expected_error_string):
   """Verifies output contains the error string."""
   result = _ReadOutputFileContents()
   if result.get('error', '').find(expected_error_string) == -1:
     print 'actual error:', result.get('error', ''), '\nexpected error:', \
         expected_error_string
     test.fail_test()
 
 
 def EnsureStdoutContains(expected_error_string):
   if test.stdout().find(expected_error_string) == -1:
     print 'actual stdout:', test.stdout(), '\nexpected stdout:', \
         expected_error_string
     test.fail_test()
 
 
-def EnsureWarning(expected_warning_string):
-  """Verifies output contains the warning string."""
+def EnsureInvalidTargets(expected_invalid_targets):
+  """Verifies output contains invalid_targets."""
   result = _ReadOutputFileContents()
-  if result.get('warning', '').find(expected_warning_string) == -1:
-    print 'actual warning:', result.get('warning', ''), \
-        '\nexpected warning:', expected_warning_string
+  actual_invalid_targets = set(result['invalid_targets'])
+  if actual_invalid_targets != expected_invalid_targets:
+    print 'actual invalid_targets:', actual_invalid_targets, \
+        '\nexpected :', expected_invalid_targets
     test.fail_test()
 
 # Verifies config_path must be specified.
 test.run_gyp('test.gyp')
 EnsureStdoutContains('Must specify files to analyze via config_path')
 
 # Verifies config_path must point to a valid file.
 test.run_gyp('test.gyp', '-Gconfig_path=bogus_file',
              '-Ganalyzer_output_path=analyzer_output')
 EnsureError('Unable to open file bogus_file')
 
-# Verify get warning when bad target is specified.
+# Verify 'invalid_targets' is present when bad target is specified.
 _CreateConfigFile(['exe2.c'], ['bad_target'])
 run_analyzer()
-EnsureWarning('Unable to find all targets')
+EnsureInvalidTargets({'bad_target'})
 
 # Verifies config_path must point to a valid json file.
 _CreateBogusConfigFile()
 run_analyzer()
 EnsureError('Unable to parse config file test_file')
 
 # Trivial test of a source.
 _CreateConfigFile(['foo.c'], [])
 run_analyzer()
 EnsureContains(matched=True, build_targets={'exe'})
@@ skipping 177 matching lines @@
 
 _CreateConfigFile(['d.c'], [])
 run_analyzer4()
 EnsureContains(matched=True, build_targets={'a', 'b', 'c', 'd'})
 
 _CreateConfigFile(['i.c'], [])
 run_analyzer4()
 EnsureContains(matched=True, build_targets={'h'})
 
 test.pass_test()