Change RunnerLibrary to TestRunner

Summary:
this renames the runner_library field on the test rules to be just runner.

This makes more sense since we are now specifying the runners with
special runner rules instead of just a generic library.

Reviewed By: miaoyipu

shipit-source-id: a9faec0d15

Author: bobyangyf

src/com/facebook/buck/core/test/rule/HasTestRunnerLibrary.java src/com/facebook/buck/core/test/rule/HasTestRunner.java

@@ -26,10 +26,10 @@
  *
  * <p>TODO(bobyf): need a slightly better api or a new rule as a library doesn't quite make sense.
  */
-public interface HasTestRunnerLibrary {
+public interface HasTestRunner {
 
   /** @return the target to the library containing the test runner */
-  Optional<BuildTarget> getRunnerLibrary();
+  Optional<BuildTarget> getRunner();
 
   /**
    * @return the freeform (for now) specs as required for running tests. For example, cmds,

src/com/facebook/buck/features/go/GoTestDescription.java

@@ -39,7 +39,7 @@
 import com.facebook.buck.core.rules.impl.NoopBuildRuleWithDeclaredAndExtraDeps;
 import com.facebook.buck.core.sourcepath.SourcePath;
 import com.facebook.buck.core.sourcepath.resolver.impl.DefaultSourcePathResolver;
-import com.facebook.buck.core.test.rule.HasTestRunnerLibrary;
+import com.facebook.buck.core.test.rule.HasTestRunner;
 import com.facebook.buck.core.toolchain.ToolchainProvider;
 import com.facebook.buck.core.toolchain.tool.Tool;
 import com.facebook.buck.core.util.immutables.BuckStyleImmutable;
@@ -260,10 +260,10 @@ public BuildRule createBuildRule(
     GoBinary testMain;
     if (args.getSpecs().isPresent()) {
       UserVerify.checkArgument(
-          args.getRunnerLibrary().isPresent(),
+          args.getRunner().isPresent(),
           "runner_library should be specified for rules implementing test protocol");
 
-      BuildRule library = graphBuilder.requireRule(args.getRunnerLibrary().get());
+      BuildRule library = graphBuilder.requireRule(args.getRunner().get());
       UserVerify.verify(
           library instanceof GoLibrary, "runner_library should be a go_library for go_test");
       GoLibrary runnerLibrary = (GoLibrary) library;
@@ -552,7 +552,7 @@ interface AbstractGoTestDescriptionArg
           HasContacts,
           HasDeclaredDeps,
           HasSrcs,
-          HasTestRunnerLibrary,
+          HasTestRunner,
           HasTestTimeout,
           HasGoLinkable {
     Optional<BuildTarget> getLibrary();

src/com/facebook/buck/jvm/java/JavaTestDescription.java

@@ -33,7 +33,7 @@
 import com.facebook.buck.core.sourcepath.BuildTargetSourcePath;
 import com.facebook.buck.core.sourcepath.SourcePath;
 import com.facebook.buck.core.sourcepath.resolver.impl.DefaultSourcePathResolver;
-import com.facebook.buck.core.test.rule.HasTestRunnerLibrary;
+import com.facebook.buck.core.test.rule.HasTestRunner;
 import com.facebook.buck.core.toolchain.ToolchainProvider;
 import com.facebook.buck.core.util.immutables.BuckStyleImmutable;
 import com.facebook.buck.cxx.CxxDescriptionEnhancer;
@@ -165,7 +165,7 @@ public BuildRule createBuildRule(
             .setExpanders(MACRO_EXPANDERS)
             .build();
 
-    Optional<BuildTarget> runner = args.getRunnerLibrary();
+    Optional<BuildTarget> runner = args.getRunner();
     Optional<ImmutableMap<String, StringWithMacros>> runnerSpecs = args.getSpecs();
     if (runnerSpecs.isPresent()) {
       JavaTestRunner testRunner;
@@ -306,7 +306,7 @@ default ForkMode getForkMode() {
 
   @BuckStyleImmutable
   @Value.Immutable
-  interface AbstractJavaTestDescriptionArg extends CoreArg, HasTestRunnerLibrary {}
+  interface AbstractJavaTestDescriptionArg extends CoreArg, HasTestRunner {}
 
   public static class CxxLibraryEnhancement {
     public final BuildRuleParams updatedParams;

test/com/facebook/buck/features/go/testdata/go_test/BUCK.fixture

@@ -32,7 +32,7 @@ go_test(
         "resources_test.go",
     ],
     resources = ["testdata/input"],
-    runner_library = ":runner",
+    runner = ":runner",
     specs = {
         "my": "spec",
         "cmd": "out=\"$(abs_output testbin)\" && cd \$(dirname $out) && $out",

test/com/facebook/buck/jvm/java/testdata/testx_rule/BUCK.fixture

@@ -7,7 +7,7 @@ java_test_runner(
 java_test(
     name = "some_test",
     srcs = ["SomeTest.java"],
-    runner_library = ":runner",
+    runner = ":runner",
     specs = {
         "my": "spec",
         "cmd": "java -jar $(abs_output testbin) $(abs_output classnames)",