diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
6 files changed, 7 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java index 3573827c81..7ab592eccf 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java @@ -259,7 +259,7 @@ public class PackageFactoryTest extends PackageFactoryTestBase { "genrule(name='c', srcs=[], outs=['ao'], cmd=REPOSITORY_NAME + ' ' + PACKAGE_NAME)"); Package pkg = packages.createPackage( - PackageIdentifier.create("@a", new PathFragment("b")), buildFile, events.reporter()); + PackageIdentifier.create("@a", PathFragment.create("b")), buildFile, events.reporter()); Rule c = pkg.getRule("c"); assertThat(AggregatingAttributeMapper.of(c).get("cmd", Type.STRING)).isEqualTo("@a b"); } diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageGroupStaticInitializationTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageGroupStaticInitializationTest.java index 404b7aa6fd..f05709d4e4 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/PackageGroupStaticInitializationTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/PackageGroupStaticInitializationTest.java @@ -88,7 +88,7 @@ public class PackageGroupStaticInitializationTest { } private Package getPackage(String packageName) throws Exception { - PathFragment buildFileFragment = new PathFragment(packageName).getRelative("BUILD"); + PathFragment buildFileFragment = PathFragment.create(packageName).getRelative("BUILD"); Path buildFile = scratch.resolve(buildFileFragment.getPathString()); return packages.createPackage(packageName, buildFile); } diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageGroupTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageGroupTest.java index 50ca2682c8..55e8da9c21 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/PackageGroupTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/PackageGroupTest.java @@ -154,7 +154,7 @@ public class PackageGroupTest { } private Package getPackage(String packageName) throws Exception { - PathFragment buildFileFragment = new PathFragment(packageName).getRelative("BUILD"); + PathFragment buildFileFragment = PathFragment.create(packageName).getRelative("BUILD"); Path buildFile = scratch.resolve(buildFileFragment.getPathString()); return packages.createPackage(packageName, buildFile); diff --git a/src/test/java/com/google/devtools/build/lib/packages/RelativePackageNameResolverTest.java b/src/test/java/com/google/devtools/build/lib/packages/RelativePackageNameResolverTest.java index 9f2f9b6931..fee2a7c3d2 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RelativePackageNameResolverTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RelativePackageNameResolverTest.java @@ -112,7 +112,7 @@ public class RelativePackageNameResolverTest { } private void createResolver(String offset, boolean discardBuild) { - resolver = new RelativePackageNameResolver(new PathFragment(offset), discardBuild); + resolver = new RelativePackageNameResolver(PathFragment.create(offset), discardBuild); } private void assertResolvesTo(String relative, String expectedAbsolute) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java index e2d13a00ac..ea92b1704a 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java @@ -603,7 +603,7 @@ public abstract class MockCcSupport { try { return PackageIdentifier.create( RepositoryName.create(TestConstants.TOOLS_REPOSITORY), - new PathFragment(TestConstants.TOOLS_REPOSITORY_PATH)); + PathFragment.create(TestConstants.TOOLS_REPOSITORY_PATH)); } catch (LabelSyntaxException e) { Verify.verify(false); throw new AssertionError(); diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/SubincludePreprocessor.java b/src/test/java/com/google/devtools/build/lib/packages/util/SubincludePreprocessor.java index dd161a2933..e9b4a9bc56 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/SubincludePreprocessor.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/SubincludePreprocessor.java @@ -95,7 +95,8 @@ public class SubincludePreprocessor implements Preprocessor { return ""; } - Path subinclude = buildFile.getParentDirectory().getRelative(new PathFragment(label.getName())); + Path subinclude = + buildFile.getParentDirectory().getRelative(PathFragment.create(label.getName())); return subinclude.getPathString(); } |