From 6875667375f44e85eedd5a31e0662248c5fa3efb Mon Sep 17 00:00:00 2001 From: Joel Andersson Date: Tue, 21 Jun 2016 15:38:48 -0500 Subject: [PATCH] [MATLAB] Issue #67 Fixed unit tests --- Examples/test-suite/enum_thorough.i | 26 +++++++++---------- .../test-suite/matlab/abstract_access_runme.m | 2 -- .../matlab/abstract_typedef2_runme.m | 9 +------ .../matlab/abstract_typedef_runme.m | 10 +++---- .../matlab/abstract_virtual_runme.m | 8 ++---- .../test-suite/matlab/array_member_runme.m | 15 ++++------- 6 files changed, 24 insertions(+), 46 deletions(-) diff --git a/Examples/test-suite/enum_thorough.i b/Examples/test-suite/enum_thorough.i index 3ece5471bbf..e4624c097ca 100644 --- a/Examples/test-suite/enum_thorough.i +++ b/Examples/test-suite/enum_thorough.i @@ -97,33 +97,33 @@ const SpeedClass::speed & speedTest5(const SpeedClass::speed &s) { return s typedef enum { NamedAnon1, NamedAnon2 } namedanon; -namedanon namedanonTest1(namedanon e) { return e; } +namedanon namedanonTest1(namedanon e) { return e; } typedef enum twonamestag { TwoNames1, TwoNames2, TwoNames3 = 33 } twonames; -twonames twonamesTest1(twonames e) { return e; } -twonamestag twonamesTest2(twonamestag e) { return e; } -enum twonamestag twonamesTest3(enum twonamestag e) { return e; } +twonames twonamesTest1(twonames e) { return e; } +twonamestag twonamesTest2(twonamestag e) { return e; } +enum twonamestag twonamesTest3(enum twonamestag e) { return e; } struct TwoNamesStruct { typedef enum twonamestag { TwoNamesStruct1, TwoNamesStruct2 } twonames; - twonames twonamesTest1(twonames e) { return e; } - twonamestag twonamesTest2(twonamestag e) { return e; } - enum twonamestag twonamesTest3(enum twonamestag e) { return e; } + twonames twonamesTest1(twonames e) { return e; } + twonamestag twonamesTest2(twonamestag e) { return e; } + enum twonamestag twonamesTest3(enum twonamestag e) { return e; } }; namespace AnonSpace{ typedef enum { NamedAnonSpace1, NamedAnonSpace2 } namedanonspace; - namedanonspace namedanonspaceTest1(namedanonspace e) { return e; } - AnonSpace::namedanonspace namedanonspaceTest2(AnonSpace::namedanonspace e) { return e; } + namedanonspace namedanonspaceTest1(namedanonspace e) { return e; } + AnonSpace::namedanonspace namedanonspaceTest2(AnonSpace::namedanonspace e) { return e; } } -AnonSpace::namedanonspace namedanonspaceTest3(AnonSpace::namedanonspace e) { return e; } +AnonSpace::namedanonspace namedanonspaceTest3(AnonSpace::namedanonspace e) { return e; } using namespace AnonSpace; -namedanonspace namedanonspaceTest4(namedanonspace e) { return e; } +namedanonspace namedanonspaceTest4(namedanonspace e) { return e; } template struct TemplateClass { - enum scientists { einstein, galileo = 10 }; + enum scientists { einstein, galileo = 10 }; typedef enum scientists scientiststd1; typedef scientists scientiststd2; typedef scientiststd1 scientiststd3; @@ -160,7 +160,7 @@ const TemplateClass::scientiststd3 & scientistsTest8(const TemplateClass< namespace Name { template struct TClass { - enum scientists { faraday, bell = 20 }; + enum scientists { faraday, bell = 20 }; typedef enum scientists scientiststd1; typedef scientists scientiststd2; typedef scientiststd1 scientiststd3; diff --git a/Examples/test-suite/matlab/abstract_access_runme.m b/Examples/test-suite/matlab/abstract_access_runme.m index 7ced44f5497..41ecc025871 100644 --- a/Examples/test-suite/matlab/abstract_access_runme.m +++ b/Examples/test-suite/matlab/abstract_access_runme.m @@ -1,5 +1,3 @@ -import abstract_access.* - d = abstract_access.D(); if (d.do_x() ~= 1) error('FAILED!!') diff --git a/Examples/test-suite/matlab/abstract_typedef2_runme.m b/Examples/test-suite/matlab/abstract_typedef2_runme.m index b88fecd8836..9dd1452174f 100644 --- a/Examples/test-suite/matlab/abstract_typedef2_runme.m +++ b/Examples/test-suite/matlab/abstract_typedef2_runme.m @@ -1,8 +1 @@ -import abstract_typedef2.* - -a = A_UF(); - - - - - +a = abstract_typedef2.A_UF(); diff --git a/Examples/test-suite/matlab/abstract_typedef_runme.m b/Examples/test-suite/matlab/abstract_typedef_runme.m index ab9d2073178..29fb63130a8 100644 --- a/Examples/test-suite/matlab/abstract_typedef_runme.m +++ b/Examples/test-suite/matlab/abstract_typedef_runme.m @@ -1,12 +1,8 @@ -import abstract_typedef.* -e = Engine(); +e = abstract_typedef.Engine(); + +a = abstract_typedef.A(); -a = A(); - if (a.write(e) ~= 1) error('FAILED!!') end - - - diff --git a/Examples/test-suite/matlab/abstract_virtual_runme.m b/Examples/test-suite/matlab/abstract_virtual_runme.m index bda5ad4c942..71f0baeda8a 100644 --- a/Examples/test-suite/matlab/abstract_virtual_runme.m +++ b/Examples/test-suite/matlab/abstract_virtual_runme.m @@ -1,7 +1,3 @@ -import abstract_virtual.* - - -d = D(); - -e = E(); +d = abstract_virtual.D(); +e = abstract_virtual.E(); diff --git a/Examples/test-suite/matlab/array_member_runme.m b/Examples/test-suite/matlab/array_member_runme.m index 3fea69df816..999c286bb83 100644 --- a/Examples/test-suite/matlab/array_member_runme.m +++ b/Examples/test-suite/matlab/array_member_runme.m @@ -1,25 +1,20 @@ -import array_member.* - -f = Foo(); -f.data = global_data(); +f = array_member.Foo(); +f.data = array_member.global_data(); for i=0:7, - if (get_value(f.data,i) ~= get_value(global_data,i)) + if (array_member.get_value(f.data,i) ~= array_member.get_value(array_member.global_data,i)) error('Bad array assignment'); end end for i=0:7, - set_value(f.data,i,-i); + array_member.set_value(f.data,i,-i); end global_data = f.data; for i=0:7, - if (get_value(f.data,i) ~= get_value(global_data,i)) + if (array_member.get_value(f.data,i) ~= array_member.get_value(global_data,i)) error('Bad array assignment') end end - - -