[jbosstools-commits] JBoss Tools SVN: r22892 - in trunk/vpe: tests/org.jboss.tools.vpe.html.test/META-INF and 6 other directories.

Author: dgolovin Date: 2010-06-18 19:26:25 -0400 (Fri, 18 Jun 2010) New Revision: 22892 Added: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml Log: fix for vpe test errors Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2010-06-18 23:26:25 UTC (rev 22892) @@ -1,5 +1,7 @@ package org.jboss.tools.vpe.xulrunner; +import java.text.MessageFormat; + import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.jboss.tools.common.log.BaseUIPlugin; @@ -83,7 +85,7 @@ try { String xulRunnerPath = XulRunnerBrowser.getXulRunnerPath(); // if ("true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/earlyStartup"))) { //$NON-NLS-1$ //$NON-NLS-2$ - logInfo("earlyStartup: XULRunner path is: " + xulRunnerPath); //$NON-NLS-1$ + logInfo(MessageFormat.format("earlyStartup: XULRunner path is: {0}",xulRunnerPath)); //$NON-NLS-1$ // } } catch (XulRunnerException e) { logError(e); Added: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java 2010-06-18 23:26:25 UTC (rev 22892) @@ -0,0 +1,19 @@ +package org.jboss.tools.vpe.xulrunner; + +import org.eclipse.osgi.util.NLS; + +public class VpeXulrunnerMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.vpe.xulrunner.messages"; //$NON-NLS-1$ + public static String XulRunnerBrowser_bundleDoesNotContainXulrunner; + public static String XulRunnerBrowser_bundleNotFound; + public static String XulRunnerBrowser_cannotGetPathToXulrunner; + public static String XulRunnerBrowser_notAvailable; + public static String XulRunnerBrowser_wrongVersion; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, VpeXulrunnerMessages.class); + } + + private VpeXulrunnerMessages() { + } +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties 2010-06-18 23:26:25 UTC (rev 22892) @@ -0,0 +1,5 @@ +XulRunnerBrowser_bundleDoesNotContainXulrunner=Bundle {0} doesn't contain {1} +XulRunnerBrowser_bundleNotFound=Bundle {0} is not found. +XulRunnerBrowser_cannotGetPathToXulrunner=Cannot get path to XULRunner from bundle {0} +XulRunnerBrowser_notAvailable=nsIWebBrowser is not available +XulRunnerBrowser_wrongVersion=the version of the bundled XULRunner {0} must be >= {1} and <= {2} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-06-18 23:26:25 UTC (rev 22892) @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.vpe, - org.junit, + org.junit;bundle-version="[3.8.0,4.0.0)", org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common, Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-06-18 23:26:25 UTC (rev 22892) @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.vpe, - org.junit, + org.junit;bundle-version="[3.8.2,4.0.0)", org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.common, Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-06-18 23:26:25 UTC (rev 22892) @@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.junit, + org.junit;bundle-version="[3.8.2,4.0.0)", org.jboss.tools.vpe, org.jboss.tools.common.model.ui;bundle-version="2.0.0", org.eclipse.jface.text;bundle-version="3.4.0", Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-06-18 23:26:25 UTC (rev 22892) @@ -7,20 +7,22 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.vpe, - org.junit, + org.junit;bundle-version="[3.8.2,4.0.0)", org.eclipse.core.resources, org.eclipse.ui.ide, org.jboss.tools.jst.jsp, - org.jboss.tools.vpe.xulrunner, + org.jboss.tools.vpe.xulrunner;bundle-version="3.1.0", org.mozilla.xpcom;bundle-version="1.9.1", org.eclipse.jface.text, - org.jboss.tools.common.model.ui;bundle-version="2.0.0", - org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport + org.jboss.tools.common.model.ui;bundle-version="3.1.0", + org.jboss.tools.tests;bundle-version="3.1.0";visibility:=reexport, + org.jboss.tools.vpe.resref;bundle-version="3.1.0", + javax.servlet;bundle-version="2.5.0" Bundle-ActivationPolicy: lazy -Bundle-ClassPath: lib/jmock-2.5.1/jmock-2.5.1.jar, +Bundle-ClassPath: ., + lib/jmock-2.5.1/jmock-2.5.1.jar, lib/jmock-2.5.1/hamcrest-core-1.1.jar, - lib/jmock-2.5.1/hamcrest-library-1.1.jar, - . + lib/jmock-2.5.1/hamcrest-library-1.1.jar Export-Package: org.hamcrest, org.jboss.tools.vpe.ui.test, org.jboss.tools.vpe.ui.test.dialog, @@ -32,4 +34,3 @@ Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.jboss.tools.vpe.resref.core Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-06-18 23:26:25 UTC (rev 22892) @@ -27,6 +27,14 @@ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> + <dependencies> + <dependency> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.xulrunner.initializer</artifactId> + <version>3.1.0</version> + <type>eclipse-plugin</type> + </dependency> + </dependencies> </configuration> </plugin> </plugins> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java 2010-06-18 23:26:25 UTC (rev 22892) @@ -10,15 +10,15 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test.preferences; -import junit.framework.TestCase; - -import org.eclipse.jface.preference.PreferenceDialog; -import org.jboss.tools.test.util.WorkbenchUtils; import org.jboss.tools.tests.PreferencePageTest; import org.jboss.tools.vpe.editor.preferences.ELVariablesPreferencePage; import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage; -public class VpeEditorPreferencesPageTest extends PreferencePageTest { +public class VpeEditorPreferencesPageTest extends PreferencePageTest { + + public VpeEditorPreferencesPageTest() { + } + public void testVpeEditorPreferencesPageShow() { doDefaultTest(VpeEditorPreferencesPage.ID, VpeEditorPreferencesPage.class); //$NON-NLS-1$ } Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-06-18 22:07:40 UTC (rev 22891) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-06-18 23:26:25 UTC (rev 22892) @@ -26,6 +26,14 @@ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle> <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle> </explodedBundles> + <dependencies> + <dependency> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.xulrunner.initializer</artifactId> + <version>3.1.0</version> + <type>eclipse-plugin</type> + </dependency> + </dependencies> </configuration> </plugin> </plugins>