From 803c7c807969bea1f1c50f348832f5b60ad05d8e Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 6 Apr 2016 16:09:43 -0700 Subject: AAPT2: Enable windows build and make sure it builds Mingw32 4.8 is kind of picky with macros and some complicated template stuff. Luckily there was another way to represent the SFINAE code that works on all platforms. Yay! Change-Id: Idc2e38f47bfdc57b394550bfa0f53cc0b825df25 --- tools/aapt2/java/JavaClassGenerator_test.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp') diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 4f041b88efbc..370e78a7b9d2 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -239,13 +239,15 @@ TEST(JavaClassGeneratorTest, CommentsForSimpleResourcesArePresent) { ASSERT_TRUE(generator.generate(u"android", &out)); std::string actual = out.str(); - EXPECT_NE(std::string::npos, actual.find( - R"EOF(/** + const char* expectedText = +R"EOF(/** * This is a comment * @deprecated */ @Deprecated - public static final int foo=0x01010000;)EOF")); + public static final int foo=0x01010000;)EOF"; + + EXPECT_NE(std::string::npos, actual.find(expectedText)); } TEST(JavaClassGeneratorTest, CommentsForEnumAndFlagAttributesArePresent) { -- cgit v1.2.3