diff options
| author | 2022-03-02 22:09:56 +0000 | |
|---|---|---|
| committer | 2022-03-02 22:09:56 +0000 | |
| commit | 1a480d9759df2bc6335c97a293f56cd07e3245cd (patch) | |
| tree | 50add3f8e06f6c9a6353856751e5080015501fff | |
| parent | 079b5b2e27a494282d115209d26c6e067158da37 (diff) | |
| parent | 0239107ed55c14a6facbe8d05e90e31c24377c5f (diff) | |
Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491
Change-Id: Iad2d1f493d8f7185d7a8a4015dbbbae2bdc4959e
2 files changed, 17 insertions, 12 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java index 2c2be0394b6e..c7eb68240c5b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java @@ -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 : diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java index e348865019ec..09b0d7f56e18 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java @@ -120,7 +120,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" @@ -130,7 +130,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" @@ -158,10 +158,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"); } @@ -174,11 +176,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"); } |