From 9e5cee2444c526d820891aba9e09e66e6b2c888e Mon Sep 17 00:00:00 2001
From: jrm <jrm@fb.com>
Date: Wed, 12 Aug 2015 09:42:50 -0700
Subject: [PATCH] [infer][eradicate] Fix eradicate tests for field not
 initialized

Summary:
This test was actually testing: "at least one Field not initialized error is found" where we actualy want to test "exactly one Field not initialized error is found". The case of @Inject was also missing from the tests.
---
 dependencies/java/jsr-330/BUCK                |   7 +++++++
 dependencies/java/jsr-330/javax.inject.jar    | Bin 0 -> 4285 bytes
 infer/tests/codetoanalyze/java/eradicate/BUCK |   1 +
 .../java/eradicate/FieldNotInitialized.java   |  18 +++++++++++-------
 .../eradicate/FieldNotInitializedTest.java    |  10 ++++------
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 dependencies/java/jsr-330/BUCK
 create mode 100644 dependencies/java/jsr-330/javax.inject.jar

diff --git a/dependencies/java/jsr-330/BUCK b/dependencies/java/jsr-330/BUCK
new file mode 100644
index 000000000..a0e3d0b2b
--- /dev/null
+++ b/dependencies/java/jsr-330/BUCK
@@ -0,0 +1,7 @@
+prebuilt_jar(
+  name = 'jsr-330',
+  binary_jar = 'javax.inject.jar',
+  visibility = [
+    'PUBLIC',
+  ],
+)
diff --git a/dependencies/java/jsr-330/javax.inject.jar b/dependencies/java/jsr-330/javax.inject.jar
new file mode 100644
index 0000000000000000000000000000000000000000..39e92a1a05a54b7bd655429ebcfd9fe2fe3532aa
GIT binary patch
literal 4285
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

literal 0
HcmV?d00001

diff --git a/infer/tests/codetoanalyze/java/eradicate/BUCK b/infer/tests/codetoanalyze/java/eradicate/BUCK
index dc7b9a5e1..f68d37184 100644
--- a/infer/tests/codetoanalyze/java/eradicate/BUCK
+++ b/infer/tests/codetoanalyze/java/eradicate/BUCK
@@ -4,6 +4,7 @@ dependencies = [
     '//infer/annotations:annotations',
     '//infer/lib/java/android:android',
     '//dependencies/java/jsr-305:jsr-305',
+    '//dependencies/java/jsr-330:jsr-330',
 ]
 
 java_library(
diff --git a/infer/tests/codetoanalyze/java/eradicate/FieldNotInitialized.java b/infer/tests/codetoanalyze/java/eradicate/FieldNotInitialized.java
index 2045eddf9..1c0712157 100644
--- a/infer/tests/codetoanalyze/java/eradicate/FieldNotInitialized.java
+++ b/infer/tests/codetoanalyze/java/eradicate/FieldNotInitialized.java
@@ -11,15 +11,19 @@ package codetoanalyze.java.eradicate;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
 public class FieldNotInitialized {
 
-  @Nullable
-  String x;
-  String y;
-  @Nonnull
-  String z; // Means: assume it's initialized to nonnull value somewhere else.
+  String a;
+
+  @Nullable String b;
+
+  @Nonnull String c; // Means: assume it will be initialized to a nonnull value somewhere else.
+
+  @Inject String d; // Means: assume it will be initialized via dependency injection
+
+  //  Eradicate should only report one initialization error
+  FieldNotInitialized() {}
 
-  FieldNotInitialized() {
-  }
 }
diff --git a/infer/tests/endtoend/java/eradicate/FieldNotInitializedTest.java b/infer/tests/endtoend/java/eradicate/FieldNotInitializedTest.java
index e1c02c175..d92987c2b 100644
--- a/infer/tests/endtoend/java/eradicate/FieldNotInitializedTest.java
+++ b/infer/tests/endtoend/java/eradicate/FieldNotInitializedTest.java
@@ -10,7 +10,7 @@
 package endtoend.java.eradicate;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static utils.matchers.ResultContainsExactly.containsExactly;
+import static utils.matchers.ResultContainsNumberOfErrorsInMethod.containsNumberOfErrors;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -39,16 +39,14 @@ public class FieldNotInitializedTest {
   @Test
   public void matchErrors()
       throws IOException, InterruptedException, InferException {
-    String[] methods = {
-        "<init>",
-    };
     assertThat(
         "Results should contain " + FIELD_NOT_INITIALIZED,
         inferResults,
-        containsExactly(
+        containsNumberOfErrors(
             FIELD_NOT_INITIALIZED,
             SOURCE_FILE,
-            methods));
+            "<init>",
+            1));
   }
 
 }