[bazel]: each test generates its own name. No need for the macro to r…

…equire it
SeleniumHQ · Nov 19, 2018 · 1c1103c · 1c1103c
1 parent d500a66
commit 1c1103c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/java/bazel-rules.bzl b/java/bazel-rules.bzl
@@ -33,13 +33,13 @@ def _impl(ctx):
             size = ctx.attr.size,
             deps = ctx.attr.deps)
 
-def gen_java_tests(name, srcs=[], deps=[], **kwargs):
+def gen_java_tests(srcs=[], deps=[], **kwargs):
     native.java_library(
-        name = "%s-lib" % name,
+        name = "%s-lib" % native.package_name(),
         srcs = srcs,
 	deps = deps)
 
-    deps.append(":%s-lib" % name)
+    deps.append(":%s-lib" % native.package_name())
 
     for src in srcs:
         native.java_test(

diff --git a/java/client/test/org/openqa/selenium/remote/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/BUILD.bazel
@@ -9,7 +9,6 @@ SMALL_TESTS = [
 ]
 
 gen_java_tests(
-    name = "common-tests",
     srcs = SMALL_TESTS,
     size = "small",
     deps = [

diff --git a/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//java:bazel-rules.bzl", "gen_java_tests")
 
 gen_java_tests(
-    name = "distributor",
     srcs = glob(["*.java"]),
     size = "small",
     deps = [

diff --git a/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//java:bazel-rules.bzl", "gen_java_tests")
 
 gen_java_tests(
-    name = "node",
     srcs = glob(["*.java"]),
     size = "small",
     deps = [

diff --git a/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//java:bazel-rules.bzl", "gen_java_tests")
 
 gen_java_tests(
-    name = "router",
     srcs = glob(["*.java"]),
     size = "small",
     deps = [

diff --git a/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//java:bazel-rules.bzl", "gen_java_tests")
 
 gen_java_tests(
-    name = "sessionmap",
     srcs = glob(["*.java"]),
     size = "small",
     deps = [

diff --git a/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel
@@ -1,7 +1,6 @@
 load("//java:bazel-rules.bzl", "gen_java_tests")
 
 gen_java_tests(
-    name = "web",
     size = "small",
     srcs = glob(["*Test.java"]),
     deps = [