- Some fixes for Java interface

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11663 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 4, 2012 · 37f28be · 37f28be
1 parent 9ee95e0
commit 37f28be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/SimulationRuntime/c/util/java_interface/src/org/openmodelica/test/TestDefinitionsParser.java b/SimulationRuntime/c/util/java_interface/src/org/openmodelica/test/TestDefinitionsParser.java
@@ -45,9 +45,9 @@ public void test_meta_modelica_mo() throws Exception {
   public void test_OMC_Util_mo() throws Exception {
     File jarFile = new File("test_files/OMC_Util.jar");
     DefinitionsCreator.createDefinitions(jarFile, "org.openmodelica.OMC",
-        new File("../../Compiler/").getAbsoluteFile(),
+        new File("../../../../Compiler/").getAbsoluteFile(),
         new String[]{
-      "Util.mo" /* Lots of "replaceable type X subtypeof Any;" */
+      "Util/Util.mo" /* Lots of "replaceable type X subtypeof Any;" */
       },
       true);
   }
@@ -62,8 +62,8 @@ public void test_OMC_Util_mo() throws Exception {
   public void test_OMC_Absyn_mo() throws Exception  {
     File jarFile = new File("test_files/OMC_Absyn.jar");
     DefinitionsCreator.createDefinitions(jarFile, "org.openmodelica.OMC",
-        new File("../../Compiler/").getAbsoluteFile(),
-        new String[]{"Absyn.mo"},
+        new File("../../../../Compiler/").getAbsoluteFile(),
+        new String[]{"FrontEnd/Absyn.mo"},
         true);
   }
 
@@ -73,7 +73,7 @@ public void test_OMC_Values_mo() throws Exception  {
     DefinitionsCreator.createDefinitions(
         jarFile,
         "org.openmodelica.OMC",
-        new File("../../Compiler/").getAbsoluteFile(),
+        new File("../../../../Compiler/FrontEnd").getAbsoluteFile(),
         new String[]{
           "Absyn.mo", "Values.mo"
           },
@@ -85,9 +85,9 @@ public void test_OMC_Values_mo() throws Exception  {
   public void test_OMC_ClassInf_mo() throws Exception  {
     File jarFile = new File("test_files/OMC_ClassInf.jar");
     DefinitionsCreator.createDefinitions(jarFile, "org.openmodelica.OMC",
-        new File("../../Compiler/").getAbsoluteFile(),
+        new File("../../../../Compiler/").getAbsoluteFile(),
         new String[]{
-      "Absyn.mo", "ClassInf.mo", "SCode.mo"
+      "FrontEnd/Absyn.mo", "FrontEnd/ClassInf.mo", "FrontEnd/SCode.mo"
       },
       false);
   }
@@ -103,7 +103,7 @@ public boolean accept(File dir, String name) {
   @Test
   public void test_OMC_mo_stripped() throws Exception {
     File jarFile = new File("test_files/OMC_full_no_functions.jar");
-    File compilerDir = new File("../../Compiler/");
+    File compilerDir = new File("../../../../Compiler/");
     String[] files = compilerDir.list(new MoFilter());
     DefinitionsCreator.createDefinitions(jarFile, "org.openmodelica.OMC",
         compilerDir.getAbsoluteFile(),
@@ -117,7 +117,7 @@ public void test_OMC_mo_stripped() throws Exception {
   @Test
   public void test_OMC_mo() throws Exception {
     File jarFile = new File("test_files/OMC_full.jar");
-    File compilerDir = new File("../../Compiler/");
+    File compilerDir = new File("../../../../Compiler/");
     String[] files = compilerDir.list(new MoFilter());
     DefinitionsCreator.createDefinitions(jarFile, "org.openmodelica.OMC",
         compilerDir.getAbsoluteFile(),

diff --git a/SimulationRuntime/c/util/java_interface/test_files/simple.mo b/SimulationRuntime/c/util/java_interface/test_files/simple.mo
@@ -19,6 +19,7 @@ end SimpleInner;
 function AddOne
   input Integer i;
   output Real out;
+protected
   Integer one = 1;
 algorithm
   out := i+one;