diff options
author | 2018-06-06 20:09:57 -0700 | |
---|---|---|
committer | 2018-06-06 20:11:33 -0700 | |
commit | 602cc856051b02328ed56e2af808b829dafecd4b (patch) | |
tree | 3c7f8b6e3e672ad173204b7dec29b62b7becd4b8 /src/test/java/com/google/devtools/build/lib/rules | |
parent | 89d85ea3c515cb288a388d89673e773f6806d7fa (diff) |
Refactoring: makes the code simpler by deleting Metadata and InputArtifactData.
(minor) ActionFS now implements MetadataProvider.getInput
PiperOrigin-RevId: 199575194
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
2 files changed, 9 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index 78f2d01952..8bde0bc8d2 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java @@ -18,6 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.actions.FileStateValue; +import com.google.devtools.build.lib.actions.FileValue; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.cmdline.RepositoryName; @@ -98,10 +100,10 @@ public class RepositoryDelegatorTest extends FoundationTestCase { new InMemoryMemoizingEvaluator( ImmutableMap.<SkyFunctionName, SkyFunction>builder() .put( - SkyFunctions.FILE_STATE, + FileStateValue.FILE_STATE, new FileStateFunction( new AtomicReference<TimestampGranularityMonitor>(), externalFilesHelper)) - .put(SkyFunctions.FILE, new FileFunction(pkgLocator)) + .put(FileValue.FILE, new FileFunction(pkgLocator)) .put(SkyFunctions.REPOSITORY_DIRECTORY, delegatorFunction) .put( SkyFunctions.PACKAGE, diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java index c767d51599..f399544ede 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryFunctionTest.java @@ -18,15 +18,15 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.annotations.VisibleForTesting; import com.google.common.io.BaseEncoding; +import com.google.devtools.build.lib.actions.FileContentsProxy; +import com.google.devtools.build.lib.actions.FileStateValue; +import com.google.devtools.build.lib.actions.FileStateValue.RegularFileStateValue; +import com.google.devtools.build.lib.actions.FileValue; +import com.google.devtools.build.lib.actions.FileValue.RegularFileValue; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.packages.Rule; -import com.google.devtools.build.lib.skyframe.FileContentsProxy; -import com.google.devtools.build.lib.skyframe.FileStateValue; -import com.google.devtools.build.lib.skyframe.FileStateValue.RegularFileStateValue; -import com.google.devtools.build.lib.skyframe.FileValue; -import com.google.devtools.build.lib.skyframe.FileValue.RegularFileValue; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; |