OSDN Git Service

AAPT2: Clean up tests a bit
authorAdam Lesinski <adamlesinski@google.com>
Tue, 30 May 2017 22:19:02 +0000 (15:19 -0700)
committerAdam Lesinski <adamlesinski@google.com>
Fri, 9 Jun 2017 21:57:07 +0000 (14:57 -0700)
commita45893a5c51cc26f1fd63ec1aa4c39f55911c85b
tree7e54a8f6e5d328c642309b18c7dfffb083527ccc
parent594fda3161e492fb825d6bb47a8973344cc8e72e
AAPT2: Clean up tests a bit

Since the latest gtest has fixed support for
explicit bool operators, remvoe AAPT_ASSERT_* and AAPT_EXPECT_*.

Also switch to use NotNull() matchers, which are more legible.

Test: make aapt2_tests
Change-Id: Idce199ca9d567d70f7aae275fee15e04bb914c9e
17 files changed:
tools/aapt2/ResourceParser_test.cpp
tools/aapt2/ResourceTable_test.cpp
tools/aapt2/ResourceUtils_test.cpp
tools/aapt2/compile/IdAssigner_test.cpp
tools/aapt2/flatten/TableFlattener_test.cpp
tools/aapt2/link/AutoVersioner_test.cpp
tools/aapt2/link/ReferenceLinker_test.cpp
tools/aapt2/link/XmlReferenceLinker_test.cpp
tools/aapt2/proto/TableProtoSerializer_test.cpp
tools/aapt2/test/Builders.h
tools/aapt2/test/Common.h
tools/aapt2/util/BigBuffer_test.cpp
tools/aapt2/util/Maybe_test.cpp
tools/aapt2/util/Util_test.cpp
tools/aapt2/xml/XmlActionExecutor_test.cpp
tools/aapt2/xml/XmlDom_test.cpp
tools/aapt2/xml/XmlUtil_test.cpp