update and activate test

OpenModelica · Mar 6, 2020 · 3e3deb8 · 3e3deb8
1 parent 7f1dc69
commit 3e3deb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/testsuite/openmodelica/fmi/ModelExchange/2.0/FMUResourceTest.mos b/testsuite/openmodelica/fmi/ModelExchange/2.0/FMUResourceTest.mos
@@ -1,35 +1,29 @@
 // name: FMUResourceTest
 // keywords: fmu export import
 // status: correct
-// teardown_command: rm -rf binaries sources modelDescription.xml FMUResourceTest_Test* FMUResourceTest.Test* output.log
+// teardown_command: rm -rf binaries sources resources modelDescription.xml FMUResourceTest_Test* FMUResourceTest.Test* output.log
 //
 
 
 loadModel(Modelica); getErrorString();
 loadFile("./FMUResourceTest/package.mo"); getErrorString();
 translateModelFMU(FMUResourceTest.TestResource, version="2.0"); getErrorString();
-importFMU("FMUResourceTest.TestResource"); getErrorString();
-loadFile("FMUResourceTest_TestResource.mo"); getErrorString();
-simulate(FMUResourceTest.TestPIFMU); getErrorString();
+importFMU("FMUResourceTest.TestResource.fmu"); getErrorString();
+loadFile("FMUResourceTest_TestResource_me_FMU.mo"); getErrorString();
+buildModel(FMUResourceTest_TestResource_me_FMU); getErrorString();
 
 
 // Result:
 // true
 // ""
 // true
 // ""
+// "FMUResourceTest.TestResource.fmu"
 // ""
-// "[CodegenUtil.tpl:178:14-178:14:writable] Error: Template error: initial value of unknown type: OpenModelica_fmuLoadResource("C:\\home\\adrpo33\\dev\\OpenModelica\\testsuite\\openmodelica\\fmi\\ModelExchange\\2.0\\FMUResourceTest\\Resources\\table_test_utf8.txt").
-// "
+// "FMUResourceTest_TestResource_me_FMU.mo"
 // ""
-// "Error: File not Found: FMUResourceTest.TestResource.
-// "
-// false
+// true
 // ""
-// record SimulationResult
-//     resultFile = "",
-//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'FMUResourceTest.TestPIFMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = "Simulation Failed. Model: FMUResourceTest.TestPIFMU does not exist! Please load it first before simulation."
-// end SimulationResult;
+// {"FMUResourceTest_TestResource_me_FMU","FMUResourceTest_TestResource_me_FMU_init.xml"}
 // ""
 // endResult
diff --git a/testsuite/openmodelica/fmi/ModelExchange/2.0/Makefile b/testsuite/openmodelica/fmi/ModelExchange/2.0/Makefile
@@ -15,6 +15,7 @@ fmi_attributes_08.mos \
 fmi_attributes_09.mos \
 fmi_attributes_10.mos \
 FMIExercise.mos \
+FMIResourceTest.mos \
 HelloFMIWorld.mos \
 HelloFMIWorldEvent.mos \
 IntegerNetwork1.mos \