Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 627263fe authored by Yuexi Ma's avatar Yuexi Ma
Browse files

Export a few utility methods 

Add a few utility methods to support generating TradeFed test plan in C-Suite

Test: go test .
Change-Id: I86a505068b5d5aa0f5a37b3e3a2465839a7480ef
parent 632f080f

java/java.go

+15 −1
Original line number Diff line number Diff line
@@ -2451,6 +2451,10 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { 
	j.deps(ctx)

}



func (j *TestHost) AddExtraResource(p android.Path) {

	j.extraResources = append(j.extraResources, p)

}



func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,

		j.testProperties.Test_suites, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test)
@@ -2609,12 +2613,22 @@ func TestHostFactory() android.Module { 
	module.AddProperties(&module.testProperties)

	module.AddProperties(&module.testHostProperties)



	module.Module.properties.Installable = proptools.BoolPtr(true)

	InitTestHost(

		module,

		proptools.BoolPtr(true),

		nil,

		nil)



	InitJavaModuleMultiTargets(module, android.HostSupported)

	return module

}



func InitTestHost(th *TestHost, installable *bool, testSuites []string, autoGenConfig *bool) {

	th.properties.Installable = installable

	th.testProperties.Auto_gen_config = autoGenConfig

	th.testProperties.Test_suites = testSuites

}



//

// Java Binaries (.jar file plus wrapper script)

//

java/java_test.go

+13 −0
Original line number Diff line number Diff line
@@ -2429,3 +2429,16 @@ func TestDataNativeBinaries(t *testing.T) { 
		t.Errorf("Unexpected test data - expected: %q, actual: %q", expected, actual)

	}

}



func TestDefaultInstallable(t *testing.T) {

	ctx, _ := testJava(t, `

		java_test_host {

			name: "foo"

		}

	`)



	buildOS := android.BuildOs.String()

	module := ctx.ModuleForTests("foo", buildOS+"_common").Module().(*TestHost)

	assertDeepEquals(t, "Default installable value should be true.", proptools.BoolPtr(true),

		module.properties.Installable)

}