Author: dgolovin Date: 2010-07-02 19:48:34 -0400 (Fri, 02 Jul 2010) New Revision: 23211 Added: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/JPDL4MultipageEditorPluginsLoadTest.java trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJBDLAllTests.java trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJPDLPluginLoadTest.java trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/JBPMCommonPluginLoadTest.java trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/JBPMJPDLPluginLoadTest.java Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/META-INF/MANIFEST.MF trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/AllTests.java trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/META-INF/MANIFEST.MF trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/AllTests.java trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/AllTests.java Log: groupid error fixed in jbpm3 tests coverage enabled for tests tests added for empty test plugins Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2010-07-02 23:48:34 UTC (rev 23211) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jbpm.plugins</groupId> <artifactId>org.jbpm.gd.jpdl</artifactId> <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/META-INF/MANIFEST.MF 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/META-INF/MANIFEST.MF 2010-07-02 23:48:34 UTC (rev 23211) @@ -5,4 +5,6 @@ Bundle-Version: 4.3.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.junit;bundle-version="3.8.2" +Require-Bundle: org.junit;bundle-version="3.8.2", + org.jboss.tools.flow.jpdl4.multipage;bundle-version="4.3.0", + org.eclipse.core.runtime;bundle-version="3.6.0" Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/AllTests.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/AllTests.java 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/AllTests.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -10,6 +10,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(Jpdl4ValidatorTest.class); + suite.addTestSuite(JPDL4MultipageEditorPluginsLoadTest.class); return suite; } Added: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/JPDL4MultipageEditorPluginsLoadTest.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/JPDL4MultipageEditorPluginsLoadTest.java (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/src/org/jboss/tools/flow/jpdl4/multipage/JPDL4MultipageEditorPluginsLoadTest.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -0,0 +1,42 @@ +package org.jboss.tools.flow.jpdl4.multipage; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.Platform; +import org.osgi.framework.Bundle; + +public class JPDL4MultipageEditorPluginsLoadTest extends + TestCase { + public void testFlowJPDL4MultipagePluginIsLoaded() { + assertPluginResolved("org.jboss.tools.flow.jpdl4.multipage"); + } + + public void assertPluginsResolved(String[] ids) { + for (String id : ids) { + Bundle bundle = Platform.getBundle(id); + assertNotNull(MessageFormat.format("Could not get bundle {0} instance",id), bundle); + assertTrue(MessageFormat.format("Plugin '{0}' is not resolved",bundle.getSymbolicName()), //$NON-NLS-1$ //$NON-NLS-2$ + isPluginResolved(bundle.getSymbolicName())); + System.out.println(MessageFormat.format("{0} was resolved and activated",bundle.getSymbolicName())); + } + } + + public void assertPluginResolved(String id) { + assertPluginsResolved(new String[] {id}); + } + + public boolean isPluginResolved(String pluginId) { + Bundle bundle = Platform.getBundle(pluginId); + assertNotNull(pluginId + " failed to load.", bundle); //$NON-NLS-1$ + try { + // this line is needed to to force plug-in loading and to change it state to ACTIVE + bundle.loadClass("fake class"); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + // It happens always because loaded class doesn't not exist + } + return ((bundle.getState() & Bundle.RESOLVED) > 0) + || ((bundle.getState() & Bundle.ACTIVE) > 0); + } +} Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/META-INF/MANIFEST.MF 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/META-INF/MANIFEST.MF 2010-07-02 23:48:34 UTC (rev 23211) @@ -5,3 +5,6 @@ Bundle-Version: 4.3.0.qualifier Bundle-Vendor: %pluginProvider Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.jboss.tools.flow.jpdl4;bundle-version="4.3.0", + org.eclipse.core.runtime;bundle-version="3.6.0", + org.junit Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2010-07-02 23:48:34 UTC (rev 23211) @@ -10,7 +10,7 @@ <groupId>org.jboss.tools.jbpm.tests</groupId> <artifactId>org.jboss.tools.flow.jpdl4.test</artifactId> <version>4.3.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.flow.jpdl4*</emma.filter> Added: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJBDLAllTests.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJBDLAllTests.java (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJBDLAllTests.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -0,0 +1,13 @@ +package org.jboss.tools.flow.jpdl4.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class FlowJBDLAllTests { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(FlowJPDLPluginLoadTest.class); + return suite; + } +} Added: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJPDLPluginLoadTest.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJPDLPluginLoadTest.java (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/src/org/jboss/tools/flow/jpdl4/test/FlowJPDLPluginLoadTest.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -0,0 +1,41 @@ +package org.jboss.tools.flow.jpdl4.test; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.Platform; +import org.osgi.framework.Bundle; + +public class FlowJPDLPluginLoadTest extends TestCase { + public void testOrgJbossToolsFlowJpdl4PluginIsLoaded() { + assertPluginResolved("org.jboss.tools.flow.jpdl4"); + } + + public void assertPluginsResolved(String[] ids) { + for (String id : ids) { + Bundle bundle = Platform.getBundle(id); + assertNotNull(MessageFormat.format("Could not get bundle {0} instance",id), bundle); + assertTrue(MessageFormat.format("Plugin '{0}' is not resolved",bundle.getSymbolicName()), //$NON-NLS-1$ //$NON-NLS-2$ + isPluginResolved(bundle.getSymbolicName())); + System.out.println(MessageFormat.format("{0} was resolved and activated",bundle.getSymbolicName())); + } + } + + public void assertPluginResolved(String id) { + assertPluginsResolved(new String[] {id}); + } + + public boolean isPluginResolved(String pluginId) { + Bundle bundle = Platform.getBundle(pluginId); + assertNotNull(pluginId + " failed to load.", bundle); //$NON-NLS-1$ + try { + // this line is needed to to force plug-in loading and to change it state to ACTIVE + bundle.loadClass("fake class"); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + // It happens always because loaded class doesn't not exist + } + return ((bundle.getState() & Bundle.RESOLVED) > 0) + || ((bundle.getState() & Bundle.ACTIVE) > 0); + } +} Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF 2010-07-02 23:48:34 UTC (rev 23211) @@ -7,4 +7,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit, org.jboss.tools.jbpm.common, - org.eclipse.jdt.core + org.eclipse.jdt.core, + org.eclipse.core.runtime;bundle-version="3.6.0" Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2010-07-02 23:48:34 UTC (rev 23211) @@ -13,7 +13,7 @@ <packaging>eclipse-test-plugin</packaging> <properties> - <emma.filter>org.jboss.tools.jbpm.common*</emma.filter> + <emma.filter>org.jboss.tools.jbpm*</emma.filter> <emma.instrument.bundles>org.jboss.tools.jbpm.common</emma.instrument.bundles> </properties> </project> Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/AllTests.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/AllTests.java 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/AllTests.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -10,6 +10,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(JavaUtilTest.class); + suite.addTestSuite(JBPMCommonPluginLoadTest.class); return suite; } Added: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/JBPMCommonPluginLoadTest.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/JBPMCommonPluginLoadTest.java (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/src/org/jboss/tools/jbpm/JBPMCommonPluginLoadTest.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -0,0 +1,41 @@ +package org.jboss.tools.jbpm; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.Platform; +import org.osgi.framework.Bundle; + +public class JBPMCommonPluginLoadTest extends TestCase { + public void testOrgJbossToolsJbpmCommonPluginIsLoaded() { + assertPluginResolved("org.jboss.tools.jbpm.common"); + } + + public void assertPluginsResolved(String[] ids) { + for (String id : ids) { + Bundle bundle = Platform.getBundle(id); + assertNotNull(MessageFormat.format("Could not get bundle {0} instance",id), bundle); + assertTrue(MessageFormat.format("Plugin '{0}' is not resolved",bundle.getSymbolicName()), //$NON-NLS-1$ //$NON-NLS-2$ + isPluginResolved(bundle.getSymbolicName())); + System.out.println(MessageFormat.format("{0} was resolved and activated",bundle.getSymbolicName())); + } + } + + public void assertPluginResolved(String id) { + assertPluginsResolved(new String[] {id}); + } + + public boolean isPluginResolved(String pluginId) { + Bundle bundle = Platform.getBundle(pluginId); + assertNotNull(pluginId + " failed to load.", bundle); //$NON-NLS-1$ + try { + // this line is needed to to force plug-in loading and to change it state to ACTIVE + bundle.loadClass("fake class"); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + // It happens always because loaded class doesn't not exist + } + return ((bundle.getState() & Bundle.RESOLVED) > 0) + || ((bundle.getState() & Bundle.ACTIVE) > 0); + } +} Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/src/org/jboss/tools/jbpm/convert/test/BpmnConvertTest.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -8,24 +8,18 @@ import java.io.InputStream; import java.util.ArrayList; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.jboss.tools.jbpm.convert.b2j.translate.*; public class BpmnConvertTest extends TestCase { public void testConvert() throws IOException { - String absolutePath = ""; - if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { - absolutePath = Platform.getBundle( - "org.jboss.tools.jbpm.convert.test").getLocation() - .substring(16); - } else { - absolutePath = Platform.getBundle( - "org.jboss.tools.jbpm.convert.test").getLocation() - .substring(15); - } - String bpmnfilePath = absolutePath + "testfile"; - String expectedPath = absolutePath + "resultfile"; + File absolutePath = FileLocator.getBundleFile(Platform.getBundle( + "org.jboss.tools.jbpm.convert.test")); + String bpmnfilePath = new File(absolutePath,"testfile").getAbsolutePath(); + String expectedPath = new File(absolutePath,"resultfile").getAbsolutePath(); + File[] bpmnFiles = listAll(bpmnfilePath); BPMN2JPDL jpdltranformer = null; Modified: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF 2010-07-02 23:48:34 UTC (rev 23211) @@ -7,4 +7,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Require-Bundle: org.junit, - org.eclipse.ui;bundle-version="3.5.0" + org.eclipse.ui;bundle-version="3.5.0", + org.jbpm.gd.jpdl;bundle-version="3.2.0", + org.eclipse.core.runtime;bundle-version="3.6.0" Modified: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/AllTests.java =================================================================== --- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/AllTests.java 2010-07-02 21:11:11 UTC (rev 23210) +++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/AllTests.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -8,6 +8,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(JpdlPerspectiveFactoryTest.class); + suite.addTestSuite(JBPMJPDLPluginLoadTest.class); return suite; } Added: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/JBPMJPDLPluginLoadTest.java =================================================================== --- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/JBPMJPDLPluginLoadTest.java (rev 0) +++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/src/org/jbpm/gd/jpdl/JBPMJPDLPluginLoadTest.java 2010-07-02 23:48:34 UTC (rev 23211) @@ -0,0 +1,41 @@ +package org.jbpm.gd.jpdl; + +import java.text.MessageFormat; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.Platform; +import org.osgi.framework.Bundle; + +public class JBPMJPDLPluginLoadTest extends TestCase { + public void testOrgJbpmGdJpdlPluginIsLoaded() { + assertPluginResolved("org.jbpm.gd.jpdl"); + } + + public void assertPluginsResolved(String[] ids) { + for (String id : ids) { + Bundle bundle = Platform.getBundle(id); + assertNotNull(MessageFormat.format("Could not get bundle {0} instance",id), bundle); + assertTrue(MessageFormat.format("Plugin '{0}' is not resolved",bundle.getSymbolicName()), //$NON-NLS-1$ //$NON-NLS-2$ + isPluginResolved(bundle.getSymbolicName())); + System.out.println(MessageFormat.format("{0} was resolved and activated",bundle.getSymbolicName())); + } + } + + public void assertPluginResolved(String id) { + assertPluginsResolved(new String[] {id}); + } + + public boolean isPluginResolved(String pluginId) { + Bundle bundle = Platform.getBundle(pluginId); + assertNotNull(pluginId + " failed to load.", bundle); //$NON-NLS-1$ + try { + // this line is needed to to force plug-in loading and to change it state to ACTIVE + bundle.loadClass("fake class"); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + // It happens always because loaded class doesn't not exist + } + return ((bundle.getState() & Bundle.RESOLVED) > 0) + || ((bundle.getState() & Bundle.ACTIVE) > 0); + } +}