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

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

Merge "Remove long-deprecated assertEquals uses" into main am: 91edc7f6 

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



Change-Id: I6fcec5f7a54efba2d279c58259ff77fef7f1a5ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ce03faf 91edc7f6

data/fonts/script/test/test_commandline.py

+7 −7
Original line number Diff line number Diff line
@@ -75,20 +75,20 @@ class CommandlineTest(unittest.TestCase): 
        functools.partial(CommandlineTest.fileread, filemap),

    )



    self.assertEquals("output.xml", args.outfile)

    self.assertEqual("output.xml", args.outfile)



    self.assertEquals(1, len(args.aliases))

    self.assertEquals("sans-serif-thin", args.aliases[0].name)

    self.assertEquals("sans-serif", args.aliases[0].to)

    self.assertEquals(100, args.aliases[0].weight)

    self.assertEqual(1, len(args.aliases))

    self.assertEqual("sans-serif-thin", args.aliases[0].name)

    self.assertEqual("sans-serif", args.aliases[0].to)

    self.assertEqual(100, args.aliases[0].weight)



    self.assertEquals(2, len(args.fallback))

    self.assertEqual(2, len(args.fallback))

    # Order is not a part of expectation. Check the expected lang is included.

    langs = set(["und-Arab", "und-Ethi"])

    self.assertTrue(args.fallback[0].lang in langs)

    self.assertTrue(args.fallback[1].lang in langs)



    self.assertEquals(3, len(args.families))

    self.assertEqual(3, len(args.families))

    # Order is not a part of expectation. Check the expected name is included.

    names = set(["sans-serif", "sans-serif-condensed", "roboto-flex"])

    self.assertTrue(args.families[0].name in names)

data/fonts/script/test/test_xml_builder.py

+10 −10
Original line number Diff line number Diff line
@@ -328,16 +328,16 @@ class XmlBuilderTest(unittest.TestCase): 
      self.expect_xml(xml)



  def expect_xml(self, xml):

    self.assertEquals("sans-serif", xml.families[0].name)  # _SANS_SERIF

    self.assertEquals("serif", xml.families[1].name)  # _SERIF

    self.assertEquals("und-Arab", xml.families[2].lang)  # __ARABIC

    self.assertEquals("elegant", xml.families[2].variant)

    self.assertEquals("und-Arab", xml.families[3].lang)  # _ARABIC_UI

    self.assertEquals("zh-Hans", xml.families[4].lang)  # _HANS (_HANS_SERIF)

    self.assertEquals(2, len(xml.families[4].fonts))

    self.assertEquals("serif", xml.families[4].fonts[1].fallback_for)

    self.assertEquals("ja", xml.families[5].lang)  # _HANS (_HANS_SERIF)

    self.assertEquals("serif", xml.families[5].fonts[1].fallback_for)

    self.assertEqual("sans-serif", xml.families[0].name)  # _SANS_SERIF

    self.assertEqual("serif", xml.families[1].name)  # _SERIF

    self.assertEqual("und-Arab", xml.families[2].lang)  # __ARABIC

    self.assertEqual("elegant", xml.families[2].variant)

    self.assertEqual("und-Arab", xml.families[3].lang)  # _ARABIC_UI

    self.assertEqual("zh-Hans", xml.families[4].lang)  # _HANS (_HANS_SERIF)

    self.assertEqual(2, len(xml.families[4].fonts))

    self.assertEqual("serif", xml.families[4].fonts[1].fallback_for)

    self.assertEqual("ja", xml.families[5].lang)  # _HANS (_HANS_SERIF)

    self.assertEqual("serif", xml.families[5].fonts[1].fallback_for)





if __name__ == "__main__":