Loading java/java_test.go +0 −101 Original line number Diff line number Diff line Loading @@ -1203,107 +1203,6 @@ func TestIncludeSrcs(t *testing.T) { } } func TestJavaLint(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{ "lint-baseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline lint-baseline.xml") { t.Error("did not pass --baseline flag") } } func TestJavaLintWithoutBaseline(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{}) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if strings.Contains(*sboxProto.Commands[0].Command, "--baseline") { t.Error("passed --baseline flag for non existent file") } } func TestJavaLintRequiresCustomLintFileToExist(t *testing.T) { android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, android.PrepareForTestDisallowNonExistentPaths, ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern([]string{`source path "mybaseline.xml" does not exist`})). RunTestWithBp(t, ` java_library { name: "foo", srcs: [ ], min_sdk_version: "29", sdk_version: "system_current", lint: { baseline_filename: "mybaseline.xml", }, } `) } func TestJavaLintUsesCorrectBpConfig(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", lint: { error_checks: ["SomeCheck"], baseline_filename: "mybaseline.xml", }, } `, map[string][]byte{ "mybaseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline mybaseline.xml") { t.Error("did not use the correct file for baseline") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") { t.Error("should check NewApi errors") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check SomeCheck") { t.Error("should combine NewApi errors with SomeCheck errors") } } func TestGeneratedSources(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { Loading java/lint_test.go +102 −0 Original line number Diff line number Diff line Loading @@ -15,11 +15,113 @@ package java import ( "strings" "testing" "android/soong/android" ) func TestJavaLint(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{ "lint-baseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline lint-baseline.xml") { t.Error("did not pass --baseline flag") } } func TestJavaLintWithoutBaseline(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{}) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if strings.Contains(*sboxProto.Commands[0].Command, "--baseline") { t.Error("passed --baseline flag for non existent file") } } func TestJavaLintRequiresCustomLintFileToExist(t *testing.T) { android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, android.PrepareForTestDisallowNonExistentPaths, ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern([]string{`source path "mybaseline.xml" does not exist`})). RunTestWithBp(t, ` java_library { name: "foo", srcs: [ ], min_sdk_version: "29", sdk_version: "system_current", lint: { baseline_filename: "mybaseline.xml", }, } `) } func TestJavaLintUsesCorrectBpConfig(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", lint: { error_checks: ["SomeCheck"], baseline_filename: "mybaseline.xml", }, } `, map[string][]byte{ "mybaseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline mybaseline.xml") { t.Error("did not use the correct file for baseline") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") { t.Error("should check NewApi errors") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check SomeCheck") { t.Error("should combine NewApi errors with SomeCheck errors") } } func TestJavaLintBypassUpdatableChecks(t *testing.T) { testCases := []struct { name string Loading Loading
java/java_test.go +0 −101 Original line number Diff line number Diff line Loading @@ -1203,107 +1203,6 @@ func TestIncludeSrcs(t *testing.T) { } } func TestJavaLint(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{ "lint-baseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline lint-baseline.xml") { t.Error("did not pass --baseline flag") } } func TestJavaLintWithoutBaseline(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{}) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if strings.Contains(*sboxProto.Commands[0].Command, "--baseline") { t.Error("passed --baseline flag for non existent file") } } func TestJavaLintRequiresCustomLintFileToExist(t *testing.T) { android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, android.PrepareForTestDisallowNonExistentPaths, ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern([]string{`source path "mybaseline.xml" does not exist`})). RunTestWithBp(t, ` java_library { name: "foo", srcs: [ ], min_sdk_version: "29", sdk_version: "system_current", lint: { baseline_filename: "mybaseline.xml", }, } `) } func TestJavaLintUsesCorrectBpConfig(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", lint: { error_checks: ["SomeCheck"], baseline_filename: "mybaseline.xml", }, } `, map[string][]byte{ "mybaseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline mybaseline.xml") { t.Error("did not use the correct file for baseline") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") { t.Error("should check NewApi errors") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check SomeCheck") { t.Error("should combine NewApi errors with SomeCheck errors") } } func TestGeneratedSources(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { Loading
java/lint_test.go +102 −0 Original line number Diff line number Diff line Loading @@ -15,11 +15,113 @@ package java import ( "strings" "testing" "android/soong/android" ) func TestJavaLint(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{ "lint-baseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline lint-baseline.xml") { t.Error("did not pass --baseline flag") } } func TestJavaLintWithoutBaseline(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", } `, map[string][]byte{}) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if strings.Contains(*sboxProto.Commands[0].Command, "--baseline") { t.Error("passed --baseline flag for non existent file") } } func TestJavaLintRequiresCustomLintFileToExist(t *testing.T) { android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, android.PrepareForTestDisallowNonExistentPaths, ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern([]string{`source path "mybaseline.xml" does not exist`})). RunTestWithBp(t, ` java_library { name: "foo", srcs: [ ], min_sdk_version: "29", sdk_version: "system_current", lint: { baseline_filename: "mybaseline.xml", }, } `) } func TestJavaLintUsesCorrectBpConfig(t *testing.T) { ctx, _ := testJavaWithFS(t, ` java_library { name: "foo", srcs: [ "a.java", "b.java", "c.java", ], min_sdk_version: "29", sdk_version: "system_current", lint: { error_checks: ["SomeCheck"], baseline_filename: "mybaseline.xml", }, } `, map[string][]byte{ "mybaseline.xml": nil, }) foo := ctx.ModuleForTests("foo", "android_common") sboxProto := android.RuleBuilderSboxProtoForTests(t, foo.Output("lint.sbox.textproto")) if !strings.Contains(*sboxProto.Commands[0].Command, "--baseline mybaseline.xml") { t.Error("did not use the correct file for baseline") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") { t.Error("should check NewApi errors") } if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check SomeCheck") { t.Error("should combine NewApi errors with SomeCheck errors") } } func TestJavaLintBypassUpdatableChecks(t *testing.T) { testCases := []struct { name string Loading