diff options
Diffstat (limited to 'src/test/java/com')
8 files changed, 19 insertions, 21 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java index 5f58462fc6..0410e5ce50 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Executor; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.exec.util.TestExecutorBuilder; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import org.junit.Before; @@ -48,8 +47,7 @@ public class SymlinkActionTest extends BuildViewTestCase { public final void setUp() throws Exception { input = scratch.file("input.txt", "Hello, world."); inputArtifact = getSourceArtifact("input.txt"); - Path linkedInput = - directories.getExecRoot(TestConstants.WORKSPACE_NAME).getRelative("input.txt"); + Path linkedInput = directories.getExecRoot().getRelative("input.txt"); FileSystemUtils.createDirectoryAndParents(linkedInput.getParentDirectory()); linkedInput.createSymbolicLink(input); outputArtifact = getBinArtifactWithNoOwner("destination.txt"); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index b68e2add53..d273f8c0f4 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -50,8 +50,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfiguration config = create("--cpu=piii"); String outputDirPrefix = outputBase - + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; + + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; assertEquals(outputDirPrefix, config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); @@ -72,8 +71,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { } BuildConfiguration config = create("--platform_suffix=-test"); - assertEquals(outputBase + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", + assertEquals(outputBase + "/workspace/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); } diff --git a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java index 23e678297b..698a860e3d 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java +++ b/src/test/java/com/google/devtools/build/lib/exec/util/TestExecutorBuilder.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.exec.FileWriteStrategy; import com.google.devtools.build.lib.exec.SymlinkTreeStrategy; import com.google.devtools.build.lib.runtime.CommonCommandOptions; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.util.BlazeClock; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; @@ -97,7 +96,7 @@ public class TestExecutorBuilder { public BlazeExecutor build() throws ExecutorInitException { return new BlazeExecutor( - directories.getExecRoot(TestConstants.WORKSPACE_NAME), + directories.getExecRoot(), reporter, bus, BlazeClock.instance(), diff --git a/src/test/java/com/google/devtools/build/lib/integration/util/IntegrationMock.java b/src/test/java/com/google/devtools/build/lib/integration/util/IntegrationMock.java index 32f5e2701f..5b497450b3 100644 --- a/src/test/java/com/google/devtools/build/lib/integration/util/IntegrationMock.java +++ b/src/test/java/com/google/devtools/build/lib/integration/util/IntegrationMock.java @@ -36,8 +36,7 @@ public class IntegrationMock { * Populates the _embedded_binaries/ directory, containing all binaries/libraries, by symlinking * directories#getEmbeddedBinariesRoot() to the test's runfiles tree. */ - public BinTools getIntegrationBinTools(BlazeDirectories directories, String workspaceName) - throws IOException { + public BinTools getIntegrationBinTools(BlazeDirectories directories) throws IOException { Path embeddedDir = directories.getEmbeddedBinariesRoot(); FileSystemUtils.createDirectoryAndParents(embeddedDir); @@ -62,6 +61,6 @@ public class IntegrationMock { } return BinTools.forIntegrationTesting( - directories, embeddedDir.toString(), TestConstants.EMBEDDED_TOOLS, workspaceName); + directories, embeddedDir.toString(), TestConstants.EMBEDDED_TOOLS); } } diff --git a/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java index c1a104d599..7e2baafc3b 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java @@ -30,9 +30,11 @@ import com.google.devtools.build.lib.rules.test.TestRunnerAction; import com.google.devtools.build.lib.runtime.TerminalTestResultNotifier.TestSummaryOptions; import com.google.devtools.build.lib.testutil.Suite; import com.google.devtools.build.lib.testutil.TestSpec; +import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus; import com.google.devtools.build.lib.view.test.TestStatus.TestResultData; import com.google.devtools.common.options.OptionsParser; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,10 +48,12 @@ public class TestResultAnalyzerTest { @Before public final void createMocks() throws Exception { + Path mockPath = mock(Path.class); OptionsParser testSpecificOptions = OptionsParser.newOptionsParser( TestSummaryOptions.class, ExecutionOptions.class); EventBus mockBus = mock(EventBus.class); underTest = new TestResultAnalyzer( + mockPath, testSpecificOptions.getOptions(TestSummaryOptions.class), testSpecificOptions.getOptions(ExecutionOptions.class), mockBus); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java index e93669cdc2..fbb1e644ef 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java @@ -55,9 +55,8 @@ public class WorkspaceNameFunctionTest extends BuildViewTestCase { reporter.removeHandler(failFastHandler); scratch.overwriteFile("WORKSPACE", "workspace(bad)"); assertThatEvaluationResult(eval()) - .hasErrorEntryForKeyThat(key) - .hasExceptionThat() - .isInstanceOf(NoSuchPackageException.class); + .hasEntryThat(key) + .isEqualTo(WorkspaceNameValue.withError()); assertContainsEvent("name 'bad' is not defined"); } @@ -78,6 +77,9 @@ public class WorkspaceNameFunctionTest extends BuildViewTestCase { public void testEqualsAndHashCode(){ new EqualsTester() .addEqualityGroup( + WorkspaceNameValue.withError(), + WorkspaceNameValue.withError()) + .addEqualityGroup( WorkspaceNameValue.withName("foo"), WorkspaceNameValue.withName("foo")) .addEqualityGroup( diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 961eee63d5..c07dfa91ab 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -731,7 +731,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { assertThat(ruleClassProvider.getRunfilesPrefix()).isNotEmpty(); SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); Object result = evalRuleContextCode(ruleContext, "ruleContext.workspace_name"); - assertEquals(result, ruleClassProvider.getRunfilesPrefix()); + assertSame(result, ruleClassProvider.getRunfilesPrefix()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java index a78c662c3b..10e76cd33d 100644 --- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java @@ -40,7 +40,6 @@ import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.integration.util.IntegrationMock; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestFileOutErr; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.util.BlazeClock; @@ -93,7 +92,7 @@ public class StandaloneSpawnStrategyTest { BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir, "mock-product-name"); // This call implicitly symlinks the integration bin tools into the exec root. - IntegrationMock.get().getIntegrationBinTools(directories, TestConstants.WORKSPACE_NAME); + IntegrationMock.get().getIntegrationBinTools(directories); OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class); optionsParser.parse("--verbose_failures"); @@ -102,10 +101,9 @@ public class StandaloneSpawnStrategyTest { ResourceManager resourceManager = ResourceManager.instanceForTestingOnly(); resourceManager.setAvailableResources( ResourceSet.create(/*memoryMb=*/1, /*cpuUsage=*/1, /*ioUsage=*/1, /*localTestCount=*/1)); - Path execRoot = directories.getExecRoot(TestConstants.WORKSPACE_NAME); this.executor = new BlazeExecutor( - execRoot, + directories.getExecRoot(), reporter, bus, BlazeClock.instance(), @@ -114,7 +112,7 @@ public class StandaloneSpawnStrategyTest { ImmutableMap.<String, SpawnActionContext>of( "", new StandaloneSpawnStrategy( - execRoot, false, "mock-product-name", resourceManager)), + directories.getExecRoot(), false, "mock-product-name", resourceManager)), ImmutableList.<ActionContextProvider>of()); executor.getExecRoot().createDirectory(); |