Test old/new thread annotations for call graph

In WrongThreadInterproceduralTest, test with both the old
android.support thread annotations and the new androidx
thread annotations.

Test: Unit tests in tools/idea/callgraph
Bug: n/a
Change-Id: I85f0244e6c05e64d7a6e3d8f04264fa57cc3480a

kotlin-integration/testData/callgraph/AndroidxAnnotations.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.annotation;
+
+public @interface UiThread {}
+
+public @interface WorkerThread {}

kotlin-integration/testData/callgraph/AndroidxAnnotations.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.annotation
+
+annotation class UiThread
+
+annotation class WorkerThread

kotlin-integration/testData/callgraph/SupportAnnotations.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.support.annotation;
+
+public @interface UiThread {}
+
+public @interface WorkerThread {}

kotlin-integration/testData/callgraph/SupportAnnotations.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.support.annotation
+
+annotation class UiThread
+
+annotation class WorkerThread

kotlin-integration/testData/callgraph/ThreadAnnotations.java

@@ -13,18 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package android.support.annotation;
-
-public @interface UiThread {}
-
-public @interface WorkerThread {}
+import androidx.annotation.UiThread;
+import androidx.annotation.WorkerThread;
 
 @FunctionalInterface
 public interface Runnable {
   public abstract void run();
 }
 
 class Test {
+
+  // Make sure the old annotation names still work.
+  @android.support.annotation.UiThread static void oldAnnotationA() { oldAnnotationB() }
+  static void oldAnnotationB() { oldAnnotationC() }
+  @android.support.annotation.WorkerThread static void oldAnnotationC() {}
+
   @UiThread static void uiThreadStatic() { unannotatedStatic(); }
   static void unannotatedStatic() { workerThreadStatic(); }
   @WorkerThread static void workerThreadStatic() {}

kotlin-integration/testData/callgraph/ThreadAnnotations.kt

@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package android.support.annotation
-
-annotation class UiThread
-
-annotation class WorkerThread
+import androidx.annotation.UiThread
+import androidx.annotation.WorkerThread
 
 class Test {
 
+  // Make sure the old annotation names still work.
+  @android.support.annotation.UiThread fun oldAnnotationA() { oldAnnotationB() }
+  fun oldAnnotationB() { oldAnnotationC() }
+  @android.support.annotation.WorkerThread fun oldAnnotationC() {}
+
   @UiThread fun uiThread() { unannotated() }
   fun unannotated() { workerThread() }
   @WorkerThread fun workerThread() {}

kotlin-integration/testSrc/com/android/tools/idea/callgraph/WrongThreadInterproceduralTest.kt

@@ -27,9 +27,16 @@ class WrongThreadInterproceduralTest : AndroidTestCase() {
 
   fun testKotlinThreadAnnotations() = doTest(".kt")
 
+  private fun addFile(file: String) = myFixture.copyFileToProject("callgraph/$file", "src/$file")
+
   private fun doTest(ext: String) {
     myFixture.testDataPath = PathManager.getHomePath() + "/../adt/idea/kotlin-integration/testData"
-    val virtualFile = myFixture.copyFileToProject("callgraph/ThreadAnnotations$ext", "src/ThreadAnnotations$ext")
+
+    // Most of the test uses the new AndroidX annotations, but we make sure that the old annotations work too.
+    addFile("AndroidxAnnotations$ext")
+    addFile("SupportAnnotations$ext")
+
+    val virtualFile = addFile("ThreadAnnotations$ext")
     val (_, receiverEval, graph) = buildInterproceduralAnalysesForTest(virtualFile, myFixture.project)
     val paths = searchForInterproceduralThreadAnnotationViolations(graph, receiverEval)
 
@@ -43,6 +50,7 @@ class WrongThreadInterproceduralTest : AndroidTestCase() {
         .joinToString(separator = "\n")
 
     val expectedPathStrs = listOf(
+        "Test#oldAnnotationA -> Test#oldAnnotationB -> Test#oldAnnotationC",
         "Test#uiThreadStatic -> Test#unannotatedStatic -> Test#workerThreadStatic",
         "Test#uiThread -> Test#unannotated -> Test#workerThread",
         "Test#callRunIt -> Test#runIt -> Test#callRunIt#lambda -> Test#runUi",