commit c6c9b8e06a7420a5fd6142dde87af3bb734aa2c3
author laurentlb <laurentlb@google.com> Mon Apr 15 11:26:26 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 15 11:28:28 2019 -0700
tree c6631562f5608336a06918bfcd30c36c517c7992
parent b93e61b8ab8067c1d00b8def777411791a2d6dc0

Merge LabelImport class and SkylarkImport; delete SkylarkImports

After the simplifications in unknown commit and https://github.com/bazelbuild/bazel/commit/024b4951b4b0a89f5a1dd5f2a4fbfd4297d47e58, we're now able to delete SkylarkImports.
We went from one interface, one abstract class and two other classes, to just one class.

RELNOTES: None.
PiperOrigin-RevId: 243654192

src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
index 50296222..16636ad 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
@@ -24,7 +24,7 @@
 import com.google.devtools.build.lib.events.Location.LineAndColumn;
 import com.google.devtools.build.lib.syntax.DictionaryLiteral.DictionaryEntryLiteral;
 import com.google.devtools.build.lib.syntax.Parser.ParsingLevel;
-import com.google.devtools.build.lib.syntax.SkylarkImports.SkylarkImportSyntaxException;
+import com.google.devtools.build.lib.syntax.SkylarkImport.SkylarkImportSyntaxException;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import java.util.LinkedList;
 import java.util.List;
@@ -1101,7 +1101,7 @@
     List<Statement> statements =
         parseFileForSkylark("load('" + importString + "', 'fun_test')\n");
     LoadStatement stmt = (LoadStatement) statements.get(0);
-    SkylarkImport imp = SkylarkImports.create(stmt.getImport().getValue());
+    SkylarkImport imp = SkylarkImport.create(stmt.getImport().getValue());
 
     assertThat(imp.getImportString()).named("getImportString()").isEqualTo(importString);
 
@@ -1124,22 +1124,22 @@
 
   @Test
   public void testRelativeImportPathInIsInvalid() throws Exception {
-    invalidImportTest("file", SkylarkImports.MUST_HAVE_BZL_EXT_MSG);
+    invalidImportTest("file", SkylarkImport.MUST_HAVE_BZL_EXT_MSG);
   }
 
   @Test
   public void testInvalidRelativePathBzlExtImplicit() throws Exception {
-    invalidImportTest("file.bzl", SkylarkImports.INVALID_PATH_SYNTAX);
+    invalidImportTest("file.bzl", SkylarkImport.INVALID_PATH_SYNTAX);
   }
 
   @Test
   public void testInvalidRelativePathNoSubdirs() throws Exception {
-    invalidImportTest("path/to/file.bzl", SkylarkImports.INVALID_PATH_SYNTAX);
+    invalidImportTest("path/to/file.bzl", SkylarkImport.INVALID_PATH_SYNTAX);
   }
 
   @Test
   public void testInvalidRelativePathInvalidFilename() throws Exception {
-    invalidImportTest("\tfile.bzl", SkylarkImports.INVALID_PATH_SYNTAX);
+    invalidImportTest("\tfile.bzl", SkylarkImport.INVALID_PATH_SYNTAX);
   }
 
   private void validAbsoluteImportLabelTest(String importString)
@@ -1160,23 +1160,22 @@
 
   @Test
   public void testInvalidAbsoluteImportLabel() throws Exception {
-    invalidImportTest("//some/skylark/:file.bzl", SkylarkImports.INVALID_LABEL_PREFIX);
+    invalidImportTest("//some/skylark/:file.bzl", SkylarkImport.INVALID_LABEL_PREFIX);
   }
 
   @Test
   public void testInvalidAbsoluteImportLabelWithRepo() throws Exception {
-    invalidImportTest("@my_repo//some/skylark/:file.bzl",
-        SkylarkImports.INVALID_LABEL_PREFIX);
+    invalidImportTest("@my_repo//some/skylark/:file.bzl", SkylarkImport.INVALID_LABEL_PREFIX);
   }
 
   @Test
   public void testInvalidAbsoluteImportLabelMissingBzlExt() throws Exception {
-    invalidImportTest("//some/skylark:file", SkylarkImports.MUST_HAVE_BZL_EXT_MSG);
+    invalidImportTest("//some/skylark:file", SkylarkImport.MUST_HAVE_BZL_EXT_MSG);
   }
 
   @Test
   public void testInvalidAbsoluteImportReferencesExternalPkg() throws Exception {
-    invalidImportTest("//external:file.bzl", SkylarkImports.EXTERNAL_PKG_NOT_ALLOWED_MSG);
+    invalidImportTest("//external:file.bzl", SkylarkImport.EXTERNAL_PKG_NOT_ALLOWED_MSG);
   }
 
   @Test
@@ -1206,12 +1205,12 @@
 
   @Test
   public void testInvalidRelativeImportLabelMissingBzlExt() throws Exception {
-    invalidImportTest(":file", SkylarkImports.MUST_HAVE_BZL_EXT_MSG);
+    invalidImportTest(":file", SkylarkImport.MUST_HAVE_BZL_EXT_MSG);
   }
 
   @Test
   public void testInvalidRelativeImportLabelSyntax() throws Exception {
-    invalidImportTest("::file.bzl", SkylarkImports.INVALID_TARGET_PREFIX);
+    invalidImportTest("::file.bzl", SkylarkImport.INVALID_TARGET_PREFIX);
   }
 
  @Test