5c33fb5408
In preparation for exporting an XML proto format for UAM to consume, this change brings the XML DOM API more in line with other APIs that do not make the Namespace a separate node. Treating Namespace declarations as just properties of an Element node makes the implementation of algorithms much simpler, as the constraints that Namespace nodes have only one child are now built in and traversing to find Element nodes is much simpler. Also made a bunch of quality of life improvements, like formatting and comment style. Test: make aapt2_tests Bug: 65645766 Change-Id: Ib97ff1c4252b7907e2cc1f13a448dc4ca3b809a4 Merged-In: Ib97ff1c4252b7907e2cc1f13a448dc4ca3b809a4
123 lines
3.4 KiB
C++
123 lines
3.4 KiB
C++
/*
|
|
* Copyright (C) 2016 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 "link/Linkers.h"
|
|
|
|
#include "test/Test.h"
|
|
|
|
using ::testing::NotNull;
|
|
using ::testing::SizeIs;
|
|
using ::testing::StrEq;
|
|
|
|
namespace aapt {
|
|
|
|
class XmlUriTestVisitor : public xml::Visitor {
|
|
public:
|
|
XmlUriTestVisitor() = default;
|
|
|
|
void Visit(xml::Element* el) override {
|
|
EXPECT_THAT(el->namespace_decls, SizeIs(0u));
|
|
|
|
for (const auto& attr : el->attributes) {
|
|
EXPECT_THAT(attr.namespace_uri, StrEq(""));
|
|
}
|
|
EXPECT_THAT(el->namespace_uri, StrEq(""));
|
|
|
|
xml::Visitor::Visit(el);
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(XmlUriTestVisitor);
|
|
};
|
|
|
|
class XmlNamespaceTestVisitor : public xml::Visitor {
|
|
public:
|
|
XmlNamespaceTestVisitor() = default;
|
|
|
|
void Visit(xml::Element* el) override {
|
|
EXPECT_THAT(el->namespace_decls, SizeIs(0u));
|
|
xml::Visitor::Visit(el);
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(XmlNamespaceTestVisitor);
|
|
};
|
|
|
|
class XmlNamespaceRemoverTest : public ::testing::Test {
|
|
public:
|
|
void SetUp() override {
|
|
context_ = test::ContextBuilder().SetCompilationPackage("com.app.test").Build();
|
|
}
|
|
|
|
protected:
|
|
std::unique_ptr<IAaptContext> context_;
|
|
};
|
|
|
|
TEST_F(XmlNamespaceRemoverTest, RemoveUris) {
|
|
std::unique_ptr<xml::XmlResource> doc =
|
|
test::BuildXmlDomForPackageName(context_.get(), R"EOF(
|
|
<View xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:text="hello" />)EOF");
|
|
|
|
XmlNamespaceRemover remover;
|
|
ASSERT_TRUE(remover.Consume(context_.get(), doc.get()));
|
|
|
|
xml::Node* root = doc->root.get();
|
|
ASSERT_THAT(root, NotNull());
|
|
|
|
XmlUriTestVisitor visitor;
|
|
root->Accept(&visitor);
|
|
}
|
|
|
|
TEST_F(XmlNamespaceRemoverTest, RemoveNamespaces) {
|
|
std::unique_ptr<xml::XmlResource> doc =
|
|
test::BuildXmlDomForPackageName(context_.get(), R"EOF(
|
|
<View xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:foo="http://schemas.android.com/apk/res/foo"
|
|
foo:bar="foobar"
|
|
android:text="hello" />)EOF");
|
|
|
|
XmlNamespaceRemover remover;
|
|
ASSERT_TRUE(remover.Consume(context_.get(), doc.get()));
|
|
|
|
xml::Node* root = doc->root.get();
|
|
ASSERT_THAT(root, NotNull());
|
|
|
|
XmlNamespaceTestVisitor visitor;
|
|
root->Accept(&visitor);
|
|
}
|
|
|
|
TEST_F(XmlNamespaceRemoverTest, RemoveNestedNamespaces) {
|
|
std::unique_ptr<xml::XmlResource> doc =
|
|
test::BuildXmlDomForPackageName(context_.get(), R"EOF(
|
|
<View xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:text="hello">
|
|
<View xmlns:foo="http://schemas.example.com/foo"
|
|
android:text="foo"/>
|
|
</View>)EOF");
|
|
|
|
XmlNamespaceRemover remover;
|
|
ASSERT_TRUE(remover.Consume(context_.get(), doc.get()));
|
|
|
|
xml::Node* root = doc->root.get();
|
|
ASSERT_THAT(root, NotNull());
|
|
|
|
XmlNamespaceTestVisitor visitor;
|
|
root->Accept(&visitor);
|
|
}
|
|
|
|
} // namespace aapt
|