From 6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 14 Nov 2014 14:48:12 -0800 Subject: AAPT2 First checking of AAPT2. The individual phases of AAPT2 work, but there are some missing pieces. For early testing we are missing: - Need to properly mark file references and include them in package - Need to package into zip Final AAPT for apps we are missing: - Need to crush PNGs - Need to parse 9-patches - Need to validate all of AndroidManifest.xml - Need to write align method to align resource tables for splits. Final AAPT for apps + system we are missing: - Need to handle overlays - Need to store comments for R file - Need to handle --shared-lib (dynamic references too). New AAPT features coming: - Need to import compiled libraries - Name mangling - R file generation for library code Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d --- tools/aapt2/JavaClassGenerator_test.cpp | 85 +++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 tools/aapt2/JavaClassGenerator_test.cpp (limited to 'tools/aapt2/JavaClassGenerator_test.cpp') diff --git a/tools/aapt2/JavaClassGenerator_test.cpp b/tools/aapt2/JavaClassGenerator_test.cpp new file mode 100644 index 000000000000..32050e30fd8a --- /dev/null +++ b/tools/aapt2/JavaClassGenerator_test.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "JavaClassGenerator.h" +#include "ResourceTable.h" +#include "ResourceValues.h" +#include "Util.h" + +#include +#include +#include + +namespace aapt { + +struct JavaClassGeneratorTest : public ::testing::Test { + virtual void SetUp() override { + mTable = std::make_shared(); + mTable->setPackage(u"android"); + mTable->setPackageId(0x01); + } + + bool addResource(const ResourceNameRef& name, ResourceId id) { + return mTable->addResource(name, id, {}, SourceLine{ "test.xml", 21 }, + util::make_unique()); + } + + std::shared_ptr mTable; +}; + +TEST_F(JavaClassGeneratorTest, FailWhenEntryIsJavaKeyword) { + ASSERT_TRUE(addResource(ResourceName{ {}, ResourceType::kId, u"class" }, + ResourceId{ 0x01, 0x02, 0x0000 })); + + JavaClassGenerator generator(mTable, {}); + + std::stringstream out; + EXPECT_FALSE(generator.generate(out)); +} + +TEST_F(JavaClassGeneratorTest, TransformInvalidJavaIdentifierCharacter) { + ASSERT_TRUE(addResource(ResourceName{ {}, ResourceType::kId, u"hey-man" }, + ResourceId{ 0x01, 0x02, 0x0000 })); + + ASSERT_TRUE(addResource(ResourceName{ {}, ResourceType::kAttr, u"cool.attr" }, + ResourceId{ 0x01, 0x01, 0x0000 })); + + std::unique_ptr styleable = util::make_unique(); + Reference ref(ResourceName{ u"android", ResourceType::kAttr, u"cool.attr"}); + ref.id = ResourceId{ 0x01, 0x01, 0x0000 }; + styleable->entries.emplace_back(ref); + + ASSERT_TRUE(mTable->addResource(ResourceName{ {}, ResourceType::kStyleable, u"hey.dude" }, + ResourceId{ 0x01, 0x03, 0x0000 }, {}, + SourceLine{ "test.xml", 21 }, std::move(styleable))); + + JavaClassGenerator generator(mTable, {}); + + std::stringstream out; + EXPECT_TRUE(generator.generate(out)); + std::string output = out.str(); + + EXPECT_NE(std::string::npos, + output.find("public static final int hey_man = 0x01020000;")); + + EXPECT_NE(std::string::npos, + output.find("public static final int[] hey_dude = {")); + + EXPECT_NE(std::string::npos, + output.find("public static final int hey_dude_cool_attr = 0;")); +} + +} // namespace aapt -- cgit v1.2.3