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

Commit 98d06c5b authored by Max Loh's avatar Max Loh
Browse files

aslgen fix coding conventions for unused result to allow it to build in Google3 for copybara. 

Bug: 350986688
Test: Unit tests
Flag: NONE (Command-line tool which doesn't affect Android functionality)
Change-Id: Ia6512f9d3f6a9a20e051e45fd077e68b875e2ee2
parent 47879cf9

tools/app_metadata_bundles/src/test/java/com/android/asllib/marshallable/AppInfoTest.java

+9 −8
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public class AppInfoTest { 
    @Test

    public void testAllFieldsValidV1() throws Exception {

        System.out.println("starting testAllFieldsValidV1.");

        var unused =

                new AppInfoFactory()

                        .createFromOdElement(

                                TestUtils.getElementFromResource(
@@ -133,7 +134,7 @@ public class AppInfoTest { 
                    TestUtils.getElementFromResource(

                            Paths.get(APP_INFO_OD_PATH, ALL_FIELDS_VALID_V1_FILE_NAME));

            TestUtils.removeOdChildEleWithName(appInfoEle, optField);

            new AppInfoFactory().createFromOdElement(appInfoEle, 1L);

            var unused = new AppInfoFactory().createFromOdElement(appInfoEle, 1L);

        }

    }
@@ -202,7 +203,7 @@ public class AppInfoTest { 
                            Paths.get(APP_INFO_HR_PATH, ALL_FIELDS_VALID_FILE_NAME));

            ele.removeAttribute(optField);

            AppInfo appInfo = new AppInfoFactory().createFromHrElement(ele, DEFAULT_VERSION);

            appInfo.toOdDomElement(TestUtils.document());

            var unused = appInfo.toOdDomElement(TestUtils.document());

        }



        for (String optField : OPTIONAL_FIELD_NAMES_OD) {
@@ -211,7 +212,7 @@ public class AppInfoTest { 
                            Paths.get(APP_INFO_OD_PATH, ALL_FIELDS_VALID_FILE_NAME));

            TestUtils.removeOdChildEleWithName(ele, optField);

            AppInfo appInfo = new AppInfoFactory().createFromOdElement(ele, DEFAULT_VERSION);

            appInfo.toHrDomElement(TestUtils.document());

            var unused = appInfo.toHrDomElement(TestUtils.document());

        }

    }

tools/app_metadata_bundles/src/test/java/com/android/asllib/marshallable/DeveloperInfoTest.java

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class DeveloperInfoTest { 
            developerInfoEle.removeAttribute(optField);

            DeveloperInfo developerInfo =

                    new DeveloperInfoFactory().createFromHrElement(developerInfoEle);

            developerInfo.toOdDomElement(TestUtils.document());

            var unused = developerInfo.toOdDomElement(TestUtils.document());

        }



        for (String optField : OPTIONAL_FIELD_NAMES_OD) {
@@ -109,7 +109,7 @@ public class DeveloperInfoTest { 
            TestUtils.removeOdChildEleWithName(developerInfoEle, optField);

            DeveloperInfo developerInfo =

                    new DeveloperInfoFactory().createFromOdElement(developerInfoEle);

            developerInfo.toHrDomElement(TestUtils.document());

            var unused = developerInfo.toHrDomElement(TestUtils.document());

        }

    }

tools/app_metadata_bundles/src/test/java/com/android/asllib/marshallable/SecurityLabelsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class SecurityLabelsTest { 
                            Paths.get(SECURITY_LABELS_HR_PATH, ALL_FIELDS_VALID_FILE_NAME));

            ele.removeAttribute(optField);

            SecurityLabels securityLabels = new SecurityLabelsFactory().createFromHrElement(ele);

            securityLabels.toOdDomElement(TestUtils.document());

            var unused = securityLabels.toOdDomElement(TestUtils.document());

        }

        for (String optField : OPTIONAL_FIELD_NAMES_OD) {

            var ele =
@@ -72,7 +72,7 @@ public class SecurityLabelsTest { 
                            Paths.get(SECURITY_LABELS_OD_PATH, ALL_FIELDS_VALID_FILE_NAME));

            TestUtils.removeOdChildEleWithName(ele, optField);

            SecurityLabels securityLabels = new SecurityLabelsFactory().createFromOdElement(ele);

            securityLabels.toHrDomElement(TestUtils.document());

            var unused = securityLabels.toHrDomElement(TestUtils.document());

        }

    }