Fixed maven package build to build org.simantics.sysdyn.internal.p2 site

This is still work is progress but getting there.

refs #6676

Change-Id: I860898c5e5143de29246e34d59a60e3f59e7bdae

diff --git a/bundles/org.simantics.fmu.me.win32/.classpath b/bundles/org.simantics.fmu.me.win32/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..bdaeff6b38d8db9b2b8972f918b241c39ffc5f67 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/.classpath
+++ b/bundles/org.simantics.fmu.me.win32/.classpath
@@ -2,6 +2,4 @@
 <classpath>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
index f7371dbcbe6c12a277a76a5fdc932168ec47c5d6..417b6df328944babf82b1b1f3f1eecb344d4f88c 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win32 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win32
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
+Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.simantics.utils;bundle-version="1.1.0"
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
+Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86

diff --git a/bundles/org.simantics.fmu.me.win32/build.properties b/bundles/org.simantics.fmu.me.win32/build.properties
index 150031be326b532fc215148406577b9341e62e09..7564729b27b19417b78826bb4bee19c554519c66 100644 (file)
--- a/bundles/org.simantics.fmu.me.win32/build.properties
+++ b/bundles/org.simantics.fmu.me.win32/build.properties
@@ -1,5 +1,3 @@
-source.. = src/\r
-output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
                libraries/\r

diff --git a/bundles/org.simantics.fmu.me.win32/pom.xml b/bundles/org.simantics.fmu.me.win32/pom.xml
new file mode 100644 (file)
index 0000000..e1cecb8
--- /dev/null
+++ b/bundles/org.simantics.fmu.me.win32/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <groupId>org.simantics</groupId>\r
+       <artifactId>org.simantics.fmu.me.win32</artifactId>\r
+       <version>1.1.0-SNAPSHOT</version>\r
+       <packaging>eclipse-plugin</packaging>\r
+\r
+       <parent>\r
+               <groupId>org.simantics</groupId>\r
+               <artifactId>org.simantics.sysdyn.root.bundles</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>target-platform-configuration</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <configuration>\r
+                                       <environments>\r
+                                               <environment>\r
+                                                       <os>win32</os>\r
+                                                       <ws>win32</ws>\r
+                                                       <arch>x86</arch>\r
+                                               </environment>\r
+                                       </environments>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+\r
+</project>
\ No newline at end of file

diff --git a/bundles/org.simantics.fmu.me.win64/.classpath b/bundles/org.simantics.fmu.me.win64/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..bdaeff6b38d8db9b2b8972f918b241c39ffc5f67 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/.classpath
+++ b/bundles/org.simantics.fmu.me.win64/.classpath
@@ -2,6 +2,4 @@
 <classpath>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
index 37df58eecd0464665757d1cf1ec5d4b290560062..bfa0ab4e89bafcc4cf5f98ddba638362c0afca9a 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win64 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win64
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
+Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.simantics.utils;bundle-version="1.1.0"
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
+Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/libexpat.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86_64

diff --git a/bundles/org.simantics.fmu.me.win64/build.properties b/bundles/org.simantics.fmu.me.win64/build.properties
index 150031be326b532fc215148406577b9341e62e09..7564729b27b19417b78826bb4bee19c554519c66 100644 (file)
--- a/bundles/org.simantics.fmu.me.win64/build.properties
+++ b/bundles/org.simantics.fmu.me.win64/build.properties
@@ -1,5 +1,3 @@
-source.. = src/\r
-output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
                libraries/\r

