Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/pub/RunPubJobTest.java |
=================================================================== |
--- editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/pub/RunPubJobTest.java (revision 42132) |
+++ editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/pub/RunPubJobTest.java (working copy) |
@@ -1,12 +1,14 @@ |
package com.google.dart.tools.core.pub; |
import com.google.dart.tools.core.dart2js.ProcessRunner; |
-import com.google.dart.tools.core.mock.MockProject; |
+import com.google.dart.tools.core.test.util.TestProject; |
+import static com.google.dart.tools.core.DartCore.PACKAGES_DIRECTORY_NAME; |
+import static com.google.dart.tools.core.DartCore.PUBSPEC_FILE_NAME; |
+import static com.google.dart.tools.core.DartCore.PUBSPEC_LOCK_FILE_NAME; |
+ |
import junit.framework.TestCase; |
-import org.eclipse.core.resources.ResourcesPlugin; |
-import org.eclipse.core.runtime.IPath; |
import org.eclipse.core.runtime.IProgressMonitor; |
import org.eclipse.core.runtime.IStatus; |
import org.eclipse.core.runtime.NullProgressMonitor; |
@@ -15,13 +17,6 @@ |
public class RunPubJobTest extends TestCase { |
- private static final MockProject PROJECT = new MockProject(RunPubJobTest.class.getSimpleName()) { |
- @Override |
- public IPath getLocation() { |
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(getName()); |
- }; |
- }; |
- |
// TODO(keertip): enable when sure it will pass on buildbot |
// public void test_runPubScript() throws Exception { |
// |
@@ -33,8 +28,11 @@ |
// } |
// Assert normal operation |
+ |
+ private TestProject testProject; |
+ |
public void test_runSilent() { |
- RunPubJob target = new RunPubJob(PROJECT, RunPubJob.INSTALL_COMMAND, false) { |
+ RunPubJob target = new RunPubJob(testProject.getProject(), RunPubJob.INSTALL_COMMAND, false) { |
@Override |
protected ProcessRunner newProcessRunner(ProcessBuilder builder) { |
ProcessRunner processRunner = new ProcessRunner(builder) { |
@@ -52,13 +50,13 @@ |
// Assert a process IOException is gracefully handled correctly |
public void test_runSilent_ioException() { |
- RunPubJob target = new RunPubJob(PROJECT, RunPubJob.INSTALL_COMMAND, false) { |
+ RunPubJob target = new RunPubJob(testProject.getProject(), RunPubJob.INSTALL_COMMAND, false) { |
@Override |
protected ProcessRunner newProcessRunner(ProcessBuilder builder) { |
// Assert valid builder information |
assertNotNull(builder); |
- assertEquals(PROJECT.getLocation().toFile(), builder.directory()); |
+ assertEquals(testProject.getProject().getLocation().toFile(), builder.directory()); |
assertTrue(builder.command().size() > 0); |
ProcessRunner processRunner = new ProcessRunner(builder) { |
@@ -77,7 +75,7 @@ |
// Assert a non-zero exit code generates an error status |
public void test_runSilent_nonZeroExitCode() { |
final int exitCode = 3452; |
- RunPubJob target = new RunPubJob(PROJECT, RunPubJob.INSTALL_COMMAND, false) { |
+ RunPubJob target = new RunPubJob(testProject.getProject(), RunPubJob.INSTALL_COMMAND, false) { |
@Override |
protected ProcessRunner newProcessRunner(ProcessBuilder builder) { |
ProcessRunner processRunner = new ProcessRunner(builder) { |
@@ -98,6 +96,17 @@ |
assertStatus(status, IStatus.ERROR, null); |
} |
+ @Override |
+ protected void setUp() throws Exception { |
+ super.setUp(); |
+ testProject = new TestProject(); |
+ if (testProject.getProject().exists()) { |
+ testProject.setFileContent(PUBSPEC_FILE_NAME, "name: myapp"); |
+ testProject.createFolder(PACKAGES_DIRECTORY_NAME); |
+ testProject.setFileContent(PUBSPEC_LOCK_FILE_NAME, "packages:"); |
+ } |
+ } |
+ |
private void assertStatus(IStatus status, int severity, Class<?> exceptionClass) { |
assertNotNull("Expected status", status); |
assertEquals(severity, status.getSeverity()); |
@@ -107,5 +116,4 @@ |
} |
assertNotNull("Expected message", status.getMessage()); |
} |
- |
} |