From 73d5a355f6bd38e140e65dbd57b323740591509c Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Tue, 8 Mar 2016 05:56:03 -0800 Subject: [PATCH] add mock gradle for e2e test Summary:public Adds a mock gradle to test the gradle integration even when gradle is not installed. Reviewed By: jeremydubreil Differential Revision: D2995664 fb-gh-sync-id: f974a67 shipit-source-id: f974a67 --- .../build_systems/build_integration_tests.py | 49 ++++++++++--------- .../expected_outputs/gradle_report.json | 14 +++--- infer/tests/build_systems/mock/gradle | 16 ++++++ 3 files changed, 48 insertions(+), 31 deletions(-) create mode 100755 infer/tests/build_systems/mock/gradle diff --git a/infer/tests/build_systems/build_integration_tests.py b/infer/tests/build_systems/build_integration_tests.py index bc124300d..7b7081843 100755 --- a/infer/tests/build_systems/build_integration_tests.py +++ b/infer/tests/build_systems/build_integration_tests.py @@ -19,14 +19,16 @@ import sys import tempfile import unittest -SCRIPT_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) +SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) sys.path.insert(0, - os.path.join(SCRIPT_DIRECTORY, + os.path.join(SCRIPT_DIR, os.pardir, os.pardir, 'lib', 'python')) from inferlib import issues, utils +ROOT_DIR = os.path.join(SCRIPT_DIR, os.pardir, os.pardir, os.pardir) + REPORT_JSON = 'report.json' INFER_EXECUTABLE = 'infer' @@ -39,7 +41,7 @@ REPORT_FIELDS = [ issues.JSON_INDEX_TYPE, ] -EXPECTED_OUTPUTS_DIR = os.path.join(SCRIPT_DIRECTORY, 'expected_outputs') +EXPECTED_OUTPUTS_DIR = os.path.join(SCRIPT_DIR, 'expected_outputs') def should_record_tests(): return RECORD_ENV in os.environ and os.environ[RECORD_ENV] == '1' @@ -77,7 +79,7 @@ def save_report(reports, filename): separators=(',', ': '), sort_keys=True) -def run_analysis(root, clean_cmd, build_cmd, analyzer): +def run_analysis(root, clean_cmd, build_cmd, analyzer, env=None): os.chdir(root) subprocess.check_call(clean_cmd) @@ -89,12 +91,12 @@ def run_analysis(root, clean_cmd, build_cmd, analyzer): mode='w', suffix='.out', prefix='analysis_') as analysis_output: - subprocess.check_call(infer_cmd, stdout=analysis_output) + subprocess.check_call(infer_cmd, stdout=analysis_output, env=env) json_path = os.path.join(temp_out_dir, REPORT_JSON) found_errors = utils.load_json_from_path(json_path) shutil.rmtree(temp_out_dir) - os.chdir(SCRIPT_DIRECTORY) + os.chdir(SCRIPT_DIR) return found_errors @@ -168,7 +170,7 @@ class BuildIntegrationTest(unittest.TestCase): def test_ant_integration(self): if is_tool_available(['ant', '-version']): print('\nRunning Gradle integration test') - root = os.path.join(SCRIPT_DIRECTORY, os.pardir) + root = os.path.join(SCRIPT_DIR, os.pardir) errors = run_analysis( root, ['ant', 'clean'], @@ -181,28 +183,27 @@ class BuildIntegrationTest(unittest.TestCase): assert True def test_gradle_integration(self): - if is_tool_available(['gradle', '--version']): - print('\nRunning Gradle integration test') - root = os.path.join(SCRIPT_DIRECTORY, os.pardir, os.pardir, - os.pardir, 'examples', 'android_hello') - errors = run_analysis( - root, - ['gradle', 'clean'], - ['gradle', 'build'], - INFER_EXECUTABLE) - original = os.path.join(EXPECTED_OUTPUTS_DIR, 'gradle_report.json') - do_test(errors, original) - else: - print('\nSkipping Gradle integration test') - assert True + print('\nRunning Gradle integration test using mock gradle') + root = os.path.join(ROOT_DIR, 'examples', 'java_hello') + env = os.environ + env['PATH'] = '{}:{}'.format( + os.path.join(SCRIPT_DIR, 'mock'), + os.getenv('PATH'), + ) + errors = run_analysis( + root, + ['true'], + ['gradle', 'build'], + INFER_EXECUTABLE, + env=env) + original = os.path.join(EXPECTED_OUTPUTS_DIR, 'gradle_report.json') + do_test(errors, original) def test_buck_integration(self): if is_tool_available(['buck', '--version']): print('\nRunning Buck integration test') - root = os.path.join(SCRIPT_DIRECTORY, - os.pardir, os.pardir, os.pardir) errors = run_analysis( - root, + ROOT_DIR, ['buck', 'clean'], ['buck', 'build', 'infer'], INFER_EXECUTABLE) diff --git a/infer/tests/build_systems/expected_outputs/gradle_report.json b/infer/tests/build_systems/expected_outputs/gradle_report.json index 96c057e74..b3f642cea 100644 --- a/infer/tests/build_systems/expected_outputs/gradle_report.json +++ b/infer/tests/build_systems/expected_outputs/gradle_report.json @@ -1,17 +1,17 @@ [ { "bug_type": "NULL_DEREFERENCE", - "file": "app/src/main/java/infer/inferandroidexample/MainActivity.java", - "procedure": "void MainActivity.onCreate(Bundle)" + "file": "Hello.java", + "procedure": "void Hello.mayCauseNPE()" }, { - "bug_type": "NULL_DEREFERENCE", - "file": "app/src/main/java/infer/other/MainActivity.java", - "procedure": "void MainActivity.onCreate(Bundle)" + "bug_type": "RESOURCE_LEAK", + "file": "Hello.java", + "procedure": "void Hello.mayLeakResource()" }, { "bug_type": "RESOURCE_LEAK", - "file": "app/src/main/java/infer/inferandroidexample/MainActivity.java", - "procedure": "void MainActivity.writeToFile()" + "file": "Hello.java", + "procedure": "void Hello.twoResources()" } ] \ No newline at end of file diff --git a/infer/tests/build_systems/mock/gradle b/infer/tests/build_systems/mock/gradle new file mode 100755 index 000000000..0cbd3def9 --- /dev/null +++ b/infer/tests/build_systems/mock/gradle @@ -0,0 +1,16 @@ +#!/bin/sh +# Copyright (c) 2016 - present Facebook, Inc. +# All rights reserved. +# +# This source code is licensed under the BSD style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +# mock implementation of gradle, to be run from examples/java_hello/ + +# gradle outputs absolute paths +path_to_java_hello=$(pwd) + +# this is the part of the output of "gradle --debug build" that infer +# cares about +echo 19:12:21.084 [DEBUG] [org.gradle.api.internal.tasks.compile.NormalizingJavaCompiler] Compiler arguments: -g -encoding UTF-8 "$path_to_java_hello"/Pointers.java "$path_to_java_hello"/Resources.java "$path_to_java_hello"/Hello.java