diff --git a/bundles/org.simantics.fmu.me.win64/pom.xml b/bundles/org.simantics.fmu.me.win64/pom.xml
new file mode 100644 (file)
index 0000000..9681597
--- /dev/null
+++ b/bundles/org.simantics.fmu.me.win64/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <groupId>org.simantics</groupId>\r
+       <artifactId>org.simantics.fmu.me.win64</artifactId>\r
+       <version>1.1.0-SNAPSHOT</version>\r
+       <packaging>eclipse-plugin</packaging>\r
+\r
+       <parent>\r
+               <groupId>org.simantics</groupId>\r
+               <artifactId>org.simantics.sysdyn.root.bundles</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>target-platform-configuration</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <configuration>\r
+                                       <environments>\r
+                                               <environment>\r
+                                                       <os>win32</os>\r
+                                                       <ws>win32</ws>\r
+                                                       <arch>x86_64</arch>\r
+                                               </environment>\r
+                                       </environments>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+\r
+</project>
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.build.feature/buckminster.properties b/features/org.simantics.sysdyn.build.feature/buckminster.properties
index f310dee4072eaddd75e90a86a6a10918af2fd047..d8c588f409725ab3a606e0e3edb6fe0daf58379d 100644 (file)
--- a/features/org.simantics.sysdyn.build.feature/buckminster.properties
+++ b/features/org.simantics.sysdyn.build.feature/buckminster.properties
@@ -1,9 +1,6 @@
-#buckminster.output.root=c:/simantics-build/site
-#buckminster.temp.root=c:/simantics-build/temp
-
 # How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-generator.lastRevision.format=r{0,number,000000}
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
 
 # Pack200 compression
 #site.pack200=true

diff --git a/features/org.simantics.sysdyn.feature/feature.xml b/features/org.simantics.sysdyn.feature/feature.xml
index dbe2c387500b1e754950c4c068808c49f86dabba..40a0f5e6414bbc8fb52ae7d79b11338c98080748 100644 (file)
--- a/features/org.simantics.sysdyn.feature/feature.xml
+++ b/features/org.simantics.sysdyn.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature\r
       id="org.simantics.sysdyn"\r
       label="Simantics System Dynamics Feature"\r
-      version="1.9.1.qualifier"\r
+      version="1.10.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description>\r

diff --git a/features/org.simantics.sysdyn.internal.feature/build.properties b/features/org.simantics.sysdyn.internal.feature/build.properties
index 6ec1948b84eddf70c415a9425fd5181fda58006b..02cbdc37ef09a04cbf8044b2a82cb7497c98651c 100644 (file)
--- a/features/org.simantics.sysdyn.internal.feature/build.properties
+++ b/features/org.simantics.sysdyn.internal.feature/build.properties
@@ -12,5 +12,5 @@
 bin.includes = feature.xml\r
 root=rootfiles/\r
 \r
-root.win32.win32.x86.folder.jre=jre/win32.x86\r
-root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file
+#root.win32.win32.x86.folder.jre=jre/win32.x86\r
+#root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file

diff --git a/features/org.simantics.sysdyn.internal.feature/feature.xml b/features/org.simantics.sysdyn.internal.feature/feature.xml
index 60192611c6ff5699d0a0b732011b066cd8c5106b..7bc8c1e9fe08df868302b748c90bbc9746b72b11 100644 (file)
--- a/features/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.sysdyn.internal"\r
       label="Simantics System Dynamics Internal Solver Feature"\r
-      version="1.9.1.qualifier"\r
+      version="1.10.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description>\r
@@ -10,11 +10,11 @@
    </description>\r
 \r
    <copyright>\r
-      Copyright (c) 2007, 2016 Association for Decentralized Information\r
-Management in Industry THTH ry.&lt;br/&gt;\r
-All rights reserved. This program and the accompanying materials\r
-are made available under the terms of the Eclipse Public License\r
-v1.0 which accompanies this distribution, and is available at\r
+      Copyright (c) 2007, 2016 Association for Decentralized Information
+Management in Industry THTH ry.&lt;br/&gt;
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
    </copyright>\r
 \r

diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index fc94bb5e1d8c183cb9dd641f1f9907a15ccec074..dccf2b59aa0fa8d9261a8584c87bb416424410bd 100644 (file)
--- a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.sysdyn.internal.p2"\r
       label="Simantics System Dynamics with Internal Solver"\r
-      version="1.9.1.qualifier"\r
+      version="1.10.0.qualifier"\r
       provider-name="Semantum Oy">\r
 \r
    <description>\r
@@ -117,20 +117,20 @@ v1.0 which accompanies this distribution, and is available at
    <plugin\r
          id="org.simantics.fmu.me.win32"\r
          os="win32"\r
-         ws="win32"\r
          arch="x86"\r
          download-size="0"\r
          install-size="0"\r
-         version="0.0.0"/>\r
+         version="0.0.0"\r
+         fragment="true"/>\r
 \r
    <plugin\r
          id="org.simantics.fmu.me.win64"\r
          os="win32"\r
-         ws="win32"\r
          arch="x86_64"\r
          download-size="0"\r
          install-size="0"\r
