For sections without subsections, we were already passing recursive=true, so omitting this argument in the subsection case was likely an oversight. Add a test that would have caught this. Change-Id: Ic0c165527c3e58e7928668312394615ab57d22dc
		
			
				
	
	
		
			97 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
load("//tools/bzl:java.bzl", "java_library2")
 | 
						|
load("//tools/bzl:junit.bzl", "junit_tests")
 | 
						|
 | 
						|
TEST_SRCS = ["src/test/java/com/google/gerrit/acceptance/MergeableFileBasedConfigTest.java"]
 | 
						|
 | 
						|
SRCS = glob(
 | 
						|
    ["src/test/java/com/google/gerrit/acceptance/*.java"],
 | 
						|
    exclude = TEST_SRCS,
 | 
						|
)
 | 
						|
 | 
						|
PROVIDED = [
 | 
						|
    "//gerrit-common:annotations",
 | 
						|
    "//gerrit-common:server",
 | 
						|
    "//gerrit-extension-api:api",
 | 
						|
    "//gerrit-httpd:httpd",
 | 
						|
    "//gerrit-index:index",
 | 
						|
    "//gerrit-lucene:lucene",
 | 
						|
    "//gerrit-pgm:init",
 | 
						|
    "//gerrit-reviewdb:server",
 | 
						|
    "//gerrit-server:metrics",
 | 
						|
    "//gerrit-server:receive",
 | 
						|
    "//gerrit-server:server",
 | 
						|
    "//lib:gson",
 | 
						|
    "//lib:jsch",
 | 
						|
    "//lib/jgit/org.eclipse.jgit:jgit",
 | 
						|
    "//lib/mina:sshd",
 | 
						|
    "//lib:servlet-api-3_1",
 | 
						|
]
 | 
						|
 | 
						|
java_binary(
 | 
						|
    name = "acceptance-framework",
 | 
						|
    testonly = 1,
 | 
						|
    main_class = "Dummy",
 | 
						|
    visibility = ["//visibility:public"],
 | 
						|
    runtime_deps = [":lib"],
 | 
						|
)
 | 
						|
 | 
						|
java_library2(
 | 
						|
    name = "lib",
 | 
						|
    testonly = 1,
 | 
						|
    srcs = SRCS,
 | 
						|
    exported_deps = [
 | 
						|
        "//gerrit-gpg:gpg",
 | 
						|
        "//gerrit-index:query_exception",
 | 
						|
        "//gerrit-launcher:launcher",
 | 
						|
        "//gerrit-openid:openid",
 | 
						|
        "//gerrit-pgm:daemon",
 | 
						|
        "//gerrit-pgm:http-jetty",
 | 
						|
        "//gerrit-pgm:util-nodep",
 | 
						|
        "//gerrit-server:prolog-common",
 | 
						|
        "//gerrit-server:testutil",
 | 
						|
        "//lib:jimfs",
 | 
						|
        "//lib:truth",
 | 
						|
        "//lib:truth-java8-extension",
 | 
						|
        "//lib/auto:auto-value",
 | 
						|
        "//lib/httpcomponents:fluent-hc",
 | 
						|
        "//lib/httpcomponents:httpclient",
 | 
						|
        "//lib/httpcomponents:httpcore",
 | 
						|
        "//lib/jetty:servlet",
 | 
						|
        "//lib/jgit/org.eclipse.jgit.junit:junit",
 | 
						|
        "//lib/log:impl_log4j",
 | 
						|
        "//lib/log:log4j",
 | 
						|
    ],
 | 
						|
    visibility = ["//visibility:public"],
 | 
						|
    deps = PROVIDED + [
 | 
						|
        # We want these deps to be exported_deps
 | 
						|
        "//lib/greenmail:greenmail",
 | 
						|
        "//lib:gwtorm",
 | 
						|
        "//lib/guice:guice",
 | 
						|
        "//lib/guice:guice-assistedinject",
 | 
						|
        "//lib/guice:guice-servlet",
 | 
						|
        "//lib/mail:mail",
 | 
						|
    ],
 | 
						|
)
 | 
						|
 | 
						|
load("//tools/bzl:javadoc.bzl", "java_doc")
 | 
						|
 | 
						|
java_doc(
 | 
						|
    name = "acceptance-framework-javadoc",
 | 
						|
    testonly = 1,
 | 
						|
    libs = [":lib"],
 | 
						|
    pkgs = ["com.google.gerrit.acceptance"],
 | 
						|
    title = "Gerrit Acceptance Test Framework Documentation",
 | 
						|
    visibility = ["//visibility:public"],
 | 
						|
)
 | 
						|
 | 
						|
junit_tests(
 | 
						|
    name = "acceptance_framework_tests",
 | 
						|
    srcs = TEST_SRCS,
 | 
						|
    deps = [
 | 
						|
        ":lib",
 | 
						|
        "//lib:guava",
 | 
						|
        "//lib:truth",
 | 
						|
        "//lib/jgit/org.eclipse.jgit:jgit",
 | 
						|
    ],
 | 
						|
)
 |