Refactoring of tests, separating the tests for linters

Reviewed By: sblackshear

Differential Revision: D3569981

fbshipit-source-id: 198647b

.buckconfig

@@ -21,5 +21,7 @@
   checkers = //infer/tests/endtoend/java/checkers:checkers
   tracing = //infer/tests/endtoend/java/tracing:tracing
 
+  linters = //infer/tests/endtoend:linters
+
 [project]
   ignore = .git, .ml, .mli

infer/tests/BUCK

@@ -1,43 +1,24 @@
 java_test(
-    name='integration_tests',
+    name='c_tests',
     deps=[
-        '//dependencies/java:java_libraries',
+        '//infer/tests/endtoend:c_endtoend_tests',
-        '//infer/tests/endtoend:objc_endtoend_tests',
-        '//infer/tests/frontend:objc_frontend_tests',
-        '//infer/tests/endtoend/c:infer',
         '//infer/tests/frontend:c_frontend_tests',
-        '//infer/tests/endtoend:cpp_endtoend_tests',
-        '//infer/tests/frontend:cpp_frontend_tests',
-        '//infer/tests/endtoend:objcpp_endtoend_tests',
-        '//infer/tests/frontend:objcpp_frontend_tests',
-        '//infer/tests/endtoend:java_endtoend_tests',
     ],
-    source='7',
-    target='7',
-)
-
-
-java_test(
-  name='objc_tests',
-  deps=[
-      '//infer/tests/endtoend:objc_endtoend_tests',
-      '//infer/tests/frontend:objc_frontend_tests',
-  ],
 )
 
 java_test(
-    name='c_tests',
+    name='cpp_tests',
     deps=[
-        '//infer/tests/endtoend/c:infer',
+        '//infer/tests/endtoend:cpp_endtoend_tests',
-        '//infer/tests/frontend:c_frontend_tests',
+        '//infer/tests/frontend:cpp_frontend_tests',
     ],
 )
 
 java_test(
-    name='cpp_tests',
+    name='objc_tests',
     deps=[
-        '//infer/tests/endtoend:cpp_endtoend_tests',
+        '//infer/tests/endtoend:objc_endtoend_tests',
-        '//infer/tests/frontend:cpp_frontend_tests',
+        '//infer/tests/frontend:objc_frontend_tests',
     ],
 )
 
@@ -58,8 +39,3 @@ java_test(
         '//infer/tests:objcpp_tests',
     ],
 )
-
-project_config(
-  src_target=':integration_tests',
-  src_roots=[ 'src' ],
-)

infer/tests/endtoend/BUCK

@@ -13,78 +13,50 @@ tests_dependencies = [
     '//infer/tests/codetoanalyze/java/tracing:tracing',
 ]
 
-integration_tests = [
+# ############### C endtoend tests ########################
-    '//infer/tests:integration_tests',
+java_test(
-    '//infer/tests:objc_tests',
+  name='c_endtoend_tests',
-    '//infer/tests:c_tests',
+  deps=[
-    '//infer/tests:cpp_tests',
+        '//infer/tests/endtoend/c/infer:infer',
-    '//infer/tests:objcpp_tests',
+  ],
-]
+  visibility=[
-
+    'PUBLIC',
-# ############### ObjC tests endtoend ########################
+  ],
-objc_test_sources = glob(['objc/**/*.java'])
+)
-objc_endtoend_test_deps = []
-for test_source in objc_test_sources:
-    target_name = test_source.replace("/", "_")[:-len(".java")]
-    objc_endtoend_test_deps.append(target_name)
-
-    java_test(
-        name=target_name,
-        srcs=[test_source],
-        deps=tests_dependencies,
-        visibility=integration_tests,
-        source='7',
-        target='7',
-    )
 
+# ############### ObjC endtoend tests ########################
 java_test(
-    name='objc_endtoend_tests',
+  name='objc_endtoend_tests',
-    deps=[':' + x for x in objc_endtoend_test_deps],
+  deps=[
-    visibility=integration_tests,
+      '//infer/tests/endtoend/objc/infer:infer',
+      '//infer/tests/endtoend/objc/linters:linters',
+  ],
+  visibility=[
+    'PUBLIC',
+  ],
 )
 
 # ############### Cpp endtoend tests  ########################
-objc_test_sources = glob(['cpp/**/*.java'])
-objc_endtoend_test_deps = []
-for test_source in objc_test_sources:
-    target_name = test_source.replace("/", "_")[:-len(".java")]
-    objc_endtoend_test_deps.append(target_name)
-
-    java_test(
-        name=target_name,
-        srcs=[test_source],
-        deps=tests_dependencies,
-        visibility=integration_tests,
-        source='7',
-        target='7',
-    )
-
 java_test(
-    name='cpp_endtoend_tests',
+  name='cpp_endtoend_tests',
-    deps=[':' + x for x in objc_endtoend_test_deps],
+  deps=[
-    visibility=integration_tests,
+      '//infer/tests/endtoend/cpp/infer:infer',
+  ],
+  visibility=[
+    'PUBLIC',
+  ],
 )
 
 # ############### ObjCpp endtoend tests ########################
