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

Commit 05e2959a authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "Fix golden for Third-party licenses UI test." am: 677f5b3d am: bf0a7474 

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



Change-Id: I61759dd7338e1832f23ca41ada80b446613dbfc2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 353d20a2 bf0a7474

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

+17 −3
Original line number Original line Diff line number Diff line
@@ -106,13 +106,20 @@ public class LicenseHtmlGeneratorFromXmlTest { 
            + "license content #1\n"

            + "license content #1\n"

            + "</pre><!-- license-text -->\n"

            + "</pre><!-- license-text -->\n"

            + "</td></tr><!-- same-license -->\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 =

    private static final String HTML_NEW_BODY_STRING =

            "<strong>Libraries</strong>\n"

            "<strong>Libraries</strong>\n"

            + "<ul class=\"libraries\">\n"

            + "<ul class=\"libraries\">\n"

            + "<li><a href=\"#id0\">libA</a></li>\n"

            + "<li><a href=\"#id0\">libA</a></li>\n"

            + "<li><a href=\"#id1\">libB</a></li>\n"

            + "<li><a href=\"#id1\">libB</a></li>\n"

            + "<li><a href=\"#id0\">libC</a></li>\n"

            + "</ul>\n"

            + "</ul>\n"

            + "<strong>Files</strong>\n"

            + "<strong>Files</strong>\n"

            + "<ul class=\"files\">\n"

            + "<ul class=\"files\">\n"
@@ -146,7 +153,14 @@ public class LicenseHtmlGeneratorFromXmlTest { 
            + "license content #1\n"

            + "license content #1\n"

            + "</pre><!-- license-text -->\n"

            + "</pre><!-- license-text -->\n"

            + "</td></tr><!-- same-license -->\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;

    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<>();

        Map<String, Set<String>> toOne = new HashMap<>();





        toBoth.put("", new HashSet<String>(Arrays.asList("0", "1")));

        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("/file0", toBoth);

        fileNameToLibraryToContentIdMap.put("/file1", toOne);

        fileNameToLibraryToContentIdMap.put("/file1", toOne);