Author: jjankovi Date: 2012-02-07 10:45:21 -0500 (Tue, 07 Feb 2012) New Revision: 38471 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java Log: Modified addRestEasyLibs to return List of String (libs which were added to classPath of project) + small other changes Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-07 15:43:33 UTC (rev 38470) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-07 15:45:21 UTC (rev 38471) @@ -79,7 +79,7 @@ projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName()); } } - + protected SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName) { return ProblemsView.getFilteredErrorsTreeItems(bot, PATH_PARAM_VALID_ERROR, "/" + wsProjectName, null, null); @@ -148,16 +148,20 @@ @SuppressWarnings("static-access") - private void addRestEasyLibs(String wsProjectName) { + private List<String> addRestEasyLibs(String wsProjectName) { List<File> restLibsPaths = getPathForRestLibs(); + List<String> variables = new ArrayList<String>(); + BuildPathHelper buildPathHelper = new BuildPathHelper(); for (File f : restLibsPaths) { - buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true); + variables.add(buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true)); } + return variables; + } private List<File> getPathForRestLibs() { @@ -175,9 +179,8 @@ String restEasyDirPath = eapDirHome + "/" + "resteasy"; File restEasyDir = new File(restEasyDirPath); + String[] restEasyLibs = {"jaxrs-api.jar"}; - String[] restEasyLibs = {"jaxrs-api.jar"}; -// String[] restEasyLibs = {"jaxrs-api.jar", "resteasy-jaxrs.jar", "scannotation.jar"}; return resourceHelper.searchAllFiles(restEasyDir, restEasyLibs); } @@ -192,8 +195,9 @@ option == ConfigureOption.ADD ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD .getLabel() : RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_REMOVE .getLabel()).click(); - bot.sleep(Timing.time2S()); - util.waitForNonIgnoredJobs(); + bot.sleep(Timing.time2S()); + util.waitForAll(); + } private SWTBot openPreferencePage(final String name,