From 5b69bb7d6b2948cf9c7c9b65e5fbfad4d9f74ca5 Mon Sep 17 00:00:00 2001 From: Todd Fiala Date: Wed, 28 Sep 2016 20:39:50 +0000 Subject: [PATCH] use assertEquals in TestSBTypeClassMembers This change replaces the self.assertTrue() calls with self.assertEquals() so that test failures get more context on failure values. llvm-svn: 282628 --- .../class_members/TestSBTypeClassMembers.py | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py index cc09096ed2f0..a9e896f2579f 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py +++ b/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py @@ -62,39 +62,46 @@ class SBTypeMemberFunctionsTest(TestBase): Derived = variable.GetType() Base = Derived.GetDirectBaseClassAtIndex(0).GetType() - self.assertTrue( - Derived.GetNumberOfMemberFunctions() == 2, + self.assertEquals(2, + Derived.GetNumberOfMemberFunctions(), "Derived declares two methods") - self.assertTrue(Derived.GetMemberFunctionAtIndex(0).GetType( - ).GetFunctionReturnType().GetName() == "int", "Derived::dImpl returns int") + self.assertEquals("int", Derived.GetMemberFunctionAtIndex(0).GetType( + ).GetFunctionReturnType().GetName(), + "Derived::dImpl returns int") - self.assertTrue( - Base.GetNumberOfMemberFunctions() == 4, + self.assertEquals(4, + Base.GetNumberOfMemberFunctions(), "Base declares three methods") - self.assertTrue(Base.GetMemberFunctionAtIndex(3).GetType( - ).GetFunctionArgumentTypes().GetSize() == 3, "Base::sfunc takes three arguments") - self.assertTrue(Base.GetMemberFunctionAtIndex( - 3).GetName() == "sfunc", "Base::sfunc not found") - self.assertTrue(Base.GetMemberFunctionAtIndex(3).GetKind( - ) == lldb.eMemberFunctionKindStaticMethod, "Base::sfunc is a static") - self.assertTrue(Base.GetMemberFunctionAtIndex(2).GetType( - ).GetFunctionArgumentTypes().GetSize() == 0, "Base::dat takes no arguments") - self.assertTrue(Base.GetMemberFunctionAtIndex(1).GetType().GetFunctionArgumentTypes( - ).GetTypeAtIndex(1).GetName() == "char", "Base::bar takes a second 'char' argument") - self.assertTrue(Base.GetMemberFunctionAtIndex( - 1).GetName() == "bar", "Base::bar not found") + self.assertEquals(3, Base.GetMemberFunctionAtIndex(3).GetType( + ).GetFunctionArgumentTypes().GetSize(), + "Base::sfunc takes three arguments") + self.assertEquals("sfunc", Base.GetMemberFunctionAtIndex( + 3).GetName(), "Base::sfunc not found") + self.assertEquals(lldb.eMemberFunctionKindStaticMethod, + Base.GetMemberFunctionAtIndex(3).GetKind(), + "Base::sfunc is a static") + self.assertEquals(0, Base.GetMemberFunctionAtIndex(2).GetType( + ).GetFunctionArgumentTypes().GetSize(), + "Base::dat takes no arguments") + self.assertEquals("char", + Base.GetMemberFunctionAtIndex(1).GetType().GetFunctionArgumentTypes( + ).GetTypeAtIndex(1).GetName(), + "Base::bar takes a second 'char' argument") + self.assertEquals("bar", + Base.GetMemberFunctionAtIndex(1).GetName(), "Base::bar not found") variable = frame0.FindVariable("thingy") Thingy = variable.GetType() - self.assertTrue( - Thingy.GetNumberOfMemberFunctions() == 2, + self.assertEquals( + 2, Thingy.GetNumberOfMemberFunctions(), "Thingy declares two methods") - self.assertTrue(Thingy.GetMemberFunctionAtIndex( - 0).GetReturnType().GetName() == "id", "Thingy::init returns an id") - self.assertTrue( - Thingy.GetMemberFunctionAtIndex(1).GetNumberOfArguments() == 2, + self.assertEquals("id", Thingy.GetMemberFunctionAtIndex( + 0).GetReturnType().GetName(), "Thingy::init returns an id") + self.assertEquals(2, + Thingy.GetMemberFunctionAtIndex(1).GetNumberOfArguments(), "Thingy::foo takes two arguments") - self.assertTrue(Thingy.GetMemberFunctionAtIndex(1).GetArgumentTypeAtIndex( - 0).GetName() == "int", "Thingy::foo takes an int") + self.assertEquals("int", + Thingy.GetMemberFunctionAtIndex(1).GetArgumentTypeAtIndex( + 0).GetName(), "Thingy::foo takes an int")