From bc6226942ec56985cff9d9003f0e15435aef68e0 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Thu, 27 Oct 2016 11:12:12 -0700
Subject: [PATCH] fix tests

Summary: D4075145 introduced a broken test.

Reviewed By: yunxing

Differential Revision: D4089715

fbshipit-source-id: 9d90db7
---
 .../checkers/ExtendsThreadSafeExample.java    | 24 -------------------
 .../java/checkers/ThreadSafeExample.java      | 17 +++++++++++++
 .../codetoanalyze/java/checkers/issues.exp    |  4 ++--
 3 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 infer/tests/codetoanalyze/java/checkers/ExtendsThreadSafeExample.java

diff --git a/infer/tests/codetoanalyze/java/checkers/ExtendsThreadSafeExample.java b/infer/tests/codetoanalyze/java/checkers/ExtendsThreadSafeExample.java
deleted file mode 100644
index 844023ca7..000000000
--- a/infer/tests/codetoanalyze/java/checkers/ExtendsThreadSafeExample.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-class ExtendsThreadSafeExample extends ThreadSafeExample{
-
-  Integer field;
-
-  (* Presently,we will warn not just on overwridden methods from
-  @ThreadSafe class, but potentially on other methods in subclass *)
-  public void newmethodBad() {
-     field = 22;
-  }
-
-  (* Bad now that it's overridden *)
-  public void tsOK() {
-     field = 44;
-  }
-
-}
diff --git a/infer/tests/codetoanalyze/java/checkers/ThreadSafeExample.java b/infer/tests/codetoanalyze/java/checkers/ThreadSafeExample.java
index 27b78ea86..931e467b0 100644
--- a/infer/tests/codetoanalyze/java/checkers/ThreadSafeExample.java
+++ b/infer/tests/codetoanalyze/java/checkers/ThreadSafeExample.java
@@ -44,3 +44,20 @@ public class ThreadSafeExample{
   }
 
 }
+
+class ExtendsThreadSafeExample extends ThreadSafeExample{
+
+  Integer field;
+
+  /* Presently,we will warn not just on overwridden methods from
+  @ThreadSafe class, but potentially on other methods in subclass */
+  public void newmethodBad() {
+     field = 22;
+  }
+
+  /* Bad now that it's overridden */
+  public void tsOK() {
+     field = 44;
+  }
+
+}
diff --git a/infer/tests/codetoanalyze/java/checkers/issues.exp b/infer/tests/codetoanalyze/java/checkers/issues.exp
index 87db03c4b..c423c5ac3 100644
--- a/infer/tests/codetoanalyze/java/checkers/issues.exp
+++ b/infer/tests/codetoanalyze/java/checkers/issues.exp
@@ -21,8 +21,6 @@ ExpensiveInheritanceExample.java, void ExpensiveInheritanceExample.doesReportBec
 ExpensiveInheritanceExample.java, void ExpensiveInheritanceExample.reportsAssumingObjectOfTypeA(), 2, CHECKERS_CALLS_EXPENSIVE_METHOD
 ExpensiveInheritanceExample.java, void ExpensiveInheritanceExample.reportsBecauseFooIsExpensiveInA(A), 1, CHECKERS_CALLS_EXPENSIVE_METHOD
 ExpensiveSubtypingExample.java, void ExpensiveSubtypingExample.m3(), 0, CHECKERS_EXPENSIVE_OVERRIDES_UNANNOTATED
-ExtendsThreadSafeExample.java, void ExtendsThreadSafeExample.newmethodBad(), 0, CHECKERS_THREAD_SAFETY_WARNING
-ExtendsThreadSafeExample.java, void ExtendsThreadSafeExample.tsOK(), 0, CHECKERS_THREAD_SAFETY_WARNING
 FragmentRetainsViewExample.java, void FragmentRetainsViewExample.onDestroyView(), 0, CHECKERS_FRAGMENT_RETAINS_VIEW
 FragmentRetainsViewExample.java, void FragmentRetainsViewExample.onDestroyView(), 0, CHECKERS_FRAGMENT_RETAINS_VIEW
 FragmentRetainsViewExample.java, void FragmentRetainsViewExample.onDestroyView(), 0, CHECKERS_FRAGMENT_RETAINS_VIEW
@@ -34,6 +32,8 @@ PrintfArgsChecker.java, void PrintfArgsChecker.formatStringIsNotLiteral(PrintStr
 PrintfArgsChecker.java, void PrintfArgsChecker.notSuppressed(PrintStream), 1, CHECKERS_PRINTF_ARGS
 PrintfArgsChecker.java, void PrintfArgsChecker.stringInsteadOfInteger(PrintStream), 1, CHECKERS_PRINTF_ARGS
 PrintfArgsChecker.java, void PrintfArgsChecker.wrongNumberOfArguments(PrintStream), 1, CHECKERS_PRINTF_ARGS
+ThreadSafeExample.java, void ExtendsThreadSafeExample.newmethodBad(), 0, CHECKERS_THREAD_SAFETY_WARNING
+ThreadSafeExample.java, void ExtendsThreadSafeExample.tsOK(), 0, CHECKERS_THREAD_SAFETY_WARNING
 ThreadSafeExample.java, void ThreadSafeExample.tsBad(), 0, CHECKERS_THREAD_SAFETY_WARNING
 TwoCheckersExample.java, List TwoCheckersExample.shouldRaiseImmutableCastError(), 0, CHECKERS_IMMUTABLE_CAST
 TwoCheckersExample.java, List TwoCheckersExample.shouldRaisePerformanceCriticalError(), 1, CHECKERS_CALLS_EXPENSIVE_METHOD