Skip to content

Commit 3c02f6a

Browse files
adeas31OpenModelica-Hudson
adeas31
authored and
OpenModelica-Hudson
committed
Updated tests for getClassInformation output.
1 parent 25e9e2c commit 3c02f6a

File tree

7 files changed

+38
-29
lines changed

7 files changed

+38
-29
lines changed

‎openmodelica/interactive-API/Bug3417.mos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ getClassInformation(Modelica.Electrical);
1717
// ""
1818
// {Analog,Digital,Machines,MultiPhase,QuasiStationary,Spice3}
1919
// ""
20-
// ("package","Library of electrical models (analog, digital, machines, multi-phase)",false,false,false,"Modelica 3.2.1/Electrical/package.mo",false,2,1,46,15,{},false,false,"","")
20+
// ("package","Library of electrical models (analog, digital, machines, multi-phase)",false,false,false,"Modelica 3.2.1/Electrical/package.mo",false,2,1,46,15,{},false,false,"","",false)
2121
// true
2222
// {X,Analog,Digital,Machines,MultiPhase,QuasiStationary,Spice3}
2323
// ""
24-
// ("package","new Electrical package",false,false,false,"NEW_DUMMY_FILE",false,2,1,5,15,{},false,false,"","")
24+
// ("package","new Electrical package",false,false,false,"NEW_DUMMY_FILE",false,2,1,5,15,{},false,false,"","",false)
2525
// endResult

‎openmodelica/interactive-API/CopyClass.mos‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,43 +96,43 @@ getClassInformation(TestDirPkg.SubFilePkg.SDPAcopy);
9696
// true
9797
// ""
9898
// true
99-
// ("package","",false,false,false,"openmodelica/interactive-API/TestFilePkgcopy.mo",false,1,1,11,16,{},false,false,"","")
99+
// ("package","",false,false,false,"openmodelica/interactive-API/TestFilePkgcopy.mo",false,1,1,11,16,{},false,false,"","",false)
100100
// true
101-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkgcopy.mo",false,1,1,11,15,{},false,false,"","")
101+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkgcopy.mo",false,1,1,11,15,{},false,false,"","",false)
102102
// true
103-
// ("class","",false,false,false,"openmodelica/interactive-API/Acopy.mo",false,8,3,10,8,{},false,false,"","")
103+
// ("class","",false,false,false,"openmodelica/interactive-API/Acopy.mo",false,8,3,10,8,{},false,false,"","",false)
104104
// true
105-
// ("class","",false,false,false,"openmodelica/interactive-API/Bcopy.mo",false,7,3,10,8,{},false,false,"","")
105+
// ("class","",false,false,false,"openmodelica/interactive-API/Bcopy.mo",false,7,3,10,8,{},false,false,"","",false)
106106
// true
107-
// ("model","",false,false,false,"openmodelica/interactive-API/M1copy.mo",false,3,1,6,7,{},false,false,"","")
107+
// ("model","",false,false,false,"openmodelica/interactive-API/M1copy.mo",false,3,1,6,7,{},false,false,"","",false)
108108
// true
109-
// ("package","",false,false,false,"openmodelica/interactive-API/SubDirPkgcopy.mo",false,3,1,7,14,{},false,false,"","")
109+
// ("package","",false,false,false,"openmodelica/interactive-API/SubDirPkgcopy.mo",false,3,1,7,14,{},false,false,"","",false)
110110
// true
111-
// ("class","",false,false,false,"openmodelica/interactive-API/SFPAcopy.mo",false,4,3,6,11,{},false,false,"","")
111+
// ("class","",false,false,false,"openmodelica/interactive-API/SFPAcopy.mo",false,4,3,6,11,{},false,false,"","",false)
112112
// true
113-
// ("class","",false,false,false,"openmodelica/interactive-API/SDPAcopy.mo",false,4,3,6,11,{},false,false,"","")
113+
// ("class","",false,false,false,"openmodelica/interactive-API/SDPAcopy.mo",false,4,3,6,11,{},false,false,"","",false)
114114
// true
115-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,1,1,11,16,{},false,false,"","")
115+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,1,1,11,16,{},false,false,"","",false)
116116
// true
117-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,1,1,11,15,{},false,false,"","")
117+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,1,1,11,15,{},false,false,"","",false)
118118
// true
119-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,8,3,10,8,{},false,false,"","")
119+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,8,3,10,8,{},false,false,"","",false)
120120
// true
121-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,2,3,5,8,{},false,false,"","")
121+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,2,3,5,8,{},false,false,"","",false)
122122
// true
123-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,3,1,7,15,{},false,false,"","")
123+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,3,1,7,15,{},false,false,"","",false)
124124
// true
125-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,3,1,7,14,{},false,false,"","")
125+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/package.mo",false,3,1,7,14,{},false,false,"","",false)
126126
// true
127-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,3,1,7,15,{},false,false,"","")
127+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,3,1,7,15,{},false,false,"","",false)
128128
// true
129-
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,3,1,7,14,{},false,false,"","")
129+
// ("package","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,3,1,7,14,{},false,false,"","",false)
130130
// true
131-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,4,3,6,11,{},false,false,"","")
131+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,4,3,6,11,{},false,false,"","",false)
132132
// true
133-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,4,3,6,11,{},false,false,"","")
133+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,4,3,6,11,{},false,false,"","",false)
134134
// true
135-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,4,3,6,11,{},false,false,"","")
135+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubDirPkg/package.mo",false,4,3,6,11,{},false,false,"","",false)
136136
// true
137-
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,4,3,6,11,{},false,false,"","")
137+
// ("class","",false,false,false,"openmodelica/interactive-API/TestDirPkg/SubFilePkg.mo",false,4,3,6,11,{},false,false,"","",false)
138138
// endResult

