From bea4e435ff8757c794f206ee481283c05212ec86 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 9 Mar 2021 14:51:53 -0800 Subject: [PATCH 1/3] added java linter tests for generated code --- packages/pigeon/run_tests.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh index ae5aa1e8f7df..c84093527acf 100755 --- a/packages/pigeon/run_tests.sh +++ b/packages/pigeon/run_tests.sh @@ -8,6 +8,10 @@ # exit when any command fails set -ex +JAVA_LINTER=checkstyle-8.41-all.jar +JAVA_FORMATTER=google-java-format-1.3-all-deps.jar +GOOGLE_CHECKS=google_checks.xml + # TODO(blasten): Enable on stable when possible. # https://github.com/flutter/flutter/issues/75187 if [[ "$CHANNEL" == "stable" ]]; then @@ -76,6 +80,9 @@ test_pigeon_android() { exit 1 fi + java -jar $JAVA_FORMATTER $temp_dir/Pigeon.java > $temp_dir/Pigeon.java + java -jar $JAVA_LINTER -c ci/google_checks.xml $temp_dir/Pigeon.java + dartfmt -w $temp_dir/pigeon.dart dartanalyzer $temp_dir/pigeon.dart --fatal-infos --fatal-warnings --packages ./e2e_tests/test_objc/.packages @@ -98,6 +105,19 @@ test_null_safe_dart() { rm -rf $temp_dir } +############################################################################### +# Get java linter / formatter +############################################################################### +if [ ! -f "$JAVA_LINTER" ]; then + curl -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-8.41/$JAVA_LINTER > $JAVA_LINTER +fi +if [ ! -f "$JAVA_FORMATTER" ]; then + curl -L https://github.com/google/google-java-format/releases/download/google-java-format-1.3/$JAVA_FORMATTER > $JAVA_FORMATTER +fi +if [ ! -f "$GOOGLE_CHECKS" ]; then + curl -L https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resources/$GOOGLE_CHECKS > $GOOGLE_CHECKS +fi + ############################################################################### # Dart analysis and unit tests ############################################################################### From 38adb97956811fa7566aa5871d09d4ecba59b83c Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 9 Mar 2021 15:04:23 -0800 Subject: [PATCH 2/3] moved to dart analyze --- packages/pigeon/run_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh index c84093527acf..30ceefbf4c54 100755 --- a/packages/pigeon/run_tests.sh +++ b/packages/pigeon/run_tests.sh @@ -122,7 +122,8 @@ fi # Dart analysis and unit tests ############################################################################### pub get -dartanalyzer bin lib +dart analyze bin +dart analyze lib pub run test test/ ############################################################################### From d12cae4623715f84b3a377f8d80beab38ae0837c Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 9 Mar 2021 15:15:23 -0800 Subject: [PATCH 3/3] fixed checks path --- packages/pigeon/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh index 30ceefbf4c54..643a1cafe0c0 100755 --- a/packages/pigeon/run_tests.sh +++ b/packages/pigeon/run_tests.sh @@ -81,7 +81,7 @@ test_pigeon_android() { fi java -jar $JAVA_FORMATTER $temp_dir/Pigeon.java > $temp_dir/Pigeon.java - java -jar $JAVA_LINTER -c ci/google_checks.xml $temp_dir/Pigeon.java + java -jar $JAVA_LINTER -c $GOOGLE_CHECKS $temp_dir/Pigeon.java dartfmt -w $temp_dir/pigeon.dart dartanalyzer $temp_dir/pigeon.dart --fatal-infos --fatal-warnings --packages ./e2e_tests/test_objc/.packages