summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lldb/scripts/Python/python-wrapper.swig26
-rw-r--r--lldb/unittests/CMakeLists.txt3
-rw-r--r--lldb/unittests/Host/CMakeLists.txt5
-rw-r--r--lldb/unittests/Interpreter/CMakeLists.txt10
-rw-r--r--lldb/unittests/Interpreter/TestArgs.cpp16
-rw-r--r--lldb/unittests/Plugins/Process/Linux/CMakeLists.txt5
-rw-r--r--lldb/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp30
-rw-r--r--lldb/unittests/Utility/CMakeLists.txt5
-rw-r--r--lldb/unittests/Utility/StringExtractorTest.cpp74
9 files changed, 87 insertions, 87 deletions
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig
index 10bbf1be55b..af8ea65db89 100644
--- a/lldb/scripts/Python/python-wrapper.swig
+++ b/lldb/scripts/Python/python-wrapper.swig
@@ -919,28 +919,22 @@ LLDBSwigPythonCallCommandObject
lldb::SBDebugger debugger_sb(debugger);
lldb::SBExecutionContext exe_ctx_sb(exe_ctx_ref_sp);
- bool retval = false;
-
- {
- PyErr_Cleaner py_err_cleaner(true);
-
- PyCallable pfunc = PyCallable::FindWithMemberFunction(implementor,"__call__");
+ PyErr_Cleaner py_err_cleaner(true);
- if (!pfunc)
- return NULL;
+ PyCallable pfunc = PyCallable::FindWithMemberFunction(implementor,"__call__");
- // pass the pointer-to cmd_retobj_sb or watch the underlying object disappear from under you
- // see comment above for SBCommandReturnObjectReleaser for further details
- PyObject* pvalue = NULL;
+ if (!pfunc)
+ return false;
- pvalue = pfunc(debugger_sb, args, exe_ctx_sb, &cmd_retobj_sb);
+ // pass the pointer-to cmd_retobj_sb or watch the underlying object disappear from under you
+ // see comment above for SBCommandReturnObjectReleaser for further details
+ PyObject* pvalue = NULL;
- Py_XDECREF (pvalue);
+ pvalue = pfunc(debugger_sb, args, exe_ctx_sb, &cmd_retobj_sb);
- retval = true;
- }
+ Py_XDECREF (pvalue);
- return retval;
+ return true;
}
SWIGEXPORT void*
diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt
index 64dee012344..034920a857c 100644
--- a/lldb/unittests/CMakeLists.txt
+++ b/lldb/unittests/CMakeLists.txt
@@ -15,9 +15,6 @@ endif ()
# Will compile the list of files together and link against
function(add_lldb_unittest test_name)
add_unittest(LLDBUnitTests ${test_name} ${ARGN})
-
- target_link_libraries(${test_name} lldbBase)
- target_link_libraries(${test_name} ${LLDB_USED_LIBS})
endfunction()
add_subdirectory(Host)
diff --git a/lldb/unittests/Host/CMakeLists.txt b/lldb/unittests/Host/CMakeLists.txt
index 227e48c1fd9..7611c273a10 100644
--- a/lldb/unittests/Host/CMakeLists.txt
+++ b/lldb/unittests/Host/CMakeLists.txt
@@ -3,3 +3,8 @@ add_lldb_unittest(HostTests
SocketTest.cpp
SocketTestMock.cpp
)
+
+target_link_libraries(HostTests
+ lldbBase
+ ${PYTHON_LIBRARY}
+ )
diff --git a/lldb/unittests/Interpreter/CMakeLists.txt b/lldb/unittests/Interpreter/CMakeLists.txt
index 4587a01b616..ea69bf42426 100644
--- a/lldb/unittests/Interpreter/CMakeLists.txt
+++ b/lldb/unittests/Interpreter/CMakeLists.txt
@@ -1,8 +1,8 @@
-set(LLDB_USED_LIBS
- lldbInterpreter
- ${PYTHON_LIBRARY}
- )
-
add_lldb_unittest(InterpreterTests
TestArgs.cpp
)
+
+target_link_libraries(InterpreterTests
+ lldbInterpreter
+ ${PYTHON_LIBRARY}
+ )
diff --git a/lldb/unittests/Interpreter/TestArgs.cpp b/lldb/unittests/Interpreter/TestArgs.cpp
index a459721d03a..e2cf1c4d4a0 100644
--- a/lldb/unittests/Interpreter/TestArgs.cpp
+++ b/lldb/unittests/Interpreter/TestArgs.cpp
@@ -17,7 +17,7 @@ TEST(ArgsTest, TestSingleArg)
{
Args args;
args.SetCommandString("arg");
- EXPECT_EQ(1, args.GetArgumentCount());
+ EXPECT_EQ(1u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg");
}
@@ -25,7 +25,7 @@ TEST(ArgsTest, TestSingleQuotedArgWithSpace)
{
Args args;
args.SetCommandString("\"arg with space\"");
- EXPECT_EQ(1, args.GetArgumentCount());
+ EXPECT_EQ(1u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg with space");
}
@@ -33,7 +33,7 @@ TEST(ArgsTest, TestSingleArgWithQuotedSpace)
{
Args args;
args.SetCommandString("arg\\ with\\ space");
- EXPECT_EQ(1, args.GetArgumentCount());
+ EXPECT_EQ(1u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg with space");
}
@@ -41,7 +41,7 @@ TEST(ArgsTest, TestMultipleArgs)
{
Args args;
args.SetCommandString("this has multiple args");
- EXPECT_EQ(4, args.GetArgumentCount());
+ EXPECT_EQ(4u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "this");
EXPECT_STREQ(args.GetArgumentAtIndex(1), "has");
EXPECT_STREQ(args.GetArgumentAtIndex(2), "multiple");
@@ -52,9 +52,9 @@ TEST(ArgsTest, TestOverwriteArgs)
{
Args args;
args.SetCommandString("this has multiple args");
- EXPECT_EQ(4, args.GetArgumentCount());
+ EXPECT_EQ(4u, args.GetArgumentCount());
args.SetCommandString("arg");
- EXPECT_EQ(1, args.GetArgumentCount());
+ EXPECT_EQ(1u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "arg");
}
@@ -62,9 +62,9 @@ TEST(ArgsTest, TestAppendArg)
{
Args args;
args.SetCommandString("first_arg");
- EXPECT_EQ(1, args.GetArgumentCount());
+ EXPECT_EQ(1u, args.GetArgumentCount());
args.AppendArgument("second_arg");
- EXPECT_EQ(2, args.GetArgumentCount());
+ EXPECT_EQ(2u, args.GetArgumentCount());
EXPECT_STREQ(args.GetArgumentAtIndex(0), "first_arg");
EXPECT_STREQ(args.GetArgumentAtIndex(1), "second_arg");
}
diff --git a/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt b/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt
index c733f372895..1a23eae8037 100644
--- a/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt
+++ b/lldb/unittests/Plugins/Process/Linux/CMakeLists.txt
@@ -2,3 +2,8 @@ add_lldb_unittest(ProcessLinuxTests
ThreadStateCoordinatorTest.cpp
ThreadStateCoordinatorTestMock.cpp
)
+
+target_link_libraries(ProcessLinuxTests
+ lldbBase
+ ${PYTHON_LIBRARY}
+ )
diff --git a/lldb/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp b/lldb/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp
index 9e7cc8eb4ca..2716a4de6b7 100644
--- a/lldb/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp
+++ b/lldb/unittests/Plugins/Process/Linux/ThreadStateCoordinatorTest.cpp
@@ -11,12 +11,6 @@ namespace
const ThreadStateCoordinator::ThreadIDSet EMPTY_THREAD_ID_SET;
void
- NOPLogger (const char *format, va_list args)
- {
- // Do nothing.
- }
-
- void
StdoutLogger (const char *format, va_list args)
{
// Print to stdout.
@@ -279,7 +273,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterTheadsStopSignalsErrorOnUnknownPend
ASSERT_EQ (false, DidFireDeferredNotification ());
// Shouldn't have triggered stop request due to unknown tid.
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
}
TEST_F (ThreadStateCoordinatorTest, CallAfterThreadsStopFiresWhenNoPendingStops)
@@ -358,13 +352,13 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterThreadsStopFiresWhenTwoPendingStops
// Neither trigger should have gone off yet.
ASSERT_EQ (false, DidFireDeferredNotification ());
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
// Process next event.
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
// Now the request thread stops should have been called for the pending stop tids.
- ASSERT_EQ (2, GetRequestedStopCount ());
+ ASSERT_EQ (2u, GetRequestedStopCount ());
ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID_02));
@@ -437,7 +431,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterThreadsStopFiresWhenTwoPendingOneAl
// Neither trigger should have gone off yet.
ASSERT_EQ (false, DidFireDeferredNotification ());
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
// Process next event.
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
@@ -471,7 +465,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterThreadsStopFiresWhenOnePendingThrea
// Neither trigger should have gone off yet.
ASSERT_EQ (false, DidFireDeferredNotification ());
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
// Process next event.
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
@@ -509,7 +503,7 @@ TEST_F (ThreadStateCoordinatorTest, ExistingPendingNotificationRequiresStopFromN
// Neither trigger should have gone off yet.
ASSERT_EQ (false, DidFireDeferredNotification ());
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
// Process next event.
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
@@ -524,7 +518,7 @@ TEST_F (ThreadStateCoordinatorTest, ExistingPendingNotificationRequiresStopFromN
SetupKnownRunningThread (NEW_THREAD_TID);
// We should have just received a stop request for the new thread id.
- ASSERT_EQ (2, GetRequestedStopCount ());
+ ASSERT_EQ (2u, GetRequestedStopCount ());
ASSERT_EQ (true, DidRequestStopForTid (NEW_THREAD_TID));
// Now report the original pending tid stopped. This should no longer
@@ -688,13 +682,13 @@ TEST_F (ThreadStateCoordinatorTest, ResumedThreadAlreadyMarkedDoesNotHoldUpPendi
// Neither trigger should have gone off yet.
ASSERT_EQ (false, DidFireDeferredNotification ());
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
// Execute CallAfterThreadsStop.
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
// Both TID A and TID B should have had stop requests made.
- ASSERT_EQ (2, GetRequestedStopCount ());
+ ASSERT_EQ (2u, GetRequestedStopCount ());
ASSERT_EQ (true, DidRequestStopForTid (PENDING_TID_A));
ASSERT_EQ (true, DidRequestStopForTid (PENDING_TID_B));
@@ -748,7 +742,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterRunningThreadsStopFiresWhenNoRunnin
ASSERT_EQ (TRIGGERING_TID, GetDeferredNotificationTID ());
// And no stop requests should have been made.
- ASSERT_EQ (0, GetRequestedStopCount ());
+ ASSERT_EQ (0u, GetRequestedStopCount ());
}
TEST_F (ThreadStateCoordinatorTest, CallAfterRunningThreadsStopRequestsTwoPendingStops)
@@ -768,7 +762,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterRunningThreadsStopRequestsTwoPendin
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
// We should have two stop requests for the two threads currently running.
- ASSERT_EQ (2, GetRequestedStopCount ());
+ ASSERT_EQ (2u, GetRequestedStopCount ());
ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID_02));
@@ -805,7 +799,7 @@ TEST_F (ThreadStateCoordinatorTest, CallAfterRunningThreadsStopRequestsStopTwoOt
ASSERT_PROCESS_NEXT_EVENT_SUCCEEDS ();
// We should have two stop requests for the two threads currently running.
- ASSERT_EQ (1, GetRequestedStopCount ());
+ ASSERT_EQ (1u, GetRequestedStopCount ());
ASSERT_EQ (true, DidRequestStopForTid (PENDING_STOP_TID));
// But the deferred stop notification should not have fired yet.
diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt
index fea0f53fdd9..4100f8e9e62 100644
--- a/lldb/unittests/Utility/CMakeLists.txt
+++ b/lldb/unittests/Utility/CMakeLists.txt
@@ -2,3 +2,8 @@ add_lldb_unittest(UtilityTests
StringExtractorTest.cpp
UriParserTest.cpp
)
+
+target_link_libraries(UtilityTests
+ lldbBase
+ ${PYTHON_LIBRARY}
+ )
diff --git a/lldb/unittests/Utility/StringExtractorTest.cpp b/lldb/unittests/Utility/StringExtractorTest.cpp
index cbb3816b79b..3880872f6bb 100644
--- a/lldb/unittests/Utility/StringExtractorTest.cpp
+++ b/lldb/unittests/Utility/StringExtractorTest.cpp
@@ -16,10 +16,10 @@ TEST_F (StringExtractorTest, InitEmpty)
StringExtractor ex (kEmptyString);
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetFilePos());
ASSERT_STREQ (kEmptyString, ex.GetStringRef().c_str());
ASSERT_EQ (true, ex.Empty());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -29,7 +29,7 @@ TEST_F (StringExtractorTest, InitMisc)
StringExtractor ex (kInitMiscString);
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetFilePos());
ASSERT_STREQ (kInitMiscString, ex.GetStringRef().c_str());
ASSERT_EQ (false, ex.Empty());
ASSERT_EQ (sizeof(kInitMiscString)-1, ex.GetBytesLeft());
@@ -43,9 +43,9 @@ TEST_F (StringExtractorTest, DecodeHexU8_Underflow)
ASSERT_EQ (-1, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetFilePos());
ASSERT_EQ (true, ex.Empty());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -56,8 +56,8 @@ TEST_F (StringExtractorTest, DecodeHexU8_Underflow2)
ASSERT_EQ (-1, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
- ASSERT_EQ (1, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetFilePos());
+ ASSERT_EQ (1u, ex.GetBytesLeft());
ASSERT_EQ ('1', *ex.Peek());
}
@@ -68,8 +68,8 @@ TEST_F (StringExtractorTest, DecodeHexU8_InvalidHex)
ASSERT_EQ (-1, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('x', *ex.Peek());
}
@@ -80,8 +80,8 @@ TEST_F (StringExtractorTest, DecodeHexU8_InvalidHex2)
ASSERT_EQ (-1, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('a', *ex.Peek());
}
@@ -92,8 +92,8 @@ TEST_F (StringExtractorTest, DecodeHexU8_Exact)
ASSERT_EQ (0x12, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -104,8 +104,8 @@ TEST_F (StringExtractorTest, DecodeHexU8_Extra)
ASSERT_EQ (0x12, ex.DecodeHexU8());
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('3', *ex.Peek());
}
@@ -118,7 +118,7 @@ TEST_F (StringExtractorTest, GetHexU8_Underflow)
ASSERT_EQ (false, ex.IsGood());
ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
ASSERT_EQ (true, ex.Empty());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -130,7 +130,7 @@ TEST_F (StringExtractorTest, GetHexU8_Underflow2)
ASSERT_EQ (0xbc, ex.GetHexU8(0xbc));
ASSERT_EQ (false, ex.IsGood());
ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -142,7 +142,7 @@ TEST_F (StringExtractorTest, GetHexU8_InvalidHex)
ASSERT_EQ (0xcd, ex.GetHexU8(0xcd));
ASSERT_EQ (false, ex.IsGood());
ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -153,8 +153,8 @@ TEST_F (StringExtractorTest, GetHexU8_Exact)
ASSERT_EQ (0x12, ex.GetHexU8(0x12));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -165,8 +165,8 @@ TEST_F (StringExtractorTest, GetHexU8_Extra)
ASSERT_EQ (0x12, ex.GetHexU8(0x12));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('3', *ex.Peek());
}
@@ -180,7 +180,7 @@ TEST_F (StringExtractorTest, GetHexU8_Underflow_NoEof)
ASSERT_EQ (false, ex.IsGood()); // this result seems inconsistent with kSetEofOnFail == false
ASSERT_EQ (UINT64_MAX, ex.GetFilePos());
ASSERT_EQ (true, ex.Empty());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -192,8 +192,8 @@ TEST_F (StringExtractorTest, GetHexU8_Underflow2_NoEof)
ASSERT_EQ (0xbc, ex.GetHexU8(0xbc, kSetEofOnFail));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
- ASSERT_EQ (1, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetFilePos());
+ ASSERT_EQ (1u, ex.GetBytesLeft());
ASSERT_EQ ('1', *ex.Peek());
}
@@ -205,8 +205,8 @@ TEST_F (StringExtractorTest, GetHexU8_InvalidHex_NoEof)
ASSERT_EQ (0xcd, ex.GetHexU8(0xcd, kSetEofOnFail));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (0, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (0u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('x', *ex.Peek());
}
@@ -218,8 +218,8 @@ TEST_F (StringExtractorTest, GetHexU8_Exact_NoEof)
ASSERT_EQ (0x12, ex.GetHexU8(0x12, kSetEofOnFail));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (0, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (0u, ex.GetBytesLeft());
ASSERT_EQ (nullptr, ex.Peek());
}
@@ -231,8 +231,8 @@ TEST_F (StringExtractorTest, GetHexU8_Extra_NoEof)
ASSERT_EQ (0x12, ex.GetHexU8(0x12, kSetEofOnFail));
ASSERT_EQ (true, ex.IsGood());
- ASSERT_EQ (2, ex.GetFilePos());
- ASSERT_EQ (2, ex.GetBytesLeft());
+ ASSERT_EQ (2u, ex.GetFilePos());
+ ASSERT_EQ (2u, ex.GetBytesLeft());
ASSERT_EQ ('3', *ex.Peek());
}
@@ -256,7 +256,7 @@ TEST_F (StringExtractorTest, GetHexBytes)
ASSERT_EQ(true, ex.IsGood());
ASSERT_EQ(2*kValidHexPairs, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(4, ex.GetBytesLeft());
+ ASSERT_EQ(4u, ex.GetBytesLeft());
ASSERT_EQ('x', *ex.Peek());
}
@@ -285,7 +285,7 @@ TEST_F (StringExtractorTest, GetHexBytes_Underflow)
ASSERT_EQ(false, ex.IsGood());
ASSERT_EQ(UINT64_MAX, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(0, ex.GetBytesLeft());
+ ASSERT_EQ(0u, ex.GetBytesLeft());
ASSERT_EQ(0, ex.Peek());
}
@@ -315,7 +315,7 @@ TEST_F (StringExtractorTest, GetHexBytes_Partial)
ASSERT_EQ(true, ex.IsGood());
ASSERT_EQ(kReadBytes*2, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(12, ex.GetBytesLeft());
+ ASSERT_EQ(12u, ex.GetBytesLeft());
ASSERT_EQ('2', *ex.Peek());
}
@@ -339,7 +339,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail)
ASSERT_EQ(true, ex.IsGood());
ASSERT_EQ(2*kValidHexPairs, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(4, ex.GetBytesLeft());
+ ASSERT_EQ(4u, ex.GetBytesLeft());
ASSERT_EQ('x', *ex.Peek());
}
@@ -369,7 +369,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail_Underflow)
ASSERT_EQ(true, ex.IsGood());
ASSERT_EQ(kValidHexPairs*2, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(4, ex.GetBytesLeft());
+ ASSERT_EQ(4u, ex.GetBytesLeft());
ASSERT_EQ('x', *ex.Peek());
}
@@ -399,7 +399,7 @@ TEST_F (StringExtractorTest, GetHexBytesAvail_Partial)
ASSERT_EQ(true, ex.IsGood());
ASSERT_EQ(kReadBytes*2, ex.GetFilePos());
ASSERT_EQ(false, ex.Empty());
- ASSERT_EQ(12, ex.GetBytesLeft());
+ ASSERT_EQ(12u, ex.GetBytesLeft());
ASSERT_EQ('2', *ex.Peek());
}
OpenPOWER on IntegriCloud