commit 15e15c2adcdf599550453180129add48ec939eb6
author janakr <janakr@google.com> Wed Jan 30 11:24:49 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Jan 30 11:27:07 2019 -0800
tree 67121f1931c1cdba865ab11947c34ba2b06edccd
parent e10054cd79840deaa3dfa4c44aa0b0a979aa0ffb

Move WorkspaceFileValue to the lib.packages directory, since that's where WorkspaceFactory and the rest of its kind are. Also remove an unused method in WorkspaceFactory.

PiperOrigin-RevId: 231632979

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

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index f20e650..e11df3c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -35,6 +35,7 @@
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
+import com.google.devtools.build.lib.packages.WorkspaceFileValue;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
 import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction;
 import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule;
@@ -137,7 +138,7 @@
     RuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
     skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
     skyFunctions.put(
-        SkyFunctions.WORKSPACE_FILE,
+        WorkspaceFileValue.WORKSPACE_FILE,
         new WorkspaceFileFunction(
             ruleClassProvider,
             analysisMock