-objc_test_sources = glob(['objcpp/**/*.java'])
-objc_endtoend_test_deps = []
-for test_source in objc_test_sources:
-    target_name = test_source.replace("/", "_")[:-len(".java")]
-    objc_endtoend_test_deps.append(target_name)
-
-    java_test(
-        name=target_name,
-        srcs=[test_source],
-        deps=tests_dependencies,
-        visibility=integration_tests,
-        source='7',
-        target='7',
-    )
-
 java_test(
-    name='objcpp_endtoend_tests',
+  name='objcpp_endtoend_tests',
-    deps=[':' + x for x in objc_endtoend_test_deps],
+  deps=[
-    visibility=integration_tests,
+      '//infer/tests/endtoend/objcpp/infer:infer',
+      '//infer/tests/endtoend/objcpp/linters:linters',
+  ],
+  visibility=[
+    'PUBLIC',
+  ],
 )
 
 # ############### Java endtoend tests ########################
@@ -98,5 +70,17 @@ java_test(
         '//infer/tests/endtoend/java/tracing:tracing',
         '//infer/tests/endtoend/java/comparison:comparison',
     ],
-    visibility=integration_tests,
+    visibility=[
+        'PUBLIC',
+    ],
+)
+
+# ############### Linters tests ########################
+
+java_test(
+    name='linters',
+    deps=[
+        '//infer/tests/endtoend/objc/linters:linters',
+        '//infer/tests/endtoend/objcpp/linters:linters',
+    ],
 )

infer/tests/endtoend/c/infer/AngelismTest.java

@@ -7,10 +7,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static utils.matchers.ResultContainsLineNumbers.containsLines;
 import static utils.matchers.ResultContainsExactly.containsExactly;
 
 import org.junit.BeforeClass;

infer/tests/endtoend/c/infer/ArrayOutOfBoundsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/AsmAngelismTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/AssertKeepBranchTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;
@@ -15,15 +15,12 @@ import static utils.matchers.ResultContainsExactly.containsExactly;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 
 import java.io.IOException;
 
-import utils.DebuggableTemporaryFolder;
 import utils.InferException;
 import utils.InferResults;
-import utils.InferRunner;
 
 public class AssertKeepBranchTest {
 

infer/tests/endtoend/c/infer/AssertTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsNoErrorInMethod.doesNotContain;

infer/tests/endtoend/c/infer/AssertionFailureTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/BUCK

@@ -11,6 +11,6 @@ java_test(
         '//infer/tests/codetoanalyze/c/errors:analyze',
     ],
     visibility=[
-        'PUBLIC',
+              'PUBLIC',
-    ],
+          ],
 )

infer/tests/endtoend/c/infer/CompoundLiteralExprTest.java

@@ -7,23 +7,18 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;
 
-import com.google.common.collect.ImmutableList;
-
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 
 import java.io.IOException;
 
-import utils.DebuggableTemporaryFolder;
 import utils.InferException;
 import utils.InferResults;
