Author: dgolovin
Date: 2008-11-26 17:49:11 -0500 (Wed, 26 Nov 2008)
New Revision: 12091
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
Log:
fix test errors
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2008-11-26 22:30:03 UTC
(rev 12090)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2008-11-26 22:49:11 UTC
(rev 12091)
@@ -19,7 +19,8 @@
org.jboss.tools.jsf,
org.jboss.tools.jsf.ui,
org.jboss.tools.jst.web.ui,
- org.jboss.tools.common.model.ui
+ org.jboss.tools.common.model.ui,
+ org.eclipse.ui.ide;bundle-version="3.4.1"
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-11-26
22:30:03 UTC (rev 12090)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2008-11-26
22:49:11 UTC (rev 12091)
@@ -42,8 +42,8 @@
// project =
(IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(TEST_PROJECT_NAME);
// if(project==null) {
project = ResourcesUtils.importProject(
- JsfTestPlugin.getDefault().getBundle(), TEST_PROJECT_PATH);
- assertNotNull(project);
+ JsfTestPlugin.getDefault().getBundle(), TEST_PROJECT_PATH);
+ assertNotNull(project);
// }
project.build(IncrementalProjectBuilder.FULL_BUILD, null);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-11-26
22:30:03 UTC (rev 12090)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFImportTest.java 2008-11-26
22:49:11 UTC (rev 12091)
@@ -2,14 +2,19 @@
import java.io.File;
import java.io.FileFilter;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
+import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.internal.Workbench;
import org.jboss.tools.common.model.XModelFactory;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.ui.operation.JSFProjectAdoptOperation;
@@ -44,9 +49,17 @@
context.setLinkingToProjectOutsideWorkspace(false);
- JSFProjectAdoptOperation operation = new JSFProjectAdoptOperation(context);
+ final JSFProjectAdoptOperation operation = new JSFProjectAdoptOperation(context);
try {
- operation.run(new NullProgressMonitor());
+ WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor monitor)
+ throws CoreException, InvocationTargetException,
+ InterruptedException {
+ operation.run(monitor);
+ }
+ };
+ op.run(null);
} catch (Exception ex) {
JUnitUtils.fail("Error in import operation", ex);
}
@@ -99,7 +112,7 @@
}
private void clean() {
- if(temp != null && temp.isDirectory()) {
+ if(temp !=null && temp.isDirectory()) {
FileUtil.clear(temp);
temp.delete();
temp = null;
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2008-11-26
22:30:03 UTC (rev 12090)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2008-11-26
22:49:11 UTC (rev 12091)
@@ -36,7 +36,6 @@
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jsf.test", null,
"JSFKickStartOldFormat", false);
project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
}
public void testModelExists() {