-         version="0.0.0"/>\r
+         version="0.0.0"\r
+         fragment="true"/>\r
 \r
    <plugin\r
          id="org.simantics.fileimport"\r

diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
index f310dee4072eaddd75e90a86a6a10918af2fd047..d8c588f409725ab3a606e0e3edb6fe0daf58379d 100644 (file)
--- a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
+++ b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
@@ -1,9 +1,6 @@
-#buckminster.output.root=c:/simantics-build/site
-#buckminster.temp.root=c:/simantics-build/temp
-
 # How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-generator.lastRevision.format=r{0,number,000000}
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
 
 # Pack200 compression
 #site.pack200=true

diff --git a/features/org.simantics.sysdyn.product.site.feature/feature.xml b/features/org.simantics.sysdyn.product.site.feature/feature.xml
index fb5d7847ba6ffa43d05a150ab3b87a53b110a34f..95b251007cffc5f5faaec9bf0789e03982dffdbf 100644 (file)
--- a/features/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/features/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature\r
       id="org.simantics.sysdyn.product.site"\r
       label="Sysdyn Product Site"\r
-      version="1.9.1.qualifier"\r
+      version="1.10.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r
 \r
    <description>\r

diff --git a/features/pom.xml b/features/pom.xml
index 0663ecf6f66be8aa235e84f21cb26848c29da3ee..e433ffe165fea71df7ce027fdf204268dc53f221 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,7 +29,8 @@
               <configuration>\r
                 <excludes>\r
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
-                  <plugin id="com.famfamfam.silk"/>\r
+                  <!--\r
+                                 <plugin id="com.famfamfam.silk"/>\r
                   <plugin id="javax.vecmath"/>\r
                   <plugin id="org.apache.batik"/>\r
                   <plugin id="org.apache.poi"/>\r
@@ -74,8 +75,21 @@
                   <feature id="org.eclipse.emf.ecore"/>\r
                   <feature id="org.eclipse.epp.mpc"/>\r
                   <feature id="org.eclipse.equinox.p2.discovery.feature"/>\r
-                  <feature id="org.eclipse.equinox.executable"/>\r
-                </excludes>\r
+                  -->\r
+                  <plugin id="org.simantics.fileimport"/>\r
+                  <plugin id="org.simantics.fmu.me.win32"/>\r
+                  <plugin id="org.simantics.fmu.me.win64"/>\r
+                  <plugin id="org.simantics.sysdyn.product"/>\r
+                                 \r
+                                 <feature id="org.eclipse.equinox.executable"/>\r
+                                 <feature id="org.simantics.eclipsec.launcher"/>\r
+                                 <feature id="org.simantics.help"/>\r
+                                 <feature id="org.simantics.issues.feature"/>\r
+                                 <feature id="org.simantics.issues.ui.feature"/>\r
+                                 <feature id="org.simantics.modeling"/>\r
+                                 <feature id="org.simantics.workbench"/>\r
+                                 \r
+                               </excludes>\r
               </configuration>\r
             </execution>\r
           </executions>\r
@@ -98,11 +112,11 @@
     </build>\r
     \r
     <modules>\r
-        <module>org.simantics.sysdyn.build.feature</module>\r
-        <module>org.simantics.sysdyn.feature</module>\r
+        <!--<module>org.simantics.sysdyn.build.feature</module>-->\r
+        <!--<module>org.simantics.sysdyn.feature</module>-->\r
         <module>org.simantics.sysdyn.internal.feature</module>\r
         <module>org.simantics.sysdyn.internal.p2.feature</module>\r
-        <module>org.simantics.sysdyn.product.site.feature</module>\r
-        <module>org.simantics.sysdyn.updatesite.feature</module>\r
+        <!--<module>org.simantics.sysdyn.product.site.feature</module>-->\r
+        <!--<module>org.simantics.sysdyn.updatesite.feature</module>-->\r
     </modules>\r
 </project>\r

