diff options
| author | 2022-10-12 23:41:57 +0000 | |
|---|---|---|
| committer | 2022-10-12 23:41:57 +0000 | |
| commit | 05e2959ab65bf09ef5d656c20fdf1eed10915865 (patch) | |
| tree | 1619891d8a8117239a2031ac4595c416434bee94 | |
| parent | 353d20a2deb8bfc72c6d756d7d4b70dd2f217fb0 (diff) | |
| parent | bf0a7474f950a846ab847958dd29dba6719de16c (diff) | |
Merge "Fix golden for Third-party licenses UI test." am: 677f5b3d75 am: bf0a7474f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2252713
Change-Id: I61759dd7338e1832f23ca41ada80b446613dbfc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java | 20 |
1 files changed, 17 insertions, 3 deletions
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 fe337d267f25..8e33ca338eb1 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 @@ -106,13 +106,20 @@ public class LicenseHtmlGeneratorFromXmlTest { + "license content #1\n" + "</pre><!-- license-text -->\n" + "</td></tr><!-- same-license -->\n" - + "</table></body></html>\n"; + + "</table>\n" + + "<div class=\"path-counts\"><table>\n" + + " <tr><th>Path prefix</th><th>Count</th></tr>\n\n" + + " <tr><td>file0</td><td>1</td></tr>\n" + + " <tr><td>file1</td><td>1</td></tr>\n" + + "</table></div>\n\n" + + "</body></html>\n"; private static final String HTML_NEW_BODY_STRING = "<strong>Libraries</strong>\n" + "<ul class=\"libraries\">\n" + "<li><a href=\"#id0\">libA</a></li>\n" + "<li><a href=\"#id1\">libB</a></li>\n" + + "<li><a href=\"#id0\">libC</a></li>\n" + "</ul>\n" + "<strong>Files</strong>\n" + "<ul class=\"files\">\n" @@ -146,7 +153,14 @@ public class LicenseHtmlGeneratorFromXmlTest { + "license content #1\n" + "</pre><!-- license-text -->\n" + "</td></tr><!-- same-license -->\n" - + "</table></body></html>\n"; + + "</table>\n" + + "<div class=\"path-counts\"><table>\n" + + " <tr><th>Path prefix</th><th>Count</th></tr>\n\n" + + " <tr><td>file0</td><td>1</td></tr>\n" + + " <tr><td>file1</td><td>1</td></tr>\n" + + " <tr><td>file2</td><td>1</td></tr>\n" + + "</table></div>\n\n" + + "</body></html>\n"; private static final String EXPECTED_OLD_HTML_STRING = HTML_HEAD_STRING + HTML_OLD_BODY_STRING; @@ -263,7 +277,7 @@ public class LicenseHtmlGeneratorFromXmlTest { Map<String, Set<String>> toOne = new HashMap<>(); toBoth.put("", new HashSet<String>(Arrays.asList("0", "1"))); - toOne.put("", new HashSet<String>(Arrays.asList("0", "1"))); + toOne.put("", new HashSet<String>(Arrays.asList("0"))); fileNameToLibraryToContentIdMap.put("/file0", toBoth); fileNameToLibraryToContentIdMap.put("/file1", toOne); |