Merge branch 'main-eisop' of github.com:jspecify/jspecify-reference-c…

…hecker into use-eisop
jspecify · Dec 14, 2023 · 49cfc8a · 49cfc8a
2 parents 8d43524 + b9828b4
commit 49cfc8a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,11 @@ jobs:
         env:
           SHALLOW: 1
       - name: Check out jspecify/samples-google-prototype
+        if: always()
         run: git -C ../jspecify checkout samples-google-prototype
         if: always()
       - name: Run Samples Tests
+        if: always()
         uses: gradle/gradle-build-action@v2
         with:
           arguments: jspecifySamplesTest

diff --git a/src/test/java/tests/ConformanceTest.java b/src/test/java/tests/ConformanceTest.java
@@ -14,7 +14,6 @@
 
 package tests;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static java.util.Objects.requireNonNull;
@@ -35,6 +34,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -84,6 +84,7 @@
  */
 @RunWith(JUnit4.class)
 public final class ConformanceTest {
+  private static final Logger logger = Logger.getLogger(ConformanceTest.class.getCanonicalName());
 
   private static final ImmutableList<String> OPTIONS =
       ImmutableList.of(
@@ -242,7 +243,10 @@ public String toString() {
      */
     private static String fixType(String type) {
       Matcher matcher = TYPE.matcher(type);
-      checkArgument(matcher.matches(), "did not match for \"%s\"", type);
+      if (!matcher.matches()) {
+        logger.warning(String.format("type \"%s\" did not match /%s/", type, TYPE.pattern()));
+        return type;
+      }
       String args = matcher.group("args");
       String suffix = matcher.group("suffix");
       if (args == null && suffix != null) {

diff --git a/tests/ConformanceTest-report.txt b/tests/ConformanceTest-report.txt
@@ -1,11 +1,12 @@
-# 12 pass; 6 fail; 18 total; 66.7% score
-PASS: Basic.java:26 test:expression-type:Object?:nullable
-PASS: Basic.java:26 test:sink-type:Object!:return
-PASS: Basic.java:26 test:cannot-convert:Object? to Object!
-PASS: Basic.java:32 test:expression-type:Object!:nonNull
-PASS: Basic.java:32 test:sink-type:Object?:return
-PASS: Basic.java:39 test:sink-type:Object?:nullableObject
-PASS: Basic.java:41 test:sink-type:String!:testSinkType#nonNullString
+# 12 pass; 7 fail; 19 total; 63.2% score
+PASS: Basic.java:28 test:expression-type:Object?:nullable
+PASS: Basic.java:28 test:sink-type:Object!:return
+PASS: Basic.java:28 test:cannot-convert:Object? to Object!
+PASS: Basic.java:34 test:expression-type:Object!:nonNull
+PASS: Basic.java:34 test:sink-type:Object?:return
+PASS: Basic.java:41 test:sink-type:Object?:nullableObject
+PASS: Basic.java:43 test:sink-type:String!:testSinkType#nonNullString
+FAIL: Basic.java:49 test:expression-type:List!<capture of ? extends String?>:nullableStrings
 PASS: Basic.java: no unexpected facts
 PASS: Irrelevant.java:28 test:irrelevant-annotation:Nullable
 PASS: Irrelevant.java:34 test:irrelevant-annotation:Nullable