Merge changes I9aad3e4e,I150889a0 (b01125f9) · Commits · e / os / android_build_soong

xml/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ bootstrap_go_package {
		"soong-etc",
		],
		srcs: [
		"testing.go",
		"xml.go",
		],
		testSrcs: [

xml/testing.go

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		// Copyright 2018 Google Inc. All rights reserved.
		//
		// 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.

		package xml

		import "android/soong/android"

		var PreparerForTestWithXmlBuildComponents = android.FixtureRegisterWithContext(registerXmlBuildComponents)

xml/xml.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -53,10 +53,14 @@ var (
		)

		func init() {
		android.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
		registerXmlBuildComponents(android.InitRegistrationContext)
		pctx.HostBinToolVariable("XmlLintCmd", "xmllint")
		}

		func registerXmlBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
		}

		type prebuiltEtcXmlProperties struct {
		// Optional DTD that will be used to validate the xml file.
		Schema *string `android:"path"`

xml/xml_test.go

+18 −48

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		package xml

		import (
		"io/ioutil"
		"os"
		"testing"

		@@ -23,62 +22,33 @@ import (
		"android/soong/etc"
		)

		var buildDir string

		func setUp() {
		var err error
		buildDir, err = ioutil.TempDir("", "soong_xml_test")
		if err != nil {
		panic(err)
		}
		}

		func tearDown() {
		os.RemoveAll(buildDir)
		}

		func TestMain(m *testing.M) {
		run := func() int {
		setUp()
		defer tearDown()

		return m.Run()
		os.Exit(m.Run())
		}

		os.Exit(run())
		}
		var emptyFixtureFactory = android.NewFixtureFactory(nil)

		func testXml(t testing.T, bp string) android.TestContext {
		fs := map[string][]byte{
		func testXml(t testing.T, bp string) android.TestResult {
		fs := android.MockFS{
		"foo.xml": nil,
		"foo.dtd": nil,
		"bar.xml": nil,
		"bar.xsd": nil,
		"baz.xml": nil,
		}
		config := android.TestArchConfig(buildDir, nil, bp, fs)
		ctx := android.NewTestArchContext(config)
		ctx.RegisterModuleType("prebuilt_etc", etc.PrebuiltEtcFactory)
		ctx.RegisterModuleType("prebuilt_etc_xml", PrebuiltEtcXmlFactory)
		ctx.Register()
		_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
		android.FailIfErrored(t, errs)
		_, errs = ctx.PrepareBuildActions(config)
		android.FailIfErrored(t, errs)

		return ctx
		}

		func assertEqual(t *testing.T, name, expected, actual string) {
		t.Helper()
		if expected != actual {
		t.Errorf(name+" expected %q != got %q", expected, actual)
		}
		return emptyFixtureFactory.RunTest(t,
		android.PrepareForTestWithArchMutator,
		etc.PrepareForTestWithPrebuiltEtc,
		PreparerForTestWithXmlBuildComponents,
		fs.AddToFixture(),
		android.FixtureWithRootAndroidBp(bp),
		)
		}

		// Minimal test
		func TestPrebuiltEtcXml(t *testing.T) {
		ctx := testXml(t, `
		result := testXml(t, `
		prebuilt_etc_xml {
		name: "foo.xml",
		src: "foo.xml",
		@@ -103,14 +73,14 @@ func TestPrebuiltEtcXml(t *testing.T) {
		{rule: "xmllint-minimal", input: "baz.xml"},
		} {
		t.Run(tc.schemaType, func(t *testing.T) {
		rule := ctx.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule)
		assertEqual(t, "input", tc.input, rule.Input.String())
		rule := result.ModuleForTests(tc.input, "android_arm64_armv8-a").Rule(tc.rule)
		android.AssertStringEquals(t, "input", tc.input, rule.Input.String())
		if tc.schemaType != "" {
		assertEqual(t, "schema", tc.schema, rule.Args[tc.schemaType])
		android.AssertStringEquals(t, "schema", tc.schema, rule.Args[tc.schemaType])
		}
		})
		}

		m := ctx.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml)
		assertEqual(t, "installDir", buildDir+"/target/product/test_device/system/etc", m.InstallDirPath().String())
		m := result.ModuleForTests("foo.xml", "android_arm64_armv8-a").Module().(*prebuiltEtcXml)
		android.AssertPathRelativeToTopEquals(t, "installDir", "out/soong/target/product/test_device/system/etc", m.InstallDirPath())
		}