The great Skylark -> Starlark class migration:
BazelEmbeddedSkylarkBlackBoxTest
SkylarkSemanticsConsistencyTest
AndroidSkylarkTest
CppConfigurationSkylarkTest
SkylarkCcToolchainConfigureTest
JavaInfoSkylarkApiTest
JavaSkylarkApiTest
SkylarkJavaLiteProtoLibraryTest
AppleBinarySkylarkApiTest
ObjcSkylarkTest
SkylarkFileContentHashTests
SkylarkActionProviderTest
SkylarkAnnotationContractTest
SkylarkIntegrationTest
SkylarkInfoBeforeParams
bazel_embedded_skylark_test
external_skylark_execute_test
external_skylark_load_test
maven_skylark_test
skylark_git_repository_test
skylark_prefetching_test
skylark_repository_test
skylark_rule_test
tags_propagation_skylark_test
PiperOrigin-RevId: 311563733
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
similarity index 93%
rename from src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
rename to src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
index 74effcb..422eda4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/StarlarkSemanticsConsistencyTest.java
@@ -44,11 +44,11 @@
* StarlarkSemanticsOptions}, or vice versa, then the programmer will either be unable to
* implement its behavior, or unable to test it from the command line and add user
* documentation. We hope that the programmer notices this on their own.
- * <li>If {@link StarlarkSemanticsOptions#toSkylarkSemantics} is not updated to set all fields of
+ * <li>If {@link StarlarkSemanticsOptions#toStarlarkSemantics} is not updated to set all fields of
* {@code StarlarkSemantics}, then it will fail immediately because all fields of {@link
* StarlarkSemantics.Builder} are mandatory.
* <li>To catch a copy/paste error where the wrong field's data is threaded through {@code
- * toSkylarkSemantics()} or {@code deserialize(...)}, we repeatedly generate matching random
+ * toStarlarkSemantics()} or {@code deserialize(...)}, we repeatedly generate matching random
* instances of the input and expected output objects.
* <li>The {@link #checkDefaultsMatch} test ensures that there is no divergence between the
* default values of the two classes.
@@ -57,7 +57,7 @@
* </ul>
*/
@RunWith(JUnit4.class)
-public class SkylarkSemanticsConsistencyTest {
+public class StarlarkSemanticsConsistencyTest {
private static final int NUM_RANDOM_TRIALS = 10;
@@ -71,7 +71,7 @@
long seed = i;
StarlarkSemanticsOptions options = buildRandomOptions(new Random(seed));
StarlarkSemantics semantics = buildRandomSemantics(new Random(seed));
- StarlarkSemantics semanticsFromOptions = options.toSkylarkSemantics();
+ StarlarkSemantics semanticsFromOptions = options.toStarlarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(semantics);
}
}
@@ -99,16 +99,16 @@
public void checkDefaultsMatch() {
StarlarkSemanticsOptions defaultOptions = Options.getDefaults(StarlarkSemanticsOptions.class);
StarlarkSemantics defaultSemantics = StarlarkSemantics.DEFAULT;
- StarlarkSemantics semanticsFromOptions = defaultOptions.toSkylarkSemantics();
+ StarlarkSemantics semanticsFromOptions = defaultOptions.toStarlarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(defaultSemantics);
}
@Test
public void canGetBuilderFromInstance() {
StarlarkSemantics original = StarlarkSemantics.DEFAULT;
- assertThat(original.internalSkylarkFlagTestCanary()).isFalse();
- StarlarkSemantics modified = original.toBuilder().internalSkylarkFlagTestCanary(true).build();
- assertThat(modified.internalSkylarkFlagTestCanary()).isTrue();
+ assertThat(original.internalStarlarkFlagTestCanary()).isFalse();
+ StarlarkSemantics modified = original.toBuilder().internalStarlarkFlagTestCanary(true).build();
+ assertThat(modified.internalStarlarkFlagTestCanary()).isTrue();
}
/**
@@ -179,7 +179,7 @@
.experimentalSiblingRepositoryLayout(rand.nextBoolean())
.experimentalAllowIncrementalRepositoryUpdates(rand.nextBoolean())
.experimentalBuildSettingApi(rand.nextBoolean())
- .experimentalCcSkylarkApiEnabledPackages(
+ .experimentalCcStarlarkApiEnabledPackages(
ImmutableList.of(String.valueOf(rand.nextDouble()), String.valueOf(rand.nextDouble())))
.experimentalEnableAndroidMigrationApis(rand.nextBoolean())
.experimentalGoogleLegacyApi(rand.nextBoolean())
@@ -213,7 +213,7 @@
.incompatibleRequireLinkerInputCcApi(rand.nextBoolean())
.incompatibleRestrictStringEscapes(rand.nextBoolean())
.incompatibleUseCcConfigureFromRulesCc(rand.nextBoolean())
- .internalSkylarkFlagTestCanary(rand.nextBoolean())
+ .internalStarlarkFlagTestCanary(rand.nextBoolean())
.maxComputationSteps(rand.nextLong())
.recordRuleInstantiationCallstack(rand.nextBoolean())
.build();
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
index 2839948..e59c1f9 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
@@ -123,7 +123,7 @@
OptionsParser parser =
OptionsParser.builder().optionsClasses(StarlarkSemanticsOptions.class).build();
parser.parse(options);
- return parser.getOptions(StarlarkSemanticsOptions.class).toSkylarkSemantics();
+ return parser.getOptions(StarlarkSemanticsOptions.class).toStarlarkSemantics();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index 9226164..0a387f7 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -113,7 +113,7 @@
? ImmutableList.<String>of()
: ImmutableList.<String>of(skylarkOption));
StarlarkSemantics semantics =
- parser.getOptions(StarlarkSemanticsOptions.class).toSkylarkSemantics();
+ parser.getOptions(StarlarkSemanticsOptions.class).toStarlarkSemantics();
try {
Package externalPkg =
