commit 0503fee6f6d2058b15a7f7340d52e6faaf3ef5dd
author gregce <gregce@google.com> Thu Jun 11 09:22:27 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 11 09:23:54 2020 -0700
tree 457cf303624006915be56204dd5e6e4873f8d09d
parent 96622c49e90b1ea4f7ae65350e805079fa81bf28

The great Skylark -> Starlark class migration:

For rules in tests:
 - More renamings of test target names
 - Various symbol renamings

PiperOrigin-RevId: 315913067

src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index a6bb469..4412a28 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -600,22 +600,22 @@
   public void testNonExistingStarlarkExtension() throws Exception {
     reporter.removeHandler(failFastHandler);
     scratch.file(
-        "test/skylark/BUILD",
-        "load('//test/skylark:bad_extension.bzl', 'some_symbol')",
+        "test/starlark/BUILD",
+        "load('//test/starlark:bad_extension.bzl', 'some_symbol')",
         "genrule(name = gr,",
         "    outs = ['out.txt'],",
         "    cmd = 'echo hello >@')");
     invalidatePackages();
 
-    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/skylark"));
+    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/starlark"));
     EvaluationResult<PackageValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
     assertThat(result.hasError()).isTrue();
     ErrorInfo errorInfo = result.getError(skyKey);
     String expectedMsg =
-        "error loading package 'test/skylark': "
-            + "cannot load '//test/skylark:bad_extension.bzl': no such file";
+        "error loading package 'test/starlark': "
+            + "cannot load '//test/starlark:bad_extension.bzl': no such file";
     assertThat(errorInfo.getException()).hasMessageThat().isEqualTo(expectedMsg);
   }
 
@@ -623,18 +623,18 @@
   public void testNonExistingStarlarkExtensionFromExtension() throws Exception {
     reporter.removeHandler(failFastHandler);
     scratch.file(
-        "test/skylark/extension.bzl",
-        "load('//test/skylark:bad_extension.bzl', 'some_symbol')",
+        "test/starlark/extension.bzl",
+        "load('//test/starlark:bad_extension.bzl', 'some_symbol')",
         "a = 'a'");
     scratch.file(
-        "test/skylark/BUILD",
-        "load('//test/skylark:extension.bzl', 'a')",
+        "test/starlark/BUILD",
+        "load('//test/starlark:extension.bzl', 'a')",
         "genrule(name = gr,",
         "    outs = ['out.txt'],",
         "    cmd = 'echo hello >@')");
     invalidatePackages();
 
-    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/skylark"));
+    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/starlark"));
     EvaluationResult<PackageValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
@@ -643,25 +643,25 @@
     assertThat(errorInfo.getException())
         .hasMessageThat()
         .isEqualTo(
-            "error loading package 'test/skylark': "
-                + "in /workspace/test/skylark/extension.bzl: "
-                + "cannot load '//test/skylark:bad_extension.bzl': no such file");
+            "error loading package 'test/starlark': "
+                + "in /workspace/test/starlark/extension.bzl: "
+                + "cannot load '//test/starlark:bad_extension.bzl': no such file");
   }
 
   @Test
   public void testSymlinkCycleWithStarlarkExtension() throws Exception {
     reporter.removeHandler(failFastHandler);
-    Path extensionFilePath = scratch.resolve("/workspace/test/skylark/extension.bzl");
+    Path extensionFilePath = scratch.resolve("/workspace/test/starlark/extension.bzl");
     FileSystemUtils.ensureSymbolicLink(extensionFilePath, PathFragment.create("extension.bzl"));
     scratch.file(
-        "test/skylark/BUILD",
-        "load('//test/skylark:extension.bzl', 'a')",
+        "test/starlark/BUILD",
+        "load('//test/starlark:extension.bzl', 'a')",
         "genrule(name = gr,",
         "    outs = ['out.txt'],",
         "    cmd = 'echo hello >@')");
     invalidatePackages();
 
-    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/skylark"));
+    SkyKey skyKey = PackageValue.key(PackageIdentifier.parse("@//test/starlark"));
     EvaluationResult<PackageValue> result =
         SkyframeExecutorTestUtils.evaluate(
             getSkyframeExecutor(), skyKey, /*keepGoing=*/ false, reporter);
@@ -671,8 +671,8 @@
     assertThat(errorInfo.getException())
         .hasMessageThat()
         .isEqualTo(
-            "error loading package 'test/skylark': Encountered error while reading extension "
-                + "file 'test/skylark/extension.bzl': Symlink cycle");
+            "error loading package 'test/starlark': Encountered error while reading extension "
+                + "file 'test/starlark/extension.bzl': Symlink cycle");
   }
 
   @Test