diff --git a/releng/org.simantics.sysdyn.repository/category.xml b/releng/org.simantics.sysdyn.repository/category.xml
index cc0eee3ca08d311d1539ae3f45ae886f21041035..69e35ac0bc2d25b650810bb8b9d27a8050f23b35 100644 (file)
--- a/releng/org.simantics.sysdyn.repository/category.xml
+++ b/releng/org.simantics.sysdyn.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <site>\r
-   <feature url="features/org.simantics.sysdyn_1.25.0.jar" id="org.simantics.sysdyn" version="1.25.0">\r
+   <feature id="org.simantics.sysdyn.internal.p2">\r
       <category name="org.simantics.sysdyn"/>\r
    </feature>\r
    <category-def name="org.simantics.sysdyn" label="Simantics System Dynamics">\r

diff --git a/releng/org.simantics.sysdyn.repository/pom.xml b/releng/org.simantics.sysdyn.repository/pom.xml
index 297de8ef1b898db0c1bc8b0b022d411c8be66f52..9d54b1fabf0b6323b720a926e616cf230f91d32c 100644 (file)
--- a/releng/org.simantics.sysdyn.repository/pom.xml
+++ b/releng/org.simantics.sysdyn.repository/pom.xml
@@ -2,7 +2,7 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>org.simantics.sysdyn.repository</artifactId>\r
-       <version>1.25.0-SNAPSHOT</version>\r
+       <version>1.10.0-SNAPSHOT</version>\r
        <packaging>eclipse-repository</packaging>\r
 \r
        <parent>\r

diff --git a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
index ff6e3bc51f00cf8b161e52fa6b5cba72558a6df7..b9069e236fe19a1ab148ca1c26cf8e4b910d3ba8 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
+++ b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.sysdyn.tests.Activator
 Require-Bundle: org.simantics.modelica;bundle-version="1.0.0",
  org.junit;bundle-version="4.8.2",
- org.simantics.db.testing;bundle-version="1.0.0"
+ org.simantics.db.testing;bundle-version="1.0.0",
+ org.simantics.fmu;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
index c3974d9ee8b578007da135a7674977d3cb58532b..67b0f5232958ef46bdb97538995a6398236cc325 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
@@ -1,11 +1,12 @@
 package org.simantics.sysdyn.tests.fmi;\r
 \r
 import static org.junit.Assert.fail;\r
-import junit.framework.Assert;\r
 \r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
+\r
+import org.junit.Assert;\r
 \r
 /**\r
  * Tests calls to fmu control before model has been loaded or initialized.\r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
index 1ba94231a623e5a97e7ca7a6c3ec575e455e0560..4c5d4057e478ffe0df84fb9d5af74ea0cb505e92 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import junit.framework.Assert;\r
-\r
+import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 /**\r
  * Tests that a boolean value can be changed, erroneous values and variables are detected\r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
index 70bad9f195a5642370800298a4be6efdfa273858..9b581fa162b5fe5774f7c147d19a160faddfd5f2 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import junit.framework.Assert;\r
-\r
+import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 /**\r
  * Tests that an integer value can be changed and the change is propagated \r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
index f996b7a915f68d0ea55a49e1f286d38b62553589..54c67f68b48d4ca511704b70693802dffdd451fd 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import junit.framework.Assert;\r
-\r
+import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 /**\r
  * Tests that a real value can be changed and the change is propagated \r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
index 0cbb9f5af665ac5c3109e5810d9cdcb1429aa0b9..05a521f485cda66582652deeb97ae32f9e42122c 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import junit.framework.Assert;\r
-\r
+import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 \r
 /**\r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
index c6f9b6c0ad3b5ccef42acf3b39a7e285752dd09d..771557918392ec3e3f28cd30b518110cc0ed271e 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
@@ -1,11 +1,10 @@
 package org.simantics.sysdyn.tests.fmi;\r
 \r
-import static org.junit.Assert.*;\r
-\r
+import static org.junit.Assert.fail;\r
 \r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 /**\r
  * Test possible error situations in loading an fmu file to the control\r

diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
index 6a4d7affdf4f18291b912a0408f3d6a7dd8674ee..7a883ef46081e2dd6cdc813d954bf1ec901ec399 100644 (file)
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import junit.framework.Assert;\r
-\r
+import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.simantics.modelica.fmi.FMUControlJNI;\r
-import org.simantics.modelica.fmi.FMUJNIException;\r
+import org.simantics.fmu.FMUControlJNI;\r
+import org.simantics.fmu.FMUJNIException;\r
 \r
 public class MultipleSimultaneousFMUSimulationsTest {\r
 \r