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

Commit cc946d4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107e am:... 

Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107e am: 1a480d97 am: c094181a

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

Change-Id: Ic83aed5fa5a9ce1aebf9ffc709a36f0338a6fd9f
parents a911459c c094181a

packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java

+3 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class LicenseHtmlGeneratorFromXml { 
            + "</style>\n"

            + "</head>"

            + "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n"

            + "<div class=\"toc\">\n";

            + "<div class=\"toc\">";

    private static final String LIBRARY_HEAD_STRING =

            "<strong>Libraries</strong>\n<ul class=\"libraries\">";

    private static final String LIBRARY_TAIL_STRING = "</ul>\n<strong>Files</strong>";
@@ -324,6 +324,8 @@ class LicenseHtmlGeneratorFromXml { 
            writer.println(LIBRARY_TAIL_STRING);

        }



        writer.println(FILES_HEAD_STRING);



        // Prints all the file list with a link to its license file content.

        for (String fileName : fileNameList) {

            for (Map.Entry<String, Set<String>> libToContentId :

packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java

+14 −11
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class LicenseHtmlGeneratorFromXmlTest { 
            + "</div><!-- table of contents -->\n"

            + "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n"

            + "<tr id=\"id0\"><td class=\"same-license\">\n"

            + "<div class=\"label\">Notices for file(s):</div>\n"

            + "<div class=\"label\"><strong>libA</strong> used by:</div>\n"

            + "<div class=\"file-list\">\n"

            + "/file0 <br/>\n"

            + "/file1 <br/>\n"
@@ -132,7 +132,7 @@ public class LicenseHtmlGeneratorFromXmlTest { 
            + "</pre><!-- license-text -->\n"

            + "</td></tr><!-- same-license -->\n"

            + "<tr id=\"id1\"><td class=\"same-license\">\n"

            + "<div class=\"label\">Notices for file(s):</div>\n"

            + "<div class=\"label\"><strong>libB</strong> used by:</div>\n"

            + "<div class=\"file-list\">\n"

            + "/file0 <br/>\n"

            + "</div><!-- file-list -->\n"
@@ -160,10 +160,12 @@ public class LicenseHtmlGeneratorFromXmlTest { 
        LicenseHtmlGeneratorFromXml.parse(

                new InputStreamReader(new ByteArrayInputStream(VALID_OLD_XML_STRING.getBytes())),

                fileNameToLibraryToContentIdMap, contentIdToFileContentMap);

        assertThat(fileNameToLibraryToContentIdMap.size()).isEqualTo(1);

        assertThat(fileNameToLibraryToContentIdMap.get("").size()).isEqualTo(2);

        assertThat(fileNameToLibraryToContentIdMap.get("").get("/file0")).containsExactly("0");

        assertThat(fileNameToLibraryToContentIdMap.get("").get("/file1")).containsExactly("0");



        assertThat(fileNameToLibraryToContentIdMap).hasSize(2);

        assertThat(fileNameToLibraryToContentIdMap.get("/file0")).hasSize(1);

        assertThat(fileNameToLibraryToContentIdMap.get("/file1")).hasSize(1);

        assertThat(fileNameToLibraryToContentIdMap.get("/file0").get(null)).containsExactly("0");

        assertThat(fileNameToLibraryToContentIdMap.get("/file1").get(null)).containsExactly("0");

        assertThat(contentIdToFileContentMap.size()).isEqualTo(1);

        assertThat(contentIdToFileContentMap.get("0")).isEqualTo("license content #0");

    }
@@ -176,11 +178,12 @@ public class LicenseHtmlGeneratorFromXmlTest { 
        LicenseHtmlGeneratorFromXml.parse(

                new InputStreamReader(new ByteArrayInputStream(VALID_NEW_XML_STRING.getBytes())),

                fileNameToLibraryToContentIdMap, contentIdToFileContentMap);

        assertThat(fileNameToLibraryToContentIdMap.size()).isEqualTo(2);

        assertThat(fileNameToLibraryToContentIdMap.get("libA").size()).isEqualTo(1);

        assertThat(fileNameToLibraryToContentIdMap.get("libB").size()).isEqualTo(1);

        assertThat(fileNameToLibraryToContentIdMap.get("libA").get("/file0")).containsExactly("0");

        assertThat(fileNameToLibraryToContentIdMap.get("libB").get("/file1")).containsExactly("0");



        assertThat(fileNameToLibraryToContentIdMap).hasSize(2);

        assertThat(fileNameToLibraryToContentIdMap.get("/file0")).hasSize(1);

        assertThat(fileNameToLibraryToContentIdMap.get("/file1")).hasSize(1);

        assertThat(fileNameToLibraryToContentIdMap.get("/file0").get("libA")).containsExactly("0");

        assertThat(fileNameToLibraryToContentIdMap.get("/file1").get("libB")).containsExactly("0");

        assertThat(contentIdToFileContentMap.size()).isEqualTo(1);

        assertThat(contentIdToFileContentMap.get("0")).isEqualTo("license content #0");

    }