Author: jjankovi Date: 2012-04-05 09:02:11 -0400 (Thu, 05 Apr 2012) New Revision: 40072 Removed: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/ProjectImportHelper.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java Log: change dependency of method importProject to ImportHelper Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-05 12:44:58 UTC (rev 40071) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-05 13:02:11 UTC (rev 40072) @@ -19,7 +19,6 @@ import org.jboss.tools.cdi.bot.test.uiutils.CDIWizardHelper; import org.jboss.tools.cdi.bot.test.uiutils.EditorResourceHelper; import org.jboss.tools.cdi.bot.test.uiutils.OpenOnHelper; -import org.jboss.tools.cdi.bot.test.uiutils.ProjectImportHelper; import org.jboss.tools.cdi.bot.test.uiutils.QuickFixHelper; import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBaseExt; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; @@ -27,6 +26,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.helper.ImportHelper; import org.junit.After; import org.junit.Before; import org.junit.runner.RunWith; @@ -51,9 +51,7 @@ public static final OpenOnHelper openOnUtil = new OpenOnHelper(); public static final EditorResourceHelper editResourceUtil = new EditorResourceHelper(); public static final QuickFixHelper quickFixHelper = new QuickFixHelper(); - public static final ProjectImportHelper projectImportHelper = new ProjectImportHelper(); - public SWTBotEclipseEditor getEd() { return ed; } @@ -83,7 +81,7 @@ } protected void importCDITestProject(String projectLocation, String dir) { - projectImportHelper.importTestProject(projectLocation, dir, PluginActivator.PLUGIN_ID); + ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID); } } \ No newline at end of file Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/ProjectImportHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/ProjectImportHelper.java 2012-04-05 12:44:58 UTC (rev 40071) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/ProjectImportHelper.java 2012-04-05 13:02:11 UTC (rev 40072) @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010-2012 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.cdi.bot.test.uiutils; - -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.IOException; - -import org.jboss.tools.ui.bot.ext.SWTBotExt; -import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.helper.FileHelper; -import org.jboss.tools.ui.bot.ext.helper.ImportHelper; -import org.jboss.tools.ui.bot.ext.helper.ResourceHelper; - -public class ProjectImportHelper { - - private SWTBotExt bot = new SWTBotExt(); - - private SWTUtilExt util = new SWTUtilExt(bot); - - public void importTestProject(String projectLocation, String dir, String activatorPlugIn) { - String rpath = ResourceHelper.getResourceAbsolutePath(activatorPlugIn, projectLocation); - String wpath = ResourceHelper.getWorkspaceAbsolutePath() + "/" + dir; - File rfile = new File(rpath); - File wfile = new File(wpath); - - wfile.mkdirs(); - try { - FileHelper.copyFilesBinaryRecursively(rfile, wfile, null); - } catch (IOException e) { - fail("Unable to copy test project"); - } - ImportHelper.importAllProjects(wpath); - util.waitForNonIgnoredJobs(); - } - -// public void importTestProject(String projectLocation, String activatorPlugIn) { -// importTestProject(projectLocation, projectLocation); -// } - -}