Stop JavaSdkLibrary_... tests requiring absolute path (cf8d7db0) · Commits · e / os / android_build_soong

apex/apex_test.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -5704,7 +5704,7 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) {

		// The bar library should depend on the implementation jar.
		barLibrary := ctx.ModuleForTests("bar", "android_common_myapex").Rule("javac")
		if expected, actual := `^-classpath /[^:]*/turbine-combined/foo\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		t.Errorf("expected %q, found %#q", expected, actual)
		}
		}
		@@ -5755,7 +5755,7 @@ func TestJavaSDKLibrary_CrossBoundary(t *testing.T) {

		// The bar library should depend on the stubs jar.
		barLibrary := ctx.ModuleForTests("bar", "android_common").Rule("javac")
		if expected, actual := `^-classpath /[^:]*/turbine-combined/foo\.stubs\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.stubs\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		t.Errorf("expected %q, found %#q", expected, actual)
		}
		}
		@@ -5845,7 +5845,7 @@ func TestJavaSDKLibrary_ImportPreferred(t *testing.T) {

		// The bar library should depend on the implementation jar.
		barLibrary := ctx.ModuleForTests("bar", "android_common_myapex").Rule("javac")
		if expected, actual := `^-classpath /[^:]*/turbine-combined/foo\.impl\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.impl\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) {
		t.Errorf("expected %q, found %#q", expected, actual)
		}
		}