StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java test code clean-up

Browse Source 
Remove unused parameters and make testJava return the config.

Test: Ran all java tests.
Change-Id: Iaa123f3fd93188e2f55452b887e1d340429cc710
This commit is contained in:
Jaewoong Jung
2019-07-17 11:15:09 -07:00
parent 63f4b57a7f
commit f9a0443a9c
9 changed files with 66 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/androidmk_test.go
View File

@@ -15,18 +15,20 @@
package java
import (
"android/soong/android"
"bytes"
"io"
"io/ioutil"
"strings"
"testing"
"android/soong/android"
)
type testAndroidMk struct {
*testing.T
body []byte
}
type testAndroidMkModule struct {
*testing.T
props map[string]string
@@ -115,30 +117,26 @@ func getAndroidMk(t *testing.T, ctx *android.TestContext, config android.Config,
}
func TestRequired(t *testing.T) {
config := testConfig(nil)
ctx := testContext(config, `
ctx, config := testJava(t, `
java_library {
name: "foo",
srcs: ["a.java"],
required: ["libfoo"],
}
`, nil)
run(t, ctx, config)
`)
mk := getAndroidMk(t, ctx, config, "foo")
mk.moduleFor("foo").hasRequired("libfoo")
}
func TestHostdex(t *testing.T) {
config := testConfig(nil)
ctx := testContext(config, `
ctx, config := testJava(t, `
java_library {
name: "foo",
srcs: ["a.java"],
hostdex: true,
}
`, nil)
run(t, ctx, config)
`)
mk := getAndroidMk(t, ctx, config, "foo")
mk.moduleFor("foo")
@@ -146,16 +144,14 @@ func TestHostdex(t *testing.T) {
}
func TestHostdexRequired(t *testing.T) {
config := testConfig(nil)
ctx := testContext(config, `
ctx, config := testJava(t, `
java_library {
name: "foo",
srcs: ["a.java"],
hostdex: true,
required: ["libfoo"],
}
`, nil)
run(t, ctx, config)
`)
mk := getAndroidMk(t, ctx, config, "foo")
mk.moduleFor("foo").hasRequired("libfoo")
@@ -163,8 +159,7 @@ func TestHostdexRequired(t *testing.T) {
}
func TestHostdexSpecificRequired(t *testing.T) {
config := testConfig(nil)
ctx := testContext(config, `
ctx, config := testJava(t, `
java_library {
name: "foo",
srcs: ["a.java"],
@@ -175,8 +170,7 @@ func TestHostdexSpecificRequired(t *testing.T) {
},
},
}
`, nil)
run(t, ctx, config)
`)
mk := getAndroidMk(t, ctx, config, "foo")
mk.moduleFor("foo").hasNoRequired("libfoo")