Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1dd01ee authored by Jeff Chen's avatar Jeff Chen Committed by Automerger Merge Worker
Browse files

Merge "Make linter message clearer." into udc-qpr-dev am: b31e95af 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24528553



Change-Id: I83402adcfb326a36597c0d279dc970e3aeb30ff2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 516858e6 b31e95af

packages/SystemUI/checks/src/com/android/internal/systemui/lint/DemotingTestWithoutBugDetector.kt

+5 −2
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ class DemotingTestWithoutBugDetector : Detector(), SourceCodeScanner { 
                if (node.qualifiedName in DEMOTING_ANNOTATION_BUG_ID) {

                    if (!containsBugId(node)) {

                        val location = context.getLocation(node)

                        val message = "Please attach a bug id to track demoted test"

                        val message =

                            """Please attach a bug id to track demoted test, """ +

                                """e.g. @FlakyTest(bugId = 123)"""

                        context.report(ISSUE, node, location, message)

                    }

                }
@@ -51,7 +53,8 @@ class DemotingTestWithoutBugDetector : Detector(), SourceCodeScanner { 
                if (node.qualifiedName == DEMOTING_ANNOTATION_IGNORE) {

                    if (!containsBugString(node)) {

                        val location = context.getLocation(node)

                        val message = "Please attach a bug (e.g. b/123) to track demoted test"

                        val message =

                            """Please attach a bug to track demoted test, e.g. @Ignore("b/123")"""

                        context.report(ISSUE, node, location, message)

                    }

                }

packages/SystemUI/checks/tests/com/android/internal/systemui/lint/DemotingTestWithoutBugDetectorTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ class DemotingTestWithoutBugDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test [DemotingTestWithoutBug]

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test, e.g. @FlakyTest(bugId = 123) [DemotingTestWithoutBug]

                @FlakyTest

                ~~~~~~~~~~

                0 errors, 1 warnings
@@ -126,7 +126,7 @@ class DemotingTestWithoutBugDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test [DemotingTestWithoutBug]

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test, e.g. @FlakyTest(bugId = 123) [DemotingTestWithoutBug]

                @FlakyTest

                ~~~~~~~~~~

                0 errors, 1 warnings
@@ -181,7 +181,7 @@ class DemotingTestWithoutBugDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test [DemotingTestWithoutBug]

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug id to track demoted test, e.g. @FlakyTest(bugId = 123) [DemotingTestWithoutBug]

                @Platinum(devices = "foo,bar")

                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

                0 errors, 1 warnings
@@ -236,7 +236,7 @@ class DemotingTestWithoutBugDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug (e.g. b/123) to track demoted test [DemotingTestWithoutBug]

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug to track demoted test, e.g. @Ignore("b/123") [DemotingTestWithoutBug]

                @Ignore

                ~~~~~~~

                0 errors, 1 warnings
@@ -264,7 +264,7 @@ class DemotingTestWithoutBugDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug (e.g. b/123) to track demoted test [DemotingTestWithoutBug]

                src/test/pkg/TestClass.java:4: Warning: Please attach a bug to track demoted test, e.g. @Ignore("b/123") [DemotingTestWithoutBug]

                @Ignore("Not ready")

                ~~~~~~~~~~~~~~~~~~~~

                0 errors, 1 warnings