diff options
| author | Bob Brodt | 2017-02-21 16:43:42 +0000 |
|---|---|---|
| committer | Bob Brodt | 2017-02-21 16:43:42 +0000 |
| commit | e51319e8064b26f9b70d6dceefcc08dfdbdea957 (patch) | |
| tree | 1274c1afd03b7030a5e6487ae705a5df04f4f2ad | |
| parent | 8a0ca976bf34fde997dbbef254a9dadb4c87b623 (diff) | |
| download | org.eclipse.bpmn2-modeler-e51319e8064b26f9b70d6dceefcc08dfdbdea957.tar.gz org.eclipse.bpmn2-modeler-e51319e8064b26f9b70d6dceefcc08dfdbdea957.tar.xz org.eclipse.bpmn2-modeler-e51319e8064b26f9b70d6dceefcc08dfdbdea957.zip | |
Introduce unit tests for BPMN2 Modeler
See https://bugs.eclipse.org/bugs/show_bug.cgi?id=512240
Finally working. Upversioned to 1.3.3 for release.
42 files changed, 251 insertions, 105 deletions
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF index 5d479249..7e85d6db 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.customtask;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml index e0cd597c..23e18c14 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.customtask</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Example Plug-in: EMF Model</name> <description>BPMN2 Modeler Runtime Example Plug-in using EMF extension model</description> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF index 673b1e14..7a5b2b6a 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.datatypes;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.datatypes.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml index e151917e..41809e57 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.datatypes</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Example Plug-in: Data Types</name> <description>BPMN2 Modeler Runtime Example Plug-in demonstrating custom EMF Data Types</description> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF index 728dea51..8ee9107f 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.dynamic.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui.ide, diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml index 9ae4948f..cb68a457 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.dynamic</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Example Plug-in: Dynamic Model</name> <description>BPMN2 Modeler Runtime Example Plug-in using dynamic model extensions</description> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF index 4546e525..e94e1733 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Org.eclipse.bpmn2.modeler.examples.modelreader Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Export-Package: org.eclipse.bpmn2.modeler.examples.modelreader Require-Bundle: org.eclipse.ui.ide, org.eclipse.core.runtime, diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml index 8f70dddb..1103829c 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.modelreader</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Example Plug-in: Java Model Loader</name> <description>BPMN2 Model Loader in Java</description> diff --git a/examples/plugins/pom.xml b/examples/plugins/pom.xml index ceb0b00e..f4545386 100644 --- a/examples/plugins/pom.xml +++ b/examples/plugins/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -25,7 +25,7 @@ <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> <name>BPMN2 Modeler Examples: Plugins Parent</name> <description>BPMN2 Modeler Example Plug-ins</description> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/examples/pom.xml b/examples/pom.xml index 400b33f6..99aa5866 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -25,7 +25,7 @@ <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> <name>BPMN2 Modeler: Examples Parent</name> <description>BPMN2 Modeler Example Plug-ins and Projects</description> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml index d6966f51..7d5ef5ad 100644 --- a/examples/projects/pom.xml +++ b/examples/projects/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -25,6 +25,6 @@ <artifactId>org.eclipse.bpmn2.modeler.examples.projects.modelreader</artifactId> <name>BPMN2 Modeler Examples: Projects</name> <description>BPMN2 Modeler Example Projects</description> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> </project> diff --git a/features/org.eclipse.bpmn2.modeler.examples/feature.xml b/features/org.eclipse.bpmn2.modeler.examples/feature.xml index 95333c10..20637a9b 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.examples" label="BPMN2 Modeler - Examples" - version="1.3.2.qualifier" + version="1.3.3.qualifier" provider-name="%providerName"> <description> diff --git a/features/org.eclipse.bpmn2.modeler.examples/pom.xml b/features/org.eclipse.bpmn2.modeler.examples/pom.xml index e953d6c3..6a323037 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>BPMN2 Modeler Feature: Examples</name> <description>BPMN2 Modeler Examples Feature</description> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml index bb93dae8..e8fdc0e1 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.runtime.jboss" label="BPMN2 Modeler - jBPM Runtime Extension Feature" - version="1.3.2.qualifier" + version="1.3.3.qualifier" provider-name="%providerName"> <description url="http://jbpm.jboss.org/"> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml index 2c5c7af7..1b204d09 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>BPMN2 Modeler Feature: jBPM Runtime</name> <description>BPMN2 Modeler JBoss jBPM Runtime Feature</description> diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml index aff375bc..1c7f28ea 100644 --- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.updatesite</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-repository</packaging> <name>BPMN2 Modeler Feature: Update Site</name> <description>BPMN2 Modeler Update SiteFeature</description> diff --git a/features/org.eclipse.bpmn2.modeler/feature.xml b/features/org.eclipse.bpmn2.modeler/feature.xml index 5fcc297a..9eba6bcd 100644 --- a/features/org.eclipse.bpmn2.modeler/feature.xml +++ b/features/org.eclipse.bpmn2.modeler/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler" label="BPMN2 Modeler - Diagram Editor" - version="1.3.2.qualifier" + version="1.3.3.qualifier" provider-name="%providerName"> <description url="https://www.eclipse.org/bpmn2-modeler/"> diff --git a/features/org.eclipse.bpmn2.modeler/pom.xml b/features/org.eclipse.bpmn2.modeler/pom.xml index 0d823c45..97967521 100644 --- a/features/org.eclipse.bpmn2.modeler/pom.xml +++ b/features/org.eclipse.bpmn2.modeler/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>BPMN2 Modeler Feature: Editor</name> <description>BPMN2 Modeler Editor Feature</description> diff --git a/features/pom.xml b/features/pom.xml index 1e04d0d1..219c7b48 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> <name>BPMN2 Modeler: Features Parent</name> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/parent/pom.xml b/parent/pom.xml index 4bb4a2b8..018fc958 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -8,7 +8,7 @@ <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>BPMN2 Modeler Parent</name> @@ -134,6 +134,18 @@ <platform-version-name>neon</platform-version-name> <eclipse.orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</eclipse.orbit.url> </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIThread>false</useUIThread> + </configuration> + </plugin> + </plugins> + </build> </profile> <profile> <id>sign</id> @@ -188,6 +200,15 @@ <repositories> <repository> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>central</id> + <name>Central Repository</name> + <url>https://repo.maven.apache.org/maven2</url> + </repository> + + <repository> <id>eclipse-platform</id> <layout>p2</layout> <url>${eclipse-site}</url> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF index 10a7365e..7df885dd 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.emf.transaction, diff --git a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml index 57e7d62e..2e44b8d6 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.core</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Plugins: Core</name> <description>Common Core functionality for BPMN2 Modeler</description> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java index aa5fd2ce..fa2be8b6 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java @@ -10,8 +10,18 @@ *******************************************************************************/ package org.eclipse.bpmn2.modeler.core.validation; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.util.ArrayList; +import java.util.List; + public class SyntaxCheckerUtils { private static char invalidChar; + private final static Charset charsetUTF8 = Charset.forName("UTF-8"); + private final static CharsetDecoder utf8Decoder = charsetUTF8.newDecoder(); public static char getInvalidChar() { return invalidChar; @@ -19,7 +29,7 @@ public class SyntaxCheckerUtils { public static final boolean isQName(String name) { invalidChar = 0; - String parts[] = name.split(":"); //$NON-NLS-1$ + UTF8String parts[] = new UTF8String(name).split(':'); if (parts.length==1 && !name.endsWith(":")) { //$NON-NLS-1$ return isNCName(parts[0]); } @@ -31,11 +41,11 @@ public class SyntaxCheckerUtils { invalidChar = ':'; return false; } - + public static String toQName(String name) { if (name==null || name.isEmpty()) return "_"; //$NON-NLS-1$ - String parts[] = name.split(":"); //$NON-NLS-1$ + UTF8String parts[] = new UTF8String(name).split(':'); if (parts.length==1) { return toNCName(parts[0]); } @@ -44,8 +54,13 @@ public class SyntaxCheckerUtils { } return toNCName(name); } - + public static final boolean isNCName(String name) { + return isNCName(new UTF8String(name)); + } + + + private static boolean isNCName(UTF8String name) { invalidChar = 0; if (name==null || name.isEmpty()) return false; @@ -72,6 +87,10 @@ public class SyntaxCheckerUtils { } public static final String toNCName(String name) { + return toNCName(new UTF8String(name)); + } + + private static String toNCName(UTF8String name) { if (name==null || name.isEmpty()) return "_"; //$NON-NLS-1$ @@ -98,7 +117,7 @@ public class SyntaxCheckerUtils { return ncname.toString(); } - public static final boolean isNCNameChar(char c) { + private static final boolean isNCNameChar(char c) { boolean result = _isAsciiBaseChar(c) || _isAsciiDigit(c) || c == '.' || c == '-' || c == '_' || _isNonAsciiBaseChar(c) || _isNonAsciiDigit(c) || isIdeographic(c) || isCombiningChar(c) || isExtender(c); if (!result) @@ -111,15 +130,14 @@ public class SyntaxCheckerUtils { if (name==null || name.isEmpty()) return false; - int nameLength = name.length(); - - // Check first character - char c = name.charAt(0); + UTF8String utf8string = new UTF8String(name); + char c = utf8string.charAt(0); + int nameLength = utf8string.length(); if (Character.isJavaIdentifierStart(c)) { // Check the rest of the characters for (int i = 1; i < nameLength; i++) { - c = name.charAt(i); + c = utf8string.charAt(i); if (!Character.isJavaIdentifierPart(c)) { invalidChar = c; return false; @@ -258,7 +276,7 @@ public class SyntaxCheckerUtils { return true; } - public static final boolean isLetter(char c) { + private static final boolean isLetter(char c) { return _isAsciiBaseChar(c) || _isNonAsciiBaseChar(c) || isIdeographic(c); } @@ -404,11 +422,11 @@ public class SyntaxCheckerUtils { || _charInRange(c, 0x3105, 0x312C) || _charInRange(c, 0xAC00, 0xD7A3); } - public static final boolean isIdeographic(char c) { + private static final boolean isIdeographic(char c) { return _charInRange(c, 0x4E00, 0x9FA5) || c == 0x3007 || _charInRange(c, 0x3021, 0x3029); } - public static final boolean isCombiningChar(char c) { + private static final boolean isCombiningChar(char c) { return _charInRange(c, 0x0300, 0x0345) || _charInRange(c, 0x0360, 0x0361) || _charInRange(c, 0x0483, 0x0486) || _charInRange(c, 0x0591, 0x05A1) || _charInRange(c, 0x05A3, 0x05B9) || _charInRange(c, 0x05BB, 0x05BD) || c == 0x05BF || _charInRange(c, 0x05C1, 0x05C2) || c == 0x05C4 @@ -446,7 +464,7 @@ public class SyntaxCheckerUtils { || c == 0x309A; } - public static final boolean isDigit(char c) { + private static final boolean isDigit(char c) { return _isAsciiDigit(c) || _isNonAsciiDigit(c); } @@ -464,7 +482,7 @@ public class SyntaxCheckerUtils { || _charInRange(c, 0x0F20, 0x0F29); } - public static final boolean isExtender(char c) { + private static final boolean isExtender(char c) { return c == 0x00B7 || c == 0x02D0 || c == 0x02D1 || c == 0x0387 || c == 0x0640 || c == 0x0E46 || c == 0x0EC6 || c == 0x3005 || _charInRange(c, 0x3031, 0x3035) || _charInRange(c, 0x309D, 0x309E) || _charInRange(c, 0x30FC, 0x30FE); @@ -473,4 +491,81 @@ public class SyntaxCheckerUtils { private static final boolean _charInRange(char c, int start, int end) { return c >= start && c <= end; } + + private static CharBuffer decodeUTF8(String name) { + CharBuffer charbuf = null; + try { + charbuf = utf8Decoder.decode(ByteBuffer.wrap(name.getBytes())); + } catch (CharacterCodingException e) { + // if decoding fails, treat name as a normal non-encoded string + charbuf = CharBuffer.allocate(name.length()); + charbuf.put(name); + } + return charbuf; + } + + public static class UTF8String { + private CharBuffer charbuf = null; + + public UTF8String(String name) { + try { + charbuf = utf8Decoder.decode(ByteBuffer.wrap(name.getBytes())); + } catch (CharacterCodingException e) { + // if decoding fails, treat name as a normal non-encoded string + charbuf = CharBuffer.allocate(name.length()); + charbuf.put(name); + } + } + + public UTF8String(char[] src, int offset, int length) { + charbuf = CharBuffer.allocate(length); + charbuf.put(src, offset, length); + } + + public char charAt(int index) { + return charbuf.charAt(index); + } + + public UTF8String[] split(char sepc) { + List<UTF8String> parts = new ArrayList<UTF8String>(); + int i0 = 0; + for (int i=0; i<charbuf.length(); ++i) { + char c = charbuf.charAt(i); + if (sepc == c) { + UTF8String part = new UTF8String(charbuf.array(), i0, i-i0); + i0 = i + 1; + parts.add(part); + } + else if (i==charbuf.length()-1) { + UTF8String part = new UTF8String(charbuf.array(), i0, i+1-i0); + parts.add(part); + } + } + if (parts.size()==0) + return new UTF8String[] { this }; + return parts.toArray(new UTF8String[parts.size()]); + } + + public boolean isEmpty() { + return charbuf.limit()==0; + } + + public int length() { + return charbuf.limit(); + } + + @Override + public boolean equals(Object obj) { + return toString().equals(obj.toString()); + } + + @Override + public String toString() { + int pos = charbuf.position(); + charbuf.position(0); + String s = charbuf.toString(); + charbuf.position(pos); + return s; + } + } } diff --git a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF index ce5e54bb..b8cadd10 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.help;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.help.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml index d82bc516..39ce2cd0 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.help</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Plugins: Help</name> <description>Context Help for BPMN2 Modeler</description> diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF index dfd29e7c..e242d328 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml index 0525a076..3488fd1f 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml @@ -14,13 +14,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Plugins: jBPM Runtime</name> <description>BPMN2 Modeler Runtime Specialization for JBoss jBPM</description> diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF index 123d5e2f..d8f00e0b 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true -Bundle-Version: 1.3.2.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml index 021dd19f..94f18dae 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml @@ -17,13 +17,13 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.ui</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>BPMN2 Modeler Plugins: UI</name> <description>Main UI for BPMN2 Modeler</description> diff --git a/plugins/pom.xml b/plugins/pom.xml index d6e447ab..53c58643 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> <name>BPMN2 Modeler: Plugins Parent</name> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <groupId>org.eclipse</groupId> <artifactId>org-eclipse-bpmn2-modeler</artifactId> <name>BPMN2 Modeler</name> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> <!-- must build parent BEFORE building the rest of this project diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF index 6a6423c0..5efb2945 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %bundleName +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core.tests;singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.3.3.qualifier Require-Bundle: org.eclipse.bpmn2.edit, org.eclipse.bpmn2.editor, org.eclipse.bpmn2.modeler.core, @@ -11,8 +11,7 @@ Require-Bundle: org.eclipse.bpmn2.edit, org.eclipse.emf.transaction, org.eclipse.emf.validation.ocl, org.junit, - org.mockito, - org.objenesis, - org.hamcrest.library;bundle-version="1.3.0" + org.mockito;bundle-version="1.9.5", + org.hamcrest;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml index b67bb14e..26c08f40 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml @@ -1,13 +1,15 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> - </parent> + <artifactId>tests-parent</artifactId> + <version>1.3.3-SNAPSHOT</version> + </parent> - <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId> - <name>BPMN2 Modeler Tests: Core Tests</name> - <packaging>eclipse-test-plugin</packaging> + <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId> + <name>BPMN2 Modeler Tests: Core Tests</name> + <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java index 9c5a33ba..ecf5bbe3 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java @@ -1,7 +1,7 @@ package org.eclipse.bpmn2.modeler.core.validation.tests; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.eclipse.bpmn2.modeler.core.validation.SyntaxCheckerUtils; import org.junit.Test; @@ -13,6 +13,10 @@ public class SyntaxCheckerUtilsTest { assertTrue( SyntaxCheckerUtils.isJavaIdentifier("_ab") ); assertTrue( SyntaxCheckerUtils.isJavaIdentifier("a1b") ); assertTrue( SyntaxCheckerUtils.isJavaIdentifier("_ab") ); + } + + @Test + public void testIsJavaIdentifierUTF8() throws Exception { assertTrue( SyntaxCheckerUtils.isJavaIdentifier("形声") ); } diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF index 795ed324..204fe3ed 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.3.3.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.bpmn2.modeler.runtime.jboss.jbpm, org.eclipse.core.runtime, @@ -12,4 +12,3 @@ Require-Bundle: org.junit, org.eclipse.ui Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests.Activator Export-Package: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests -Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml index 24ec459e..ccda8ed6 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml @@ -1,15 +1,15 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> + <artifactId>tests-parent</artifactId> + <version>1.3.3-SNAPSHOT</version> + </parent> - <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>jbpm5-tests</artifactId> - <version>1.4.0-SNAPSHOT</version> + <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</artifactId> <name>BPMN2 Modeler Tests: Runtime JBPM5 Tests</name> + <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java index 38af1708..67e902c3 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java @@ -10,17 +10,25 @@ ******************************************************************************/ package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests; +import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URISyntaxException; import java.net.URL; +import java.util.Collections; import java.util.HashMap; import java.util.Scanner; import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WIDException; import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WIDParser; import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WorkItemDefinition; -import org.junit.Test; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.junit.Assert; +import org.junit.Test; +import org.osgi.framework.Bundle; /** @@ -30,12 +38,21 @@ import org.junit.Assert; */ public class TestWIDHandler { - private String getFile( String filepath ) { - if (filepath == null) { - filepath = "widfiles/logemail.wid"; + private String getWidFile( String filepath ) { + Bundle bundle = Activator.getDefault().getBundle(); + IPath path = new Path("widfiles/"+filepath); + URL setupUrl = FileLocator.find(bundle, path, Collections.EMPTY_MAP); + File setupFile = null; + try { + setupFile = new File(FileLocator.toFileURL(setupUrl).toURI()); + } catch (URISyntaxException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); } - URL url = this.getClass().getClassLoader().getResource(filepath); - filepath = url.getPath().toString(); + filepath = setupFile.getAbsolutePath(); StringBuilder text = new StringBuilder(); String NL = System.getProperty("line.separator"); @@ -58,7 +75,7 @@ public class TestWIDHandler { @Test public void testBasic() { System.out.println("testBasic: logemail.wid"); - String content = getFile(null); + String content = getWidFile("logemail.wid"); HashMap<String, WorkItemDefinition> widMap = new HashMap<String, WorkItemDefinition>(); try { widMap = WIDParser.parse(content); @@ -74,7 +91,7 @@ public class TestWIDHandler { @Test public void testComplex() { System.out.println("testComplex: widfiles/Email.wid"); - String content = getFile("widfiles/Email.wid"); + String content = getWidFile("Email.wid"); HashMap<String, WorkItemDefinition> widMap = new HashMap<String, WorkItemDefinition>(); try { widMap = WIDParser.parse(content); @@ -94,7 +111,7 @@ public class TestWIDHandler { @Test public void testResults() { System.out.println("testResults: widfiles/java.wid"); - String content = getFile("widfiles/java.wid"); + String content = getWidFile("java.wid"); HashMap<String, WorkItemDefinition> widMap = new HashMap<String, WorkItemDefinition>(); try { widMap = WIDParser.parse(content); diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/Email.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Email.wid index a4e47662..a4e47662 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/Email.wid +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Email.wid diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/Twitter.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Twitter.wid index 113006d6..113006d6 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/Twitter.wid +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Twitter.wid diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/java.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/java.wid index 893f6086..893f6086 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/java.wid +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/java.wid diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/logemail.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/logemail.wid index c373a6ab..c373a6ab 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/widfiles/logemail.wid +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/logemail.wid diff --git a/tests/pom.xml b/tests/pom.xml index a7fd8ce5..e56073a9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,18 +1,27 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> - <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.3.2-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> + <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> + <version>1.3.3-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <name>BPMN2 Modeler: Tests Parent</name> - <packaging>pom</packaging> + <artifactId>tests-parent</artifactId> + <name>BPMN2 Modeler: Tests Parent</name> + <packaging>pom</packaging> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + </dependency> + </dependencies> + <modules> <module>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</module> <module>org.eclipse.bpmn2.modeler.core.tests</module> |