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

Commit 9b69eeee authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Update package ProtoLog is imported from in tests" into main

parents 307aaca0 e02fc3fd

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

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

        val output = run(

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

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

                    package org.example;

                    package org.example;

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

                    import com.android.internal.protolog.ProtoLog;

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

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





                    class Example {

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

                """.trimIndent()),

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

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

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

                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-class", "com.android.internal.protolog.ProtoLogGroup",

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

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

                        "--viewer-config-file-path", "not_required.pb",

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

        val output = run(

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

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

                    package org.example;

                    package org.example;

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

                    import com.android.internal.protolog.ProtoLog;

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

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





                    class Example {

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

                """.trimIndent()),

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

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

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

                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-class", "com.android.internal.protolog.ProtoLogGroup",

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

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

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

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