-import utils.InferRunner;
 
 public class CompoundLiteralExprTest {
 

infer/tests/endtoend/c/infer/CustomErrorTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/DanglingDereferenceTest.java

@@ -7,11 +7,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;
-import static utils.matchers.ResultContainsLineNumbers.containsLines;
 import static utils.matchers.ResultContainsErrorInMethod.contains;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -20,7 +19,6 @@ import java.io.IOException;
 
 import utils.InferException;
 import utils.InferResults;
-import utils.InferRunner;
 
 public class DanglingDereferenceTest {
 

infer/tests/endtoend/c/infer/DivideByZeroTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/EnumTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/InitListExprTest.java

@@ -7,23 +7,18 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;
 
-import com.google.common.collect.ImmutableList;
-
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 
 import java.io.IOException;
 
-import utils.DebuggableTemporaryFolder;
 import utils.InferException;
 import utils.InferResults;
-import utils.InferRunner;
 
 public class InitListExprTest {
 

infer/tests/endtoend/c/infer/ListsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/LocalVarsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/MemoryLeakTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/NullDereferenceShortCircuitTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/NullDereferenceTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsLineNumbers.containsLines;

infer/tests/endtoend/c/infer/NullDereferenceTest2.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/NullDereferenceTest3.java

@@ -7,11 +7,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;
-import static utils.matchers.ResultContainsLineNumbers.containsLines;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

infer/tests/endtoend/c/infer/ResourceLeakTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/SentinelTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/c/infer/UnsafeMallocTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.c;
+package endtoend.c.infer;
 
 import com.google.common.collect.ImmutableList;
 

infer/tests/endtoend/cpp/infer/BUCK

@@ -0,0 +1,35 @@
+tests_dependencies = [
+    '//infer/lib/java/android:android',
+    '//dependencies/java/guava:guava',
+    '//dependencies/java/junit:hamcrest',
+    '//dependencies/java/jackson:jackson',
+    '//dependencies/java/jsr-305:jsr-305',
+    '//dependencies/java/junit:junit',
+    '//dependencies/java/opencsv:opencsv',
+    '//infer/tests/utils:utils',
+]
+
+cpp_infer_test_sources = glob(['*.java'])
+cpp_infer_test_deps = []
+for test_source in cpp_infer_test_sources:
+    target_name = test_source.replace("/", "_")[:-len(".java")]
+    cpp_infer_test_deps.append(target_name)
+
+    java_test(
+        name=target_name,
+        srcs=[test_source],
+        deps=tests_dependencies,
+        visibility=[
+            'PUBLIC',
+        ],
+        source='7',
+        target='7',
+    )
+
+java_test(
+    name='infer',
+    deps=[':' + x for x in cpp_infer_test_deps],
+    visibility=[
+        'PUBLIC',
+    ],
+)

infer/tests/endtoend/cpp/infer/BoxedPtrTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/CBugsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/ClassTemplateTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ConstructorInitTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ConstructorNewTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ConstructorWithBodyTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/ConversionOperatorTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/CopyMoveConstructorTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/DerefAfterMoveTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/DynamicCastTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/ExceptionsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/FallthroughTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/FunctionTemplateTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/IncludeHeaderNoTemplTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/IncludeHeaderTemplTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/InheritanceFieldTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/LValueConditionalTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/LambdaTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsNoErrorInMethod.doesNotContain;

infer/tests/endtoend/cpp/infer/MemoryLeakArrayTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/MemoryLeakCppBucketTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/MemoryLeakTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/MethodTemplateTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/MinMaxNumericTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/MoveModelTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/NPEAddedToB1Test.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/NPEWhenMethodCallTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/NamespaceFunctionTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/NamespaceGlobalVariableTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/NestedCPPOperatorsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/NoNPEAfterDynamicCastTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/NullReturnedByMethodTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/ObjectDereferenceTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/cpp/infer/OperatorOverloadTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ReferenceFieldTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ReferenceStructTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ReferenceTypeTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ReturnStructTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/SharedPtrConstructorsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/SharedPtrDerefTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/StaticMethodTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/StructForwardDeclareTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/StructPassByValueTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/SubtypingCheckTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/TempObjectTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/TemplateFunctionPackTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/TemporaryLValueTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/ThisNotNullTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/TypeIdExprTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/UniquePtrDerefTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/VectorEmptyAccessTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/cpp/infer/VirtualMethodsTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.cpp;
+package endtoend.cpp.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/objc/infer/AutoreleaseTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsNoErrorInMethod.doesNotContain;

infer/tests/endtoend/objc/infer/BUCK

@@ -0,0 +1,35 @@
+tests_dependencies = [
+    '//infer/lib/java/android:android',
+    '//dependencies/java/guava:guava',
+    '//dependencies/java/junit:hamcrest',
+    '//dependencies/java/jackson:jackson',
+    '//dependencies/java/jsr-305:jsr-305',
+    '//dependencies/java/junit:junit',
+    '//dependencies/java/opencsv:opencsv',
+    '//infer/tests/utils:utils',
+]
+
+objc_infer_test_sources = glob(['*.java'])
+objc_infer_test_deps = []
+for test_source in objc_infer_test_sources:
+    target_name = test_source.replace("/", "_")[:-len(".java")]
+    objc_infer_test_deps.append(target_name)
+
+    java_test(
+        name=target_name,
+        srcs=[test_source],
+        deps=tests_dependencies,
+        visibility=[
+            'PUBLIC',
+        ],
+        source='7',
+        target='7',
+    )
+
+java_test(
+    name='infer',
+    deps=[':' + x for x in objc_infer_test_deps],
+    visibility=[
+        'PUBLIC',
+    ],
+)

infer/tests/endtoend/objc/infer/BlockDispatchTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/BlockDivideByZeroTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/BlockGlobalVariableTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/BlockReleaseTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/objc/infer/BlockVarTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/CADisplayLinkTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/objc/infer/CategoryProcdescTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/CompoundLiteralExprTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;

infer/tests/endtoend/objc/infer/DispatchInMacroTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/objc/infer/DispatchTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsNoErrorInMethod.doesNotContain;

infer/tests/endtoend/objc/infer/ExplicitIvarNameInGetterTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsExactly.containsExactly;

infer/tests/endtoend/objc/infer/FieldSuperclassTest.java

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package endtoend.objc;
+package endtoend.objc.infer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static utils.matchers.ResultContainsErrorInMethod.contains;