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

Commit e02fc3fd authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update package ProtoLog is imported from in tests 

We have now moved the ProtoLog class out of common and the tests should reflect that.

Flag: TEST_ONLY
Test: atest com.android.protolog.tool.EndToEndTest
Change-Id: I363666b0058f67e440414c66f22e097664e9aeb7
parent 48b846ee

tools/protologtool/tests/com/android/protolog/tool/EndToEndTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class EndToEndTest { 
        val output = run(

                srcs = mapOf("frameworks/base/org/example/Example.java" to """

                    package org.example;

                    import com.android.internal.protolog.common.ProtoLog;

                    import com.android.internal.protolog.ProtoLog;

                    import static com.android.internal.protolog.ProtoLogGroup.GROUP;



                    class Example {
@@ -48,7 +48,7 @@ class EndToEndTest { 
                """.trimIndent()),

                logGroup = LogGroup("GROUP", true, false, "TAG_GROUP"),

                commandOptions = CommandOptions(arrayOf("transform-protolog-calls",

                        "--protolog-class", "com.android.internal.protolog.common.ProtoLog",

                        "--protolog-class", "com.android.internal.protolog.ProtoLog",

                        "--loggroups-class", "com.android.internal.protolog.ProtoLogGroup",

                        "--loggroups-jar", "not_required.jar",

                        "--viewer-config-file-path", "not_required.pb",
@@ -69,7 +69,7 @@ class EndToEndTest { 
        val output = run(

                srcs = mapOf("frameworks/base/org/example/Example.java" to """

                    package org.example;

                    import com.android.internal.protolog.common.ProtoLog;

                    import com.android.internal.protolog.ProtoLog;

                    import static com.android.internal.protolog.ProtoLogGroup.GROUP;



                    class Example {
@@ -82,7 +82,7 @@ class EndToEndTest { 
                """.trimIndent()),

                logGroup = LogGroup("GROUP", true, false, "TAG_GROUP"),

                commandOptions = CommandOptions(arrayOf("generate-viewer-config",

                        "--protolog-class", "com.android.internal.protolog.common.ProtoLog",

                        "--protolog-class", "com.android.internal.protolog.ProtoLog",

                        "--loggroups-class", "com.android.internal.protolog.ProtoLogGroup",

                        "--loggroups-jar", "not_required.jar",

                        "--viewer-config-type", "json",