[jbosstools-commits] JBoss Tools SVN: r30055 - in trunk/runtime: tests/org.jboss.tools.runtime.test and 2 other directories.

Author: snjeza Date: 2011-03-26 19:09:33 -0400 (Sat, 26 Mar 2011) New Revision: 30055 Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java Log: JBIDE-7583 Add tests for org.jboss.tools.runtime plugin Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-03-26 17:07:55 UTC (rev 30054) +++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-03-26 23:09:33 UTC (rev 30055) @@ -32,6 +32,10 @@ @Override public void earlyStartup() { + String skipRuntimeScanner = System.getProperty("skip.runtime.scanner", "false"); + if ("true".equals(skipRuntimeScanner)) { + return; + } final boolean firstStart = RuntimeUIActivator.getDefault(). getPreferenceStore().getBoolean(RuntimeUIActivator.FIRST_START); Job runtimeJob = new Job("Searching runtimes...") { Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2011-03-26 17:07:55 UTC (rev 30054) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/META-INF/MANIFEST.MF 2011-03-26 23:09:33 UTC (rev 30055) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %BundleName -Bundle-SymbolicName: org.jboss.tools.runtime.test +Bundle-SymbolicName: org.jboss.tools.runtime.test;singleton:=true Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit4, Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-03-26 17:07:55 UTC (rev 30054) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/pom.xml 2011-03-26 23:09:33 UTC (rev 30055) @@ -12,7 +12,7 @@ <packaging>eclipse-test-plugin</packaging> <properties> - <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3</systemProperties> + <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.2.0.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA -Djbosstools.test.eap.4.3.home=${requirement.build.root}/jboss-eap-4.3 -Dskip.runtime.scanner=true</systemProperties> </properties> <build> <plugins> Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-03-26 17:07:55 UTC (rev 30054) +++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-03-26 23:09:33 UTC (rev 30055) @@ -43,6 +43,8 @@ @BeforeClass public static void create() { + RuntimeCoreActivator.getDefault(); + RuntimeUIActivator.getDefault(); addRuntimePaths(); createRuntimes(); } @@ -58,6 +60,7 @@ for (String path : paths) { RuntimePath runtimePath = new RuntimePath(path); + runtimePath.setScanOnEveryStartup(false); runtimePaths.add(runtimePath); } RuntimeUIActivator.getDefault().saveRuntimePaths();