Update test03 (#1375)

OpenModelica · Nov 22, 2024 · 7a7f241 · 7a7f241
1 parent d807d7a
commit 7a7f241
Show file tree

Hide file tree

Showing 28 changed files with 181 additions and 202 deletions.
diff --git a/testsuite/api/import_export_units1.lua b/testsuite/api/import_export_units1.lua
@@ -20,7 +20,7 @@ oms_newResources("model.root.sine:sine.ssv")
 
 oms_setReal("model.root.sine.phase", 27)
 oms_setReal("model.root.sine.amplitude", -100)
-oms_setReal("model.root.sine.freqHz", -300)
+oms_setReal("model.root.sine.f", -300)
 
 oms_setResultFile("model", "")
 
@@ -55,7 +55,7 @@ print(src)
 --             unit="rad" />
 --         </ssv:Parameter>
 --         <ssv:Parameter
---           name="freqHz">
+--           name="f">
 --           <ssv:Real
 --             value="-300"
 --             unit="Hz" />
@@ -100,7 +100,7 @@ print(src)
 --             unit="rad" />
 --         </ssv:Parameter>
 --         <ssv:Parameter
---           name="freqHz">
+--           name="f">
 --           <ssv:Real
 --             value="-300"
 --             unit="Hz" />

diff --git a/testsuite/api/import_export_units2.lua b/testsuite/api/import_export_units2.lua
@@ -20,7 +20,7 @@ oms_addSubModel("model.root.sine", "../resources/Modelica.Blocks.Sources.Sine.fm
 
 oms_setReal("model.root.sine.phase", 27)
 oms_setReal("model.root.sine.amplitude", -100)
-oms_setReal("model.root.sine.freqHz", -300)
+oms_setReal("model.root.sine.f", -300)
 
 oms_setResultFile("model", "")
 
@@ -73,7 +73,7 @@ print(src)
 --                 <ssc:Real />
 --               </ssd:Connector>
 --               <ssd:Connector
---                 name="freqHz"
+--                 name="f"
 --                 kind="parameter">
 --                 <ssc:Real
 --                   unit="Hz" />
@@ -110,7 +110,7 @@ print(src)
 --                           unit="rad" />
 --                       </ssv:Parameter>
 --                       <ssv:Parameter
---                         name="freqHz">
+--                         name="f">
 --                         <ssv:Real
 --                           value="-300"
 --                           unit="Hz" />
@@ -189,7 +189,7 @@ print(src)
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
---         name="model.root.sine.freqHz"
+--         name="model.root.sine.f"
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
@@ -245,7 +245,7 @@ print(src)
 --                 <ssc:Real />
 --               </ssd:Connector>
 --               <ssd:Connector
---                 name="freqHz"
+--                 name="f"
 --                 kind="parameter">
 --                 <ssc:Real
 --                   unit="Hz" />
@@ -282,7 +282,7 @@ print(src)
 --                           unit="rad" />
 --                       </ssv:Parameter>
 --                       <ssv:Parameter
---                         name="freqHz">
+--                         name="f">
 --                         <ssv:Real
 --                           value="-300"
 --                           unit="Hz" />
@@ -361,7 +361,7 @@ print(src)
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
---         name="model.root.sine.freqHz"
+--         name="model.root.sine.f"
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable

diff --git a/testsuite/api/setUnits1.lua b/testsuite/api/setUnits1.lua
@@ -20,7 +20,7 @@ oms_newResources("model.root.sine:sine.ssv")
 
 oms_setReal("model.root.sine.phase", 27)
 oms_setReal("model.root.sine.amplitude", -100)
-oms_setReal("model.root.sine.freqHz", -300)
+oms_setReal("model.root.sine.f", -300)
 
 oms_setResultFile("model", "")
 
@@ -59,7 +59,7 @@ oms_delete("model")
 --             unit="rad" />
 --         </ssv:Parameter>
 --         <ssv:Parameter
---           name="freqHz">
+--           name="f">
 --           <ssv:Real
 --             value="-300"
 --             unit="Hz" />
@@ -104,7 +104,7 @@ oms_delete("model")
 --             unit="m" />
 --         </ssv:Parameter>
 --         <ssv:Parameter
---           name="freqHz">
+--           name="f">
 --           <ssv:Real
 --             value="-300"
 --             unit="Hz" />

diff --git a/testsuite/api/setUnits2.lua b/testsuite/api/setUnits2.lua
@@ -17,7 +17,7 @@ oms_addSubModel("model.root.sine", "../resources/Modelica.Blocks.Sources.Sine.fm
 
 oms_setReal("model.root.sine.phase", 27)
 oms_setReal("model.root.sine.amplitude", -100)
-oms_setReal("model.root.sine.freqHz", -300)
+oms_setReal("model.root.sine.f", -300)
 
 oms_setResultFile("model", "")
 
@@ -74,7 +74,7 @@ oms_delete("model")
 --                 <ssc:Real />
 --               </ssd:Connector>
 --               <ssd:Connector
---                 name="freqHz"
+--                 name="f"
 --                 kind="parameter">
 --                 <ssc:Real
 --                   unit="Hz" />
@@ -111,7 +111,7 @@ oms_delete("model")
 --                           unit="rad" />
 --                       </ssv:Parameter>
 --                       <ssv:Parameter
---                         name="freqHz">
+--                         name="f">
 --                         <ssv:Real
 --                           value="-300"
 --                           unit="Hz" />
@@ -190,7 +190,7 @@ oms_delete("model")
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
---         name="model.root.sine.freqHz"
+--         name="model.root.sine.f"
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
@@ -247,7 +247,7 @@ oms_delete("model")
 --                   unit="m" />
 --               </ssd:Connector>
 --               <ssd:Connector
---                 name="freqHz"
+--                 name="f"
 --                 kind="parameter">
 --                 <ssc:Real
 --                   unit="Hz" />
@@ -284,7 +284,7 @@ oms_delete("model")
 --                           unit="m" />
 --                       </ssv:Parameter>
 --                       <ssv:Parameter
---                         name="freqHz">
+--                         name="f">
 --                         <ssv:Real
 --                           value="-300"
 --                           unit="Hz" />
@@ -364,7 +364,7 @@ oms_delete("model")
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable
---         name="model.root.sine.freqHz"
+--         name="model.root.sine.f"
 --         type="Real"
 --         kind="parameter" />
 --       <oms:Variable

diff --git a/testsuite/api/setUnits3.py b/testsuite/api/setUnits3.py
@@ -21,7 +21,7 @@
 
 oms.setReal("model.root.sine.phase", 27)
 oms.setReal("model.root.sine.amplitude", -100)
-oms.setReal("model.root.sine.freqHz", -300)
+oms.setReal("model.root.sine.f", -300)
 
 oms.setResultFile("model", "")
 
@@ -60,7 +60,7 @@
 ##             unit="rad" />
 ##         </ssv:Parameter>
 ##         <ssv:Parameter
-##           name="freqHz">
+##           name="f">
 ##           <ssv:Real
 ##             value="-300"
 ##             unit="Hz" />
@@ -105,7 +105,7 @@
 ##             unit="m" />
 ##         </ssv:Parameter>
 ##         <ssv:Parameter
-##           name="freqHz">
+##           name="f">
 ##           <ssv:Real
 ##             value="-300"
 ##             unit="Hz" />

diff --git a/testsuite/api/test03.lua b/testsuite/api/test03.lua
@@ -4,6 +4,7 @@
 -- ucrt64: yes
 -- win: yes
 -- mac: no
+-- asan: yes
 
 oms_setCommandLineOption("--suppressPath=true")
 oms_setTempDirectory("./test03lua/")
@@ -77,7 +78,7 @@ oms_delete("test03lua")
 -- 					<ssd:Connector name="amplitude" kind="parameter">
 -- 						<ssc:Real />
 -- 					</ssd:Connector>
--- 					<ssd:Connector name="freqHz" kind="parameter">
+-- 					<ssd:Connector name="f" kind="parameter">
 -- 						<ssc:Real unit="Hz" />
 -- 					</ssd:Connector>
 -- 					<ssd:Connector name="offset" kind="parameter">
@@ -139,7 +140,7 @@ oms_delete("test03lua")
 -- 					<ssd:Connector name="amplitude" kind="parameter">
 -- 						<ssc:Real />
 -- 					</ssd:Connector>
--- 					<ssd:Connector name="freqHz" kind="parameter">
+-- 					<ssd:Connector name="f" kind="parameter">
 -- 						<ssc:Real unit="Hz" />
 -- 					</ssd:Connector>
 -- 					<ssd:Connector name="offset" kind="parameter">

diff --git a/testsuite/api/test03.py b/testsuite/api/test03.py
@@ -72,7 +72,7 @@ def printStatus(status, expected):
 ## 					<ssd:Connector name="amplitude" kind="parameter">
 ## 						<ssc:Real />
 ## 					</ssd:Connector>
-## 					<ssd:Connector name="freqHz" kind="parameter">
+## 					<ssd:Connector name="f" kind="parameter">
 ## 						<ssc:Real unit="Hz" />
 ## 					</ssd:Connector>
 ## 					<ssd:Connector name="offset" kind="parameter">
@@ -134,7 +134,7 @@ def printStatus(status, expected):
 ## 					<ssd:Connector name="amplitude" kind="parameter">
 ## 						<ssc:Real />
 ## 					</ssd:Connector>
-## 					<ssd:Connector name="freqHz" kind="parameter">
+## 					<ssd:Connector name="f" kind="parameter">
 ## 						<ssc:Real unit="Hz" />
 ## 					</ssd:Connector>
 ## 					<ssd:Connector name="offset" kind="parameter">

diff --git a/testsuite/export/exportSSVTemplate1.lua b/testsuite/export/exportSSVTemplate1.lua
@@ -73,7 +73,7 @@ oms_delete("exportSSVTemplate")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine.freqHz">
+--       name="sine.f">
 --       <ssv:Real
 --         value="1"
 --         unit="Hz" />
@@ -219,7 +219,7 @@ oms_delete("exportSSVTemplate")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine.freqHz">
+--       name="sine.f">
 --       <ssv:Real
 --         value="1"
 --         unit="Hz" />

diff --git a/testsuite/export/exportSSVTemplate3.lua b/testsuite/export/exportSSVTemplate3.lua
@@ -31,7 +31,7 @@ oms_newResources("model.root.gain:gain.ssv")
 
 oms_setReal("model.root.sine.phase", 27)
 oms_setReal("model.root.sine.amplitude", -100)
-oms_setReal("model.root.sine.freqHz", -300)
+oms_setReal("model.root.sine.f", -300)
 oms_setReal("model.root.gain.k", -200)
 
 oms_addSystem("model.root.subsystem", oms_system_sc)
@@ -44,7 +44,7 @@ oms_newResources("model.root.subsystem.gain1:gain1.ssv")
 
 oms_setReal("model.root.subsystem.sine1.phase", 50)
 oms_setReal("model.root.subsystem.sine1.amplitude", 60)
-oms_setReal("model.root.subsystem.sine1.freqHz", 70)
+oms_setReal("model.root.subsystem.sine1.f", 70)
 oms_setReal("model.root.subsystem.gain1.k", -150)
 
 oms_setResultFile("model", "")
@@ -103,7 +103,7 @@ oms_delete("model")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine.freqHz">
+--       name="sine.f">
 --       <ssv:Real
 --         value="-300"
 --         unit="Hz" />
@@ -142,7 +142,7 @@ oms_delete("model")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine1.freqHz">
+--       name="sine1.f">
 --       <ssv:Real
 --         value="70"
 --         unit="Hz" />
@@ -211,7 +211,7 @@ oms_delete("model")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine.freqHz">
+--       name="sine.f">
 --       <ssv:Real
 --         value="-300"
 --         unit="Hz" />
@@ -292,7 +292,7 @@ oms_delete("model")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine1.freqHz">
+--       name="sine1.f">
 --       <ssv:Real
 --         value="70"
 --         unit="Hz" />
@@ -361,7 +361,7 @@ oms_delete("model")
 --         value="0" />
 --     </ssv:Parameter>
 --     <ssv:Parameter
---       name="sine1.freqHz">
+--       name="sine1.f">
 --       <ssv:Real
 --         value="70"
 --         unit="Hz" />

diff --git a/testsuite/resources/Blocks.mos b/testsuite/resources/Blocks.mos
@@ -1,4 +1,4 @@
-loadModel(Modelica, {"3.2.3"}); getErrorString();
+loadModel(Modelica, {"4.0.0"}); getErrorString();
 
 buildModelFMU(Modelica.Blocks.Math.Add, version="2.0", fmuType="me_cs", fileNamePrefix="Modelica.Blocks.Math.Add", platforms={"i686-linux-gnu docker run docker.openmodelica.org/build-deps:v1.13-i386","x86_64-linux-gnu docker run docker.openmodelica.org/build-deps:bionic.nightly.amd64","i686-w64-mingw32 docker run docker.openmodelica.org/msyscross-omsimulator:v2.0","x86_64-w64-mingw32 docker run docker.openmodelica.org/msyscross-omsimulator:v2.0"}); getErrorString();
 buildModelFMU(Modelica.Blocks.Math.Feedback, version="2.0", fmuType="me_cs", fileNamePrefix="Modelica.Blocks.Math.Feedback", platforms={"i686-linux-gnu docker run docker.openmodelica.org/build-deps:v1.13-i386","x86_64-linux-gnu docker run docker.openmodelica.org/build-deps:bionic.nightly.amd64","i686-w64-mingw32 docker run docker.openmodelica.org/msyscross-omsimulator:v2.0","x86_64-w64-mingw32 docker run docker.openmodelica.org/msyscross-omsimulator:v2.0"}); getErrorString();

diff --git a/...ces/Modelica.Blocks.Sources.Constant/binaries/linux32/Modelica_Blocks_Sources_Constant.so b/...ces/Modelica.Blocks.Sources.Constant/binaries/linux32/Modelica_Blocks_Sources_Constant.so
diff --git a/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/linux64/Constant.so b/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/linux64/Constant.so
diff --git a/...ces/Modelica.Blocks.Sources.Constant/binaries/linux64/Modelica_Blocks_Sources_Constant.so b/...ces/Modelica.Blocks.Sources.Constant/binaries/linux64/Modelica_Blocks_Sources_Constant.so
diff --git a/...rces/Modelica.Blocks.Sources.Constant/binaries/win32/Modelica_Blocks_Sources_Constant.dll b/...rces/Modelica.Blocks.Sources.Constant/binaries/win32/Modelica_Blocks_Sources_Constant.dll
diff --git a/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/win64/Constant.dll b/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/win64/Constant.dll
diff --git a/...rces/Modelica.Blocks.Sources.Constant/binaries/win64/Modelica_Blocks_Sources_Constant.dll b/...rces/Modelica.Blocks.Sources.Constant/binaries/win64/Modelica_Blocks_Sources_Constant.dll
diff --git a/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/win64/libConstant.dll.a b/testsuite/resources/Modelica.Blocks.Sources.Constant/binaries/win64/libConstant.dll.a