Skip to content

Commit b3d31c0

Browse files
eharris369GitHub Enterprise
authored andcommitted
Merge pull request #228 from eharris/227-useMDTImportCodeForTests
Issue #227: Use MDT code to import projects for test cases
2 parents 3001459 + 621feda commit b3d31c0

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

dev/com.ibm.microclimate.test/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Import-Package: com.ibm.microclimate.core.internal,
1313
com.ibm.microclimate.core.internal.connection,
1414
com.ibm.microclimate.core.internal.console,
1515
com.ibm.microclimate.core.internal.constants,
16+
com.ibm.microclimate.ui.internal.actions,
1617
junit.framework,
1718
io.socket.client,
1819
io.socket.emitter,

dev/com.ibm.microclimate.test/src/com/ibm/microclimate/test/BaseDebugTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.ibm.microclimate.test.util.ImportUtil;
3131
import com.ibm.microclimate.test.util.MicroclimateUtil;
3232
import com.ibm.microclimate.test.util.TestUtil;
33+
import com.ibm.microclimate.ui.internal.actions.ImportProjectAction;
3334

3435
import junit.framework.TestCase;
3536

@@ -67,8 +68,9 @@ public void test01_doSetup() throws Exception {
6768
assertTrue("The application " + projectName + " should be running", MicroclimateUtil.waitForProjectStart(connection, projectName, 600, 5));
6869

6970
// Import the application into eclipse
70-
IPath workspace = connection.getWorkspacePath();
71-
project = ImportUtil.importExistingMavenProjects(workspace, projectName);
71+
MicroclimateApplication app = connection.getAppByName(projectName);
72+
ImportProjectAction.importProject(app);
73+
project = ImportUtil.waitForProject(projectName);
7274
assertNotNull("The " + projectName + " project should be imported in eclipse", project);
7375
}
7476

dev/com.ibm.microclimate.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.ui,
1818
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1919
Automatic-Module-Name: com.ibm.microclimate.ui;singleton:=true
2020
Bundle-ActivationPolicy: lazy
21+
Export-Package: com.ibm.microclimate.ui.internal.actions
2122
Import-Package: org.eclipse.tm.terminal.view.core.interfaces.constants,
2223
org.eclipse.tm.terminal.view.ui.interfaces,
2324
org.eclipse.tm.terminal.view.ui.launcher,

0 commit comments

Comments
 (0)