diff options
author | Lukacs Berki <lberki@google.com> | 2016-02-26 13:13:39 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-02-28 17:04:23 +0000 |
commit | de62b4e9cd0f56473278811774ec191a4e0fafcd (patch) | |
tree | d5f18446ad3935c35340f84f0fcab7d3dceb47c3 /src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java | |
parent | b8101f57681f292a9ec312a9cbbc84ac4ec0668d (diff) |
Pass the source path -> Artifact mapping into FdoSupport from a provider instead of special-casing it.
This removes the need to deserialize artifacts in FdoSupport, which in turn removes the need to support artifact deserialization at all, which makes our lives simpler and Thoreauvian programming is good.
--
MOS_MIGRATED_REVID=115660698
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java index 1979df4e2f..2e491b17e0 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java @@ -251,37 +251,4 @@ public class ArtifactFactoryTest { return result; } } - - @Test - public void testArtifactDeserializationWithoutReusedArtifacts() throws Exception { - PathFragment derivedPath = outRoot.getExecPath().getRelative("fruit/banana"); - artifactFactory.clear(); - artifactFactory.setDerivedArtifactRoots(ImmutableList.of(outRoot)); - MockPackageRootResolver rootResolver = new MockPackageRootResolver(); - rootResolver.setPackageRoots( - ImmutableMap.of(PackageIdentifier.createInDefaultRepo(""), clientRoot)); - Artifact artifact1 = artifactFactory.deserializeArtifact(derivedPath, rootResolver); - Artifact artifact2 = artifactFactory.deserializeArtifact(derivedPath, rootResolver); - assertEquals(artifact1, artifact2); - assertNull(artifact1.getOwner()); - assertNull(artifact2.getOwner()); - assertEquals(derivedPath, artifact1.getExecPath()); - assertEquals(derivedPath, artifact2.getExecPath()); - - // Source artifacts are always reused - PathFragment sourcePath = clientRoot.getExecPath().getRelative("fruit/mango"); - artifact1 = artifactFactory.deserializeArtifact(sourcePath, rootResolver); - artifact2 = artifactFactory.deserializeArtifact(sourcePath, rootResolver); - assertSame(artifact1, artifact2); - assertEquals(sourcePath, artifact1.getExecPath()); - } - - @Test - public void testDeserializationWithInvalidPath() throws Exception { - artifactFactory.clear(); - PathFragment randomPath = new PathFragment("maracuja/lemon/kiwi"); - Artifact artifact = artifactFactory.deserializeArtifact(randomPath, - new MockPackageRootResolver()); - assertNull(artifact); - } } |