Address Synchronized lint issues in lint-checks module
Inline the sample files within the test files
Fixes: 236487014
Fixes: 236487037
Test: ./gradlew :lint-checks:lintDebug
Test: presubmit
Change-Id: I6d7dfa3be8b32c5ae1903f9a03d175568cb8b40f
diff --git a/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodJava.java b/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodJava.java
deleted file mode 100644
index 73e6365..0000000
--- a/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodJava.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2021 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;
-
-@SuppressWarnings("unused")
-public class SynchronizedMethodJava {
-
- public synchronized void someMethod() {
- }
-}
diff --git a/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodKotlin.kt b/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodKotlin.kt
deleted file mode 100644
index 7c83341..0000000
--- a/lint-checks/integration-tests/src/main/java/androidx/SynchronizedMethodKotlin.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2021 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
-
-@Suppress("unused")
-class SynchronizedMethodKotlin {
-
- @Synchronized
- fun someMethod() {
- }
-}
\ No newline at end of file
diff --git a/lint-checks/src/test/java/androidx/build/lint/BanSynchronizedMethodsTest.kt b/lint-checks/src/test/java/androidx/build/lint/BanSynchronizedMethodsTest.kt
index 3c81b1b..c71e791 100644
--- a/lint-checks/src/test/java/androidx/build/lint/BanSynchronizedMethodsTest.kt
+++ b/lint-checks/src/test/java/androidx/build/lint/BanSynchronizedMethodsTest.kt
@@ -30,37 +30,51 @@
@Test
fun `Detection of synchronized methods in Java sources`() {
- val input = arrayOf(
- javaSample("androidx.SynchronizedMethodJava"),
+ val input = java(
+ "src/androidx/SynchronizedMethodJava.java",
+ """
+ public class SynchronizedMethodJava {
+
+ public synchronized void someMethod() {
+ }
+ }
+ """.trimIndent()
)
/* ktlint-disable max-line-length */
val expected = """
-src/androidx/SynchronizedMethodJava.java:22: Error: Use of synchronized methods is not recommended [BanSynchronizedMethods]
+src/androidx/SynchronizedMethodJava.java:3: Error: Use of synchronized methods is not recommended [BanSynchronizedMethods]
public synchronized void someMethod() {
^
1 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
- check(*input).expect(expected)
+ check(input).expect(expected)
}
@Test
fun `Detection of synchronized methods in Kotlin sources`() {
- val input = arrayOf(
- ktSample("androidx.SynchronizedMethodKotlin"),
+ val input = kotlin(
+ "src/androidx/SynchronizedMethodKotlin.kt",
+ """
+ class SynchronizedMethodKotlin {
+
+ @Synchronized
+ fun someMethod() {}
+ }
+ """.trimIndent()
)
/* ktlint-disable max-line-length */
val expected = """
-src/androidx/SynchronizedMethodKotlin.kt:22: Error: Use of synchronized methods is not recommended [BanSynchronizedMethods]
+src/androidx/SynchronizedMethodKotlin.kt:3: Error: Use of synchronized methods is not recommended [BanSynchronizedMethods]
@Synchronized
^
1 errors, 0 warnings
""".trimIndent()
/* ktlint-enable max-line-length */
- check(*input).expect(expected)
+ check(input).expect(expected)
}
}