‎openmodelica/interactive-API/interactive_api_attributes.mos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ list(A);
196196
// Evaluating: getErrorString()
197197
// ""
198198
// Evaluating: getClassInformation(A)
199-
// ("model","this is the class A",false,false,false,"",false,0,0,0,0,{},false,false,"","")
199+
// ("model","this is the class A",false,false,false,"",false,0,0,0,0,{},false,false,"","",false)
200200
// Evaluating: getErrorString()
201201
// ""
202202
// Evaluating: getComponents(A)
@@ -334,7 +334,7 @@ list(A);
334334
// Evaluating: getErrorString()
335335
// ""
336336
// Evaluating: getClassInformation(A)
337-
// ("model","this is the class A",false,false,false,"",false,0,0,0,0,{},false,false,"","")
337+
// ("model","this is the class A",false,false,false,"",false,0,0,0,0,{},false,false,"","",false)
338338
// Evaluating: getErrorString()
339339
// ""
340340
// Evaluating: getComponents(A)

‎openmodelica/interactive-API/interactive_api_calls.mo‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ model M1
4141
Modelica.Electrical.Analog.Basic.Resistor resistor1(phi(start = 1));
4242
end M1;
4343

44+
model state1
45+
annotation(__Dymola_state=true);
46+
end state1;
47+
4448

‎openmodelica/interactive-API/interactive_api_calls.mos‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ getExtendsModifierValue(vector3D, Real, start); getErrorString();
5454
getExtendsModifierValue(vector3D, Real, nominal); getErrorString();
5555
getClassComment(M); getErrorString();
5656
getComponentComment(M, r); getErrorString();
57+
getClassInformation(state1); getErrorString();
5758

5859
loadModel(Modelica,{"3.1"}); getErrorString();
5960
getAnnotationCount(Modelica.Electrical.Analog.Basic.Resistor); getErrorString();
@@ -262,7 +263,7 @@ getMessagesStringInternal(unique = false); // not unique
262263
// Evaluating: getDerivedClassModifierValue(Resistance, quantity)
263264
// "\"Resistance\""
264265
// Evaluating: getClassInformation(vector3D)
265-
// ("type","",false,false,false,"openmodelica/interactive-API/interactive_api_calls.mo",false,4,1,4,67,{"3"},false,false,"","")
266+
// ("type","",false,false,false,"openmodelica/interactive-API/interactive_api_calls.mo",false,4,1,4,67,{"3"},false,false,"","",false)
266267
// Evaluating: getErrorString()
267268
// ""
268269
// Evaluating: getInheritanceCount(vector3D)
@@ -307,6 +308,10 @@ getMessagesStringInternal(unique = false); // not unique
307308
// "A component comment"
308309
// Evaluating: getErrorString()
309310
// ""
311+
// Evaluating: getClassInformation(state1)
312+
// ("model","",false,false,false,"openmodelica/interactive-API/interactive_api_calls.mo",false,44,1,46,11,{},false,false,"","",true)
313+
// Evaluating: getErrorString()
314+
// ""
310315
// Evaluating: loadModel(Modelica, {"3.1"})
311316
// true
312317
// Evaluating: getErrorString()
@@ -603,7 +608,7 @@ getMessagesStringInternal(unique = false); // not unique
603608
// Evaluating: getErrorString()
604609
// ""
605610
// Evaluating: getClassInformation(Modelica.UsersGuide.Conventions.Documentation.Format.Code)
606-
// ("class","Code",false,false,false,"Modelica 3.2.1/package.mo",false,572,9,625,17,{},false,false,"","")
611+
// ("class","Code",false,false,false,"Modelica 3.2.1/package.mo",false,572,9,625,17,{},false,false,"","",false)
607612
// Evaluating: getErrorString()
608613
// ""
609614
// Evaluating: list(Modelica.UsersGuide.Conventions.Documentation.Format.Code)

‎openmodelica/interactive-API/loadFileInteractiveQualified.mos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ getElementsInfo(Something.Somewhere.BlaBla.Z);
3535
// Evaluating: loadFileInteractiveQualified("loadFileInteractiveQualified.mo")
3636
// {Something.Somewhere.Stuff,Something.Somewhere.Stuff2,Something.Somewhere.BlaBla}
3737
// Evaluating: getClassInformation(Something.Somewhere.Stuff)
38-
// ("class","Stuff Comment",false,false,false,"openmodelica/interactive-API/loadFileInteractiveQualified.mo",false,10,1,15,10,{},false,false,"","")
38+
// ("class","Stuff Comment",false,false,false,"openmodelica/interactive-API/loadFileInteractiveQualified.mo",false,10,1,15,10,{},false,false,"","",false)
3939
// Evaluating: getCrefInfo(Something)
4040
// {openmodelica/interactive-API/loadFileInteractiveQualifiedInit.mo,writable,8,1,14,14}
4141
// Evaluating: getElementsInfo(Something)

‎openmodelica/interactive-API/setSourceFileListFile.mos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ listFile(P1);
2020
// ""
2121
// true
2222
// true
23-
// ("package","",false,false,false,"P2",false,1,1,1,34,{},false,false,"","")
24-
// ("model","",false,false,false,"P2",false,1,12,1,26,{},false,false,"","")
23+
// ("package","",false,false,false,"P2",false,1,1,1,34,{},false,false,"","",false)
24+
// ("model","",false,false,false,"P2",false,1,12,1,26,{},false,false,"","",false)
2525
// "package P1
2626
// model M1
2727
// end M1;

0 commit comments

Comments
 (0)