[go: nahoru, domu]

Move stray lint-check tests into canonical tests directory

Bug: 181333078
Test: BanKeepAnnotationTest et al
Change-Id: Ia84400c24306dc145b8b02fb08f07e1a04df1174
diff --git a/lint-checks/tests/src/test/java/androidx/build/lint/BanKeepAnnotationTest.kt b/lint-checks/src/test/java/androidx/build/lint/BanKeepAnnotationTest.kt
similarity index 100%
rename from lint-checks/tests/src/test/java/androidx/build/lint/BanKeepAnnotationTest.kt
rename to lint-checks/src/test/java/androidx/build/lint/BanKeepAnnotationTest.kt
diff --git a/lint-checks/tests/src/test/java/androidx/build/lint/ObsoleteBuildCompatUsageDetectorTest.kt b/lint-checks/src/test/java/androidx/build/lint/ObsoleteBuildCompatUsageDetectorTest.kt
similarity index 100%
rename from lint-checks/tests/src/test/java/androidx/build/lint/ObsoleteBuildCompatUsageDetectorTest.kt
rename to lint-checks/src/test/java/androidx/build/lint/ObsoleteBuildCompatUsageDetectorTest.kt
diff --git a/lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt b/lint-checks/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
similarity index 100%
rename from lint-checks/tests/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
rename to lint-checks/src/test/java/androidx/build/lint/SampledAnnotationEnforcerTest.kt
diff --git a/lint-checks/tests/build.gradle b/lint-checks/tests/build.gradle
deleted file mode 100644
index 3677028..0000000
--- a/lint-checks/tests/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2019 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.
- */
-
-
-import androidx.build.BuildServerConfigurationKt
-
-import java.io.File
-
-import static androidx.build.dependencies.DependenciesKt.*
-
-plugins {
-    id("AndroidXPlugin")
-    id("kotlin")
-}
-
-dependencies {
-    testImplementation(LINT_CORE)
-    testImplementation(LINT_API_LATEST)
-    testImplementation(KOTLIN_STDLIB)
-    testImplementation(LINT_TESTS)
-    testImplementation("androidx.annotation:annotation:1.0.0")
-    testImplementation(project(":lint-checks"))
-}
diff --git a/settings.gradle b/settings.gradle
index 9531acf..36a35c7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -448,7 +448,6 @@
 includeProject(":lifecycle:lifecycle-viewmodel-savedstate", "lifecycle/lifecycle-viewmodel-savedstate", [BuildType.MAIN, BuildType.FLAN, BuildType.WEAR])
 includeProject(":lint-checks", "lint-checks")
 includeProject(":lint-checks:integration-tests", "lint-checks/integration-tests")
-includeProject(":lint-checks:tests", "lint-checks/tests")
 includeProject(":lint-demos:lint-demo-appcompat", "lint-demos/lint-demo-appcompat", [BuildType.MAIN])
 includeProject(":loader:loader", "loader/loader", [BuildType.MAIN])
 includeProject(":loader:loader-ktx", "loader/loader-ktx", [BuildType.MAIN])