diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java index 2c2be0394b6e4..c7eb68240c5b3 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 { + "\n" + "" + "\n" - + "
\n"; + + "
"; private static final String LIBRARY_HEAD_STRING = "Libraries\n\nFiles"; @@ -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> 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 e348865019ec4..09b0d7f56e18c 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 { + "
\n" + "\n" + "\n" + "
\n" - + "
Notices for file(s):
\n" + + "
libA used by:
\n" + "
\n" + "/file0
\n" + "/file1
\n" @@ -130,7 +130,7 @@ public class LicenseHtmlGeneratorFromXmlTest { + "\n" + "
\n" - + "
Notices for file(s):
\n" + + "
libB used by:
\n" + "
\n" + "/file0
\n" + "
\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"); }