From 7702d367e63bc629d45847dd05097865bcd37d37 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 28 Nov 2004 19:20:22 +0000 Subject: [PATCH] const enum SWIGTYPE & typemap tests more enum tests git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6786 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/csharp/enum_thorough_runme.cs | 13 +++++++++++++ .../test-suite/csharp/enum_thorough_simple_runme.cs | 13 +++++++++++++ .../csharp/enum_thorough_typesafe_runme.cs | 13 +++++++++++++ .../test-suite/java/enum_thorough_proper_runme.java | 13 +++++++++++++ Examples/test-suite/java/enum_thorough_runme.java | 13 +++++++++++++ .../test-suite/java/enum_thorough_simple_runme.java | 13 +++++++++++++ .../java/enum_thorough_typeunsafe_runme.java | 13 +++++++++++++ 7 files changed, 91 insertions(+) diff --git a/Examples/test-suite/csharp/enum_thorough_runme.cs b/Examples/test-suite/csharp/enum_thorough_runme.cs index 057301444..6822af5e2 100755 --- a/Examples/test-suite/csharp/enum_thorough_runme.cs +++ b/Examples/test-suite/csharp/enum_thorough_runme.cs @@ -27,11 +27,14 @@ public class runme { if (s.speedTest4(speed) != speed) throw new Exception("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new Exception("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new Exception("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new Exception("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new Exception("speedTest 8 failed"); if (enum_thorough.speedTest1(speed) != speed) throw new Exception("speedTest Global 1 failed"); if (enum_thorough.speedTest2(speed) != speed) throw new Exception("speedTest Global 2 failed"); if (enum_thorough.speedTest3(speed) != speed) throw new Exception("speedTest Global 3 failed"); if (enum_thorough.speedTest4(speed) != speed) throw new Exception("speedTest Global 4 failed"); + if (enum_thorough.speedTest5(speed) != speed) throw new Exception("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -90,6 +93,7 @@ public class runme { if (t.scientistsTestG(galileo) != galileo) throw new Exception("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new Exception("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new Exception("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new Exception("scientistsTest J failed"); if (enum_thorough.scientistsTest1(galileo) != galileo) throw new Exception("scientistsTest Global 1 failed"); if (enum_thorough.scientistsTest2(galileo) != galileo) throw new Exception("scientistsTest Global 2 failed"); @@ -98,6 +102,7 @@ public class runme { if (enum_thorough.scientistsTest5(galileo) != galileo) throw new Exception("scientistsTest Global 5 failed"); if (enum_thorough.scientistsTest6(galileo) != galileo) throw new Exception("scientistsTest Global 6 failed"); if (enum_thorough.scientistsTest7(galileo) != galileo) throw new Exception("scientistsTest Global 7 failed"); + if (enum_thorough.scientistsTest8(galileo) != galileo) throw new Exception("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -288,6 +293,8 @@ public class runme { if (enum_thorough.hairTest8(blonde) != blonde) throw new Exception("hairTest Global 8 failed"); if (enum_thorough.hairTest9(blonde) != blonde) throw new Exception("hairTest Global 9 failed"); if (enum_thorough.hairTestA(blonde) != blonde) throw new Exception("hairTest Global A failed"); + if (enum_thorough.hairTestB(blonde) != blonde) throw new Exception("hairTest Global B failed"); + if (enum_thorough.hairTestC(blonde) != blonde) throw new Exception("hairTest Global C failed"); if (enum_thorough.hairTestA1(blonde) != blonde) throw new Exception("hairTest Global A1 failed"); if (enum_thorough.hairTestA2(blonde) != blonde) throw new Exception("hairTest Global A2 failed"); @@ -299,6 +306,8 @@ public class runme { if (enum_thorough.hairTestA8(blonde) != blonde) throw new Exception("hairTest Global A8 failed"); if (enum_thorough.hairTestA9(blonde) != blonde) throw new Exception("hairTest Global A9 failed"); if (enum_thorough.hairTestAA(blonde) != blonde) throw new Exception("hairTest Global AA failed"); + if (enum_thorough.hairTestAB(blonde) != blonde) throw new Exception("hairTest Global AB failed"); + if (enum_thorough.hairTestAC(blonde) != blonde) throw new Exception("hairTest Global AC failed"); if (enum_thorough.hairTestB1(blonde) != blonde) throw new Exception("hairTest Global B1 failed"); if (enum_thorough.hairTestB2(blonde) != blonde) throw new Exception("hairTest Global B2 failed"); @@ -310,6 +319,8 @@ public class runme { if (enum_thorough.hairTestB8(blonde) != blonde) throw new Exception("hairTest Global B8 failed"); if (enum_thorough.hairTestB9(blonde) != blonde) throw new Exception("hairTest Global B9 failed"); if (enum_thorough.hairTestBA(blonde) != blonde) throw new Exception("hairTest Global BA failed"); + if (enum_thorough.hairTestBB(blonde) != blonde) throw new Exception("hairTest Global BB failed"); + if (enum_thorough.hairTestBC(blonde) != blonde) throw new Exception("hairTest Global BC failed"); if (enum_thorough.hairTestC1(blonde) != blonde) throw new Exception("hairTest Global C1 failed"); if (enum_thorough.hairTestC2(blonde) != blonde) throw new Exception("hairTest Global C2 failed"); @@ -321,6 +332,8 @@ public class runme { if (enum_thorough.hairTestC8(blonde) != blonde) throw new Exception("hairTest Global C8 failed"); if (enum_thorough.hairTestC9(blonde) != blonde) throw new Exception("hairTest Global C9 failed"); if (enum_thorough.hairTestCA(blonde) != blonde) throw new Exception("hairTest Global CA failed"); + if (enum_thorough.hairTestCB(blonde) != blonde) throw new Exception("hairTest Global CB failed"); + if (enum_thorough.hairTestCC(blonde) != blonde) throw new Exception("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/csharp/enum_thorough_simple_runme.cs b/Examples/test-suite/csharp/enum_thorough_simple_runme.cs index 1c7153553..ebdaa10ba 100644 --- a/Examples/test-suite/csharp/enum_thorough_simple_runme.cs +++ b/Examples/test-suite/csharp/enum_thorough_simple_runme.cs @@ -27,11 +27,14 @@ public class runme { if (s.speedTest4(speed) != speed) throw new Exception("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new Exception("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new Exception("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new Exception("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new Exception("speedTest 8 failed"); if (enum_thorough_simple.speedTest1(speed) != speed) throw new Exception("speedTest Global 1 failed"); if (enum_thorough_simple.speedTest2(speed) != speed) throw new Exception("speedTest Global 2 failed"); if (enum_thorough_simple.speedTest3(speed) != speed) throw new Exception("speedTest Global 3 failed"); if (enum_thorough_simple.speedTest4(speed) != speed) throw new Exception("speedTest Global 4 failed"); + if (enum_thorough_simple.speedTest5(speed) != speed) throw new Exception("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -90,6 +93,7 @@ public class runme { if (t.scientistsTestG(galileo) != galileo) throw new Exception("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new Exception("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new Exception("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new Exception("scientistsTest J failed"); if (enum_thorough_simple.scientistsTest1(galileo) != galileo) throw new Exception("scientistsTest Global 1 failed"); if (enum_thorough_simple.scientistsTest2(galileo) != galileo) throw new Exception("scientistsTest Global 2 failed"); @@ -98,6 +102,7 @@ public class runme { if (enum_thorough_simple.scientistsTest5(galileo) != galileo) throw new Exception("scientistsTest Global 5 failed"); if (enum_thorough_simple.scientistsTest6(galileo) != galileo) throw new Exception("scientistsTest Global 6 failed"); if (enum_thorough_simple.scientistsTest7(galileo) != galileo) throw new Exception("scientistsTest Global 7 failed"); + if (enum_thorough_simple.scientistsTest8(galileo) != galileo) throw new Exception("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -288,6 +293,8 @@ public class runme { if (enum_thorough_simple.hairTest8(blonde) != blonde) throw new Exception("hairTest Global 8 failed"); if (enum_thorough_simple.hairTest9(blonde) != blonde) throw new Exception("hairTest Global 9 failed"); if (enum_thorough_simple.hairTestA(blonde) != blonde) throw new Exception("hairTest Global A failed"); + if (enum_thorough_simple.hairTestB(blonde) != blonde) throw new Exception("hairTest Global B failed"); + if (enum_thorough_simple.hairTestC(blonde) != blonde) throw new Exception("hairTest Global C failed"); if (enum_thorough_simple.hairTestA1(blonde) != blonde) throw new Exception("hairTest Global A1 failed"); if (enum_thorough_simple.hairTestA2(blonde) != blonde) throw new Exception("hairTest Global A2 failed"); @@ -299,6 +306,8 @@ public class runme { if (enum_thorough_simple.hairTestA8(blonde) != blonde) throw new Exception("hairTest Global A8 failed"); if (enum_thorough_simple.hairTestA9(blonde) != blonde) throw new Exception("hairTest Global A9 failed"); if (enum_thorough_simple.hairTestAA(blonde) != blonde) throw new Exception("hairTest Global AA failed"); + if (enum_thorough_simple.hairTestAB(blonde) != blonde) throw new Exception("hairTest Global AB failed"); + if (enum_thorough_simple.hairTestAC(blonde) != blonde) throw new Exception("hairTest Global AC failed"); if (enum_thorough_simple.hairTestB1(blonde) != blonde) throw new Exception("hairTest Global B1 failed"); if (enum_thorough_simple.hairTestB2(blonde) != blonde) throw new Exception("hairTest Global B2 failed"); @@ -310,6 +319,8 @@ public class runme { if (enum_thorough_simple.hairTestB8(blonde) != blonde) throw new Exception("hairTest Global B8 failed"); if (enum_thorough_simple.hairTestB9(blonde) != blonde) throw new Exception("hairTest Global B9 failed"); if (enum_thorough_simple.hairTestBA(blonde) != blonde) throw new Exception("hairTest Global BA failed"); + if (enum_thorough_simple.hairTestBB(blonde) != blonde) throw new Exception("hairTest Global BB failed"); + if (enum_thorough_simple.hairTestBC(blonde) != blonde) throw new Exception("hairTest Global BC failed"); if (enum_thorough_simple.hairTestC1(blonde) != blonde) throw new Exception("hairTest Global C1 failed"); if (enum_thorough_simple.hairTestC2(blonde) != blonde) throw new Exception("hairTest Global C2 failed"); @@ -321,6 +332,8 @@ public class runme { if (enum_thorough_simple.hairTestC8(blonde) != blonde) throw new Exception("hairTest Global C8 failed"); if (enum_thorough_simple.hairTestC9(blonde) != blonde) throw new Exception("hairTest Global C9 failed"); if (enum_thorough_simple.hairTestCA(blonde) != blonde) throw new Exception("hairTest Global CA failed"); + if (enum_thorough_simple.hairTestCB(blonde) != blonde) throw new Exception("hairTest Global CB failed"); + if (enum_thorough_simple.hairTestCC(blonde) != blonde) throw new Exception("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs b/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs index 9a19ce44c..aba4b6631 100644 --- a/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs +++ b/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs @@ -27,11 +27,14 @@ public class runme { if (s.speedTest4(speed) != speed) throw new Exception("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new Exception("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new Exception("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new Exception("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new Exception("speedTest 8 failed"); if (enum_thorough_typesafe.speedTest1(speed) != speed) throw new Exception("speedTest Global 1 failed"); if (enum_thorough_typesafe.speedTest2(speed) != speed) throw new Exception("speedTest Global 2 failed"); if (enum_thorough_typesafe.speedTest3(speed) != speed) throw new Exception("speedTest Global 3 failed"); if (enum_thorough_typesafe.speedTest4(speed) != speed) throw new Exception("speedTest Global 4 failed"); + if (enum_thorough_typesafe.speedTest5(speed) != speed) throw new Exception("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -90,6 +93,7 @@ public class runme { if (t.scientistsTestG(galileo) != galileo) throw new Exception("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new Exception("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new Exception("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new Exception("scientistsTest J failed"); if (enum_thorough_typesafe.scientistsTest1(galileo) != galileo) throw new Exception("scientistsTest Global 1 failed"); if (enum_thorough_typesafe.scientistsTest2(galileo) != galileo) throw new Exception("scientistsTest Global 2 failed"); @@ -98,6 +102,7 @@ public class runme { if (enum_thorough_typesafe.scientistsTest5(galileo) != galileo) throw new Exception("scientistsTest Global 5 failed"); if (enum_thorough_typesafe.scientistsTest6(galileo) != galileo) throw new Exception("scientistsTest Global 6 failed"); if (enum_thorough_typesafe.scientistsTest7(galileo) != galileo) throw new Exception("scientistsTest Global 7 failed"); + if (enum_thorough_typesafe.scientistsTest8(galileo) != galileo) throw new Exception("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -288,6 +293,8 @@ public class runme { if (enum_thorough_typesafe.hairTest8(blonde) != blonde) throw new Exception("hairTest Global 8 failed"); if (enum_thorough_typesafe.hairTest9(blonde) != blonde) throw new Exception("hairTest Global 9 failed"); if (enum_thorough_typesafe.hairTestA(blonde) != blonde) throw new Exception("hairTest Global A failed"); + if (enum_thorough_typesafe.hairTestB(blonde) != blonde) throw new Exception("hairTest Global B failed"); + if (enum_thorough_typesafe.hairTestC(blonde) != blonde) throw new Exception("hairTest Global C failed"); if (enum_thorough_typesafe.hairTestA1(blonde) != blonde) throw new Exception("hairTest Global A1 failed"); if (enum_thorough_typesafe.hairTestA2(blonde) != blonde) throw new Exception("hairTest Global A2 failed"); @@ -299,6 +306,8 @@ public class runme { if (enum_thorough_typesafe.hairTestA8(blonde) != blonde) throw new Exception("hairTest Global A8 failed"); if (enum_thorough_typesafe.hairTestA9(blonde) != blonde) throw new Exception("hairTest Global A9 failed"); if (enum_thorough_typesafe.hairTestAA(blonde) != blonde) throw new Exception("hairTest Global AA failed"); + if (enum_thorough_typesafe.hairTestAB(blonde) != blonde) throw new Exception("hairTest Global AB failed"); + if (enum_thorough_typesafe.hairTestAC(blonde) != blonde) throw new Exception("hairTest Global AC failed"); if (enum_thorough_typesafe.hairTestB1(blonde) != blonde) throw new Exception("hairTest Global B1 failed"); if (enum_thorough_typesafe.hairTestB2(blonde) != blonde) throw new Exception("hairTest Global B2 failed"); @@ -310,6 +319,8 @@ public class runme { if (enum_thorough_typesafe.hairTestB8(blonde) != blonde) throw new Exception("hairTest Global B8 failed"); if (enum_thorough_typesafe.hairTestB9(blonde) != blonde) throw new Exception("hairTest Global B9 failed"); if (enum_thorough_typesafe.hairTestBA(blonde) != blonde) throw new Exception("hairTest Global BA failed"); + if (enum_thorough_typesafe.hairTestBB(blonde) != blonde) throw new Exception("hairTest Global BB failed"); + if (enum_thorough_typesafe.hairTestBC(blonde) != blonde) throw new Exception("hairTest Global BC failed"); if (enum_thorough_typesafe.hairTestC1(blonde) != blonde) throw new Exception("hairTest Global C1 failed"); if (enum_thorough_typesafe.hairTestC2(blonde) != blonde) throw new Exception("hairTest Global C2 failed"); @@ -321,6 +332,8 @@ public class runme { if (enum_thorough_typesafe.hairTestC8(blonde) != blonde) throw new Exception("hairTest Global C8 failed"); if (enum_thorough_typesafe.hairTestC9(blonde) != blonde) throw new Exception("hairTest Global C9 failed"); if (enum_thorough_typesafe.hairTestCA(blonde) != blonde) throw new Exception("hairTest Global CA failed"); + if (enum_thorough_typesafe.hairTestCB(blonde) != blonde) throw new Exception("hairTest Global CB failed"); + if (enum_thorough_typesafe.hairTestCC(blonde) != blonde) throw new Exception("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/java/enum_thorough_proper_runme.java b/Examples/test-suite/java/enum_thorough_proper_runme.java index bfc6a7340..28431f21d 100644 --- a/Examples/test-suite/java/enum_thorough_proper_runme.java +++ b/Examples/test-suite/java/enum_thorough_proper_runme.java @@ -38,11 +38,14 @@ public class enum_thorough_proper_runme { if (s.speedTest4(speed) != speed) throw new RuntimeException("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new RuntimeException("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new RuntimeException("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new RuntimeException("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new RuntimeException("speedTest 8 failed"); if (enum_thorough_proper.speedTest1(speed) != speed) throw new RuntimeException("speedTest Global 1 failed"); if (enum_thorough_proper.speedTest2(speed) != speed) throw new RuntimeException("speedTest Global 2 failed"); if (enum_thorough_proper.speedTest3(speed) != speed) throw new RuntimeException("speedTest Global 3 failed"); if (enum_thorough_proper.speedTest4(speed) != speed) throw new RuntimeException("speedTest Global 4 failed"); + if (enum_thorough_proper.speedTest5(speed) != speed) throw new RuntimeException("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -101,6 +104,7 @@ public class enum_thorough_proper_runme { if (t.scientistsTestG(galileo) != galileo) throw new RuntimeException("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new RuntimeException("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new RuntimeException("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new RuntimeException("scientistsTest J failed"); if (enum_thorough_proper.scientistsTest1(galileo) != galileo) throw new RuntimeException("scientistsTest Global 1 failed"); if (enum_thorough_proper.scientistsTest2(galileo) != galileo) throw new RuntimeException("scientistsTest Global 2 failed"); @@ -109,6 +113,7 @@ public class enum_thorough_proper_runme { if (enum_thorough_proper.scientistsTest5(galileo) != galileo) throw new RuntimeException("scientistsTest Global 5 failed"); if (enum_thorough_proper.scientistsTest6(galileo) != galileo) throw new RuntimeException("scientistsTest Global 6 failed"); if (enum_thorough_proper.scientistsTest7(galileo) != galileo) throw new RuntimeException("scientistsTest Global 7 failed"); + if (enum_thorough_proper.scientistsTest8(galileo) != galileo) throw new RuntimeException("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -299,6 +304,8 @@ public class enum_thorough_proper_runme { if (enum_thorough_proper.hairTest8(blonde) != blonde) throw new RuntimeException("hairTest Global 8 failed"); if (enum_thorough_proper.hairTest9(blonde) != blonde) throw new RuntimeException("hairTest Global 9 failed"); if (enum_thorough_proper.hairTestA(blonde) != blonde) throw new RuntimeException("hairTest Global A failed"); + if (enum_thorough_proper.hairTestB(blonde) != blonde) throw new RuntimeException("hairTest Global B failed"); + if (enum_thorough_proper.hairTestC(blonde) != blonde) throw new RuntimeException("hairTest Global C failed"); if (enum_thorough_proper.hairTestA1(blonde) != blonde) throw new RuntimeException("hairTest Global A1 failed"); if (enum_thorough_proper.hairTestA2(blonde) != blonde) throw new RuntimeException("hairTest Global A2 failed"); @@ -310,6 +317,8 @@ public class enum_thorough_proper_runme { if (enum_thorough_proper.hairTestA8(blonde) != blonde) throw new RuntimeException("hairTest Global A8 failed"); if (enum_thorough_proper.hairTestA9(blonde) != blonde) throw new RuntimeException("hairTest Global A9 failed"); if (enum_thorough_proper.hairTestAA(blonde) != blonde) throw new RuntimeException("hairTest Global AA failed"); + if (enum_thorough_proper.hairTestAB(blonde) != blonde) throw new RuntimeException("hairTest Global AB failed"); + if (enum_thorough_proper.hairTestAC(blonde) != blonde) throw new RuntimeException("hairTest Global AC failed"); if (enum_thorough_proper.hairTestB1(blonde) != blonde) throw new RuntimeException("hairTest Global B1 failed"); if (enum_thorough_proper.hairTestB2(blonde) != blonde) throw new RuntimeException("hairTest Global B2 failed"); @@ -321,6 +330,8 @@ public class enum_thorough_proper_runme { if (enum_thorough_proper.hairTestB8(blonde) != blonde) throw new RuntimeException("hairTest Global B8 failed"); if (enum_thorough_proper.hairTestB9(blonde) != blonde) throw new RuntimeException("hairTest Global B9 failed"); if (enum_thorough_proper.hairTestBA(blonde) != blonde) throw new RuntimeException("hairTest Global BA failed"); + if (enum_thorough_proper.hairTestBB(blonde) != blonde) throw new RuntimeException("hairTest Global BB failed"); + if (enum_thorough_proper.hairTestBC(blonde) != blonde) throw new RuntimeException("hairTest Global BC failed"); if (enum_thorough_proper.hairTestC1(blonde) != blonde) throw new RuntimeException("hairTest Global C1 failed"); if (enum_thorough_proper.hairTestC2(blonde) != blonde) throw new RuntimeException("hairTest Global C2 failed"); @@ -332,6 +343,8 @@ public class enum_thorough_proper_runme { if (enum_thorough_proper.hairTestC8(blonde) != blonde) throw new RuntimeException("hairTest Global C8 failed"); if (enum_thorough_proper.hairTestC9(blonde) != blonde) throw new RuntimeException("hairTest Global C9 failed"); if (enum_thorough_proper.hairTestCA(blonde) != blonde) throw new RuntimeException("hairTest Global CA failed"); + if (enum_thorough_proper.hairTestCB(blonde) != blonde) throw new RuntimeException("hairTest Global CB failed"); + if (enum_thorough_proper.hairTestCC(blonde) != blonde) throw new RuntimeException("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/java/enum_thorough_runme.java b/Examples/test-suite/java/enum_thorough_runme.java index e0f48c696..bf4ecd367 100644 --- a/Examples/test-suite/java/enum_thorough_runme.java +++ b/Examples/test-suite/java/enum_thorough_runme.java @@ -38,11 +38,14 @@ public class enum_thorough_runme { if (s.speedTest4(speed) != speed) throw new RuntimeException("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new RuntimeException("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new RuntimeException("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new RuntimeException("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new RuntimeException("speedTest 8 failed"); if (enum_thorough.speedTest1(speed) != speed) throw new RuntimeException("speedTest Global 1 failed"); if (enum_thorough.speedTest2(speed) != speed) throw new RuntimeException("speedTest Global 2 failed"); if (enum_thorough.speedTest3(speed) != speed) throw new RuntimeException("speedTest Global 3 failed"); if (enum_thorough.speedTest4(speed) != speed) throw new RuntimeException("speedTest Global 4 failed"); + if (enum_thorough.speedTest5(speed) != speed) throw new RuntimeException("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -101,6 +104,7 @@ public class enum_thorough_runme { if (t.scientistsTestG(galileo) != galileo) throw new RuntimeException("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new RuntimeException("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new RuntimeException("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new RuntimeException("scientistsTest J failed"); if (enum_thorough.scientistsTest1(galileo) != galileo) throw new RuntimeException("scientistsTest Global 1 failed"); if (enum_thorough.scientistsTest2(galileo) != galileo) throw new RuntimeException("scientistsTest Global 2 failed"); @@ -109,6 +113,7 @@ public class enum_thorough_runme { if (enum_thorough.scientistsTest5(galileo) != galileo) throw new RuntimeException("scientistsTest Global 5 failed"); if (enum_thorough.scientistsTest6(galileo) != galileo) throw new RuntimeException("scientistsTest Global 6 failed"); if (enum_thorough.scientistsTest7(galileo) != galileo) throw new RuntimeException("scientistsTest Global 7 failed"); + if (enum_thorough.scientistsTest8(galileo) != galileo) throw new RuntimeException("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -299,6 +304,8 @@ public class enum_thorough_runme { if (enum_thorough.hairTest8(blonde) != blonde) throw new RuntimeException("hairTest Global 8 failed"); if (enum_thorough.hairTest9(blonde) != blonde) throw new RuntimeException("hairTest Global 9 failed"); if (enum_thorough.hairTestA(blonde) != blonde) throw new RuntimeException("hairTest Global A failed"); + if (enum_thorough.hairTestB(blonde) != blonde) throw new RuntimeException("hairTest Global B failed"); + if (enum_thorough.hairTestC(blonde) != blonde) throw new RuntimeException("hairTest Global C failed"); if (enum_thorough.hairTestA1(blonde) != blonde) throw new RuntimeException("hairTest Global A1 failed"); if (enum_thorough.hairTestA2(blonde) != blonde) throw new RuntimeException("hairTest Global A2 failed"); @@ -310,6 +317,8 @@ public class enum_thorough_runme { if (enum_thorough.hairTestA8(blonde) != blonde) throw new RuntimeException("hairTest Global A8 failed"); if (enum_thorough.hairTestA9(blonde) != blonde) throw new RuntimeException("hairTest Global A9 failed"); if (enum_thorough.hairTestAA(blonde) != blonde) throw new RuntimeException("hairTest Global AA failed"); + if (enum_thorough.hairTestAB(blonde) != blonde) throw new RuntimeException("hairTest Global AB failed"); + if (enum_thorough.hairTestAC(blonde) != blonde) throw new RuntimeException("hairTest Global AC failed"); if (enum_thorough.hairTestB1(blonde) != blonde) throw new RuntimeException("hairTest Global B1 failed"); if (enum_thorough.hairTestB2(blonde) != blonde) throw new RuntimeException("hairTest Global B2 failed"); @@ -321,6 +330,8 @@ public class enum_thorough_runme { if (enum_thorough.hairTestB8(blonde) != blonde) throw new RuntimeException("hairTest Global B8 failed"); if (enum_thorough.hairTestB9(blonde) != blonde) throw new RuntimeException("hairTest Global B9 failed"); if (enum_thorough.hairTestBA(blonde) != blonde) throw new RuntimeException("hairTest Global BA failed"); + if (enum_thorough.hairTestBB(blonde) != blonde) throw new RuntimeException("hairTest Global BB failed"); + if (enum_thorough.hairTestBC(blonde) != blonde) throw new RuntimeException("hairTest Global BC failed"); if (enum_thorough.hairTestC1(blonde) != blonde) throw new RuntimeException("hairTest Global C1 failed"); if (enum_thorough.hairTestC2(blonde) != blonde) throw new RuntimeException("hairTest Global C2 failed"); @@ -332,6 +343,8 @@ public class enum_thorough_runme { if (enum_thorough.hairTestC8(blonde) != blonde) throw new RuntimeException("hairTest Global C8 failed"); if (enum_thorough.hairTestC9(blonde) != blonde) throw new RuntimeException("hairTest Global C9 failed"); if (enum_thorough.hairTestCA(blonde) != blonde) throw new RuntimeException("hairTest Global CA failed"); + if (enum_thorough.hairTestCB(blonde) != blonde) throw new RuntimeException("hairTest Global CB failed"); + if (enum_thorough.hairTestCC(blonde) != blonde) throw new RuntimeException("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/java/enum_thorough_simple_runme.java b/Examples/test-suite/java/enum_thorough_simple_runme.java index 2cee5bfe7..d4c26207d 100644 --- a/Examples/test-suite/java/enum_thorough_simple_runme.java +++ b/Examples/test-suite/java/enum_thorough_simple_runme.java @@ -38,11 +38,14 @@ public class enum_thorough_simple_runme { if (s.speedTest4(speed) != speed) throw new RuntimeException("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new RuntimeException("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new RuntimeException("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new RuntimeException("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new RuntimeException("speedTest 8 failed"); if (enum_thorough_simple.speedTest1(speed) != speed) throw new RuntimeException("speedTest Global 1 failed"); if (enum_thorough_simple.speedTest2(speed) != speed) throw new RuntimeException("speedTest Global 2 failed"); if (enum_thorough_simple.speedTest3(speed) != speed) throw new RuntimeException("speedTest Global 3 failed"); if (enum_thorough_simple.speedTest4(speed) != speed) throw new RuntimeException("speedTest Global 4 failed"); + if (enum_thorough_simple.speedTest5(speed) != speed) throw new RuntimeException("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -101,6 +104,7 @@ public class enum_thorough_simple_runme { if (t.scientistsTestG(galileo) != galileo) throw new RuntimeException("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new RuntimeException("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new RuntimeException("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new RuntimeException("scientistsTest J failed"); if (enum_thorough_simple.scientistsTest1(galileo) != galileo) throw new RuntimeException("scientistsTest Global 1 failed"); if (enum_thorough_simple.scientistsTest2(galileo) != galileo) throw new RuntimeException("scientistsTest Global 2 failed"); @@ -109,6 +113,7 @@ public class enum_thorough_simple_runme { if (enum_thorough_simple.scientistsTest5(galileo) != galileo) throw new RuntimeException("scientistsTest Global 5 failed"); if (enum_thorough_simple.scientistsTest6(galileo) != galileo) throw new RuntimeException("scientistsTest Global 6 failed"); if (enum_thorough_simple.scientistsTest7(galileo) != galileo) throw new RuntimeException("scientistsTest Global 7 failed"); + if (enum_thorough_simple.scientistsTest8(galileo) != galileo) throw new RuntimeException("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -299,6 +304,8 @@ public class enum_thorough_simple_runme { if (enum_thorough_simple.hairTest8(blonde) != blonde) throw new RuntimeException("hairTest Global 8 failed"); if (enum_thorough_simple.hairTest9(blonde) != blonde) throw new RuntimeException("hairTest Global 9 failed"); if (enum_thorough_simple.hairTestA(blonde) != blonde) throw new RuntimeException("hairTest Global A failed"); + if (enum_thorough_simple.hairTestB(blonde) != blonde) throw new RuntimeException("hairTest Global B failed"); + if (enum_thorough_simple.hairTestC(blonde) != blonde) throw new RuntimeException("hairTest Global C failed"); if (enum_thorough_simple.hairTestA1(blonde) != blonde) throw new RuntimeException("hairTest Global A1 failed"); if (enum_thorough_simple.hairTestA2(blonde) != blonde) throw new RuntimeException("hairTest Global A2 failed"); @@ -310,6 +317,8 @@ public class enum_thorough_simple_runme { if (enum_thorough_simple.hairTestA8(blonde) != blonde) throw new RuntimeException("hairTest Global A8 failed"); if (enum_thorough_simple.hairTestA9(blonde) != blonde) throw new RuntimeException("hairTest Global A9 failed"); if (enum_thorough_simple.hairTestAA(blonde) != blonde) throw new RuntimeException("hairTest Global AA failed"); + if (enum_thorough_simple.hairTestAB(blonde) != blonde) throw new RuntimeException("hairTest Global AB failed"); + if (enum_thorough_simple.hairTestAC(blonde) != blonde) throw new RuntimeException("hairTest Global AC failed"); if (enum_thorough_simple.hairTestB1(blonde) != blonde) throw new RuntimeException("hairTest Global B1 failed"); if (enum_thorough_simple.hairTestB2(blonde) != blonde) throw new RuntimeException("hairTest Global B2 failed"); @@ -321,6 +330,8 @@ public class enum_thorough_simple_runme { if (enum_thorough_simple.hairTestB8(blonde) != blonde) throw new RuntimeException("hairTest Global B8 failed"); if (enum_thorough_simple.hairTestB9(blonde) != blonde) throw new RuntimeException("hairTest Global B9 failed"); if (enum_thorough_simple.hairTestBA(blonde) != blonde) throw new RuntimeException("hairTest Global BA failed"); + if (enum_thorough_simple.hairTestBB(blonde) != blonde) throw new RuntimeException("hairTest Global BB failed"); + if (enum_thorough_simple.hairTestBC(blonde) != blonde) throw new RuntimeException("hairTest Global BC failed"); if (enum_thorough_simple.hairTestC1(blonde) != blonde) throw new RuntimeException("hairTest Global C1 failed"); if (enum_thorough_simple.hairTestC2(blonde) != blonde) throw new RuntimeException("hairTest Global C2 failed"); @@ -332,6 +343,8 @@ public class enum_thorough_simple_runme { if (enum_thorough_simple.hairTestC8(blonde) != blonde) throw new RuntimeException("hairTest Global C8 failed"); if (enum_thorough_simple.hairTestC9(blonde) != blonde) throw new RuntimeException("hairTest Global C9 failed"); if (enum_thorough_simple.hairTestCA(blonde) != blonde) throw new RuntimeException("hairTest Global CA failed"); + if (enum_thorough_simple.hairTestCB(blonde) != blonde) throw new RuntimeException("hairTest Global CB failed"); + if (enum_thorough_simple.hairTestCC(blonde) != blonde) throw new RuntimeException("hairTest Global CC failed"); } { FirStruct f = new FirStruct(); diff --git a/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java b/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java index 6c7c8dd8d..3eb54b416 100644 --- a/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java +++ b/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java @@ -38,11 +38,14 @@ public class enum_thorough_typeunsafe_runme { if (s.speedTest4(speed) != speed) throw new RuntimeException("speedTest 4 failed"); if (s.speedTest5(speed) != speed) throw new RuntimeException("speedTest 5 failed"); if (s.speedTest6(speed) != speed) throw new RuntimeException("speedTest 6 failed"); + if (s.speedTest7(speed) != speed) throw new RuntimeException("speedTest 7 failed"); + if (s.speedTest8(speed) != speed) throw new RuntimeException("speedTest 8 failed"); if (enum_thorough_typeunsafe.speedTest1(speed) != speed) throw new RuntimeException("speedTest Global 1 failed"); if (enum_thorough_typeunsafe.speedTest2(speed) != speed) throw new RuntimeException("speedTest Global 2 failed"); if (enum_thorough_typeunsafe.speedTest3(speed) != speed) throw new RuntimeException("speedTest Global 3 failed"); if (enum_thorough_typeunsafe.speedTest4(speed) != speed) throw new RuntimeException("speedTest Global 4 failed"); + if (enum_thorough_typeunsafe.speedTest5(speed) != speed) throw new RuntimeException("speedTest Global 5 failed"); } { SpeedClass s = new SpeedClass(); @@ -101,6 +104,7 @@ public class enum_thorough_typeunsafe_runme { if (t.scientistsTestG(galileo) != galileo) throw new RuntimeException("scientistsTest G failed"); if (t.scientistsTestH(galileo) != galileo) throw new RuntimeException("scientistsTest H failed"); if (t.scientistsTestI(galileo) != galileo) throw new RuntimeException("scientistsTest I failed"); + if (t.scientistsTestJ(galileo) != galileo) throw new RuntimeException("scientistsTest J failed"); if (enum_thorough_typeunsafe.scientistsTest1(galileo) != galileo) throw new RuntimeException("scientistsTest Global 1 failed"); if (enum_thorough_typeunsafe.scientistsTest2(galileo) != galileo) throw new RuntimeException("scientistsTest Global 2 failed"); @@ -109,6 +113,7 @@ public class enum_thorough_typeunsafe_runme { if (enum_thorough_typeunsafe.scientistsTest5(galileo) != galileo) throw new RuntimeException("scientistsTest Global 5 failed"); if (enum_thorough_typeunsafe.scientistsTest6(galileo) != galileo) throw new RuntimeException("scientistsTest Global 6 failed"); if (enum_thorough_typeunsafe.scientistsTest7(galileo) != galileo) throw new RuntimeException("scientistsTest Global 7 failed"); + if (enum_thorough_typeunsafe.scientistsTest8(galileo) != galileo) throw new RuntimeException("scientistsTest Global 8 failed"); } { TClassInt t = new TClassInt(); @@ -299,6 +304,8 @@ public class enum_thorough_typeunsafe_runme { if (enum_thorough_typeunsafe.hairTest8(blonde) != blonde) throw new RuntimeException("hairTest Global 8 failed"); if (enum_thorough_typeunsafe.hairTest9(blonde) != blonde) throw new RuntimeException("hairTest Global 9 failed"); if (enum_thorough_typeunsafe.hairTestA(blonde) != blonde) throw new RuntimeException("hairTest Global A failed"); + if (enum_thorough_typeunsafe.hairTestB(blonde) != blonde) throw new RuntimeException("hairTest Global B failed"); + if (enum_thorough_typeunsafe.hairTestC(blonde) != blonde) throw new RuntimeException("hairTest Global C failed"); if (enum_thorough_typeunsafe.hairTestA1(blonde) != blonde) throw new RuntimeException("hairTest Global A1 failed"); if (enum_thorough_typeunsafe.hairTestA2(blonde) != blonde) throw new RuntimeException("hairTest Global A2 failed"); @@ -310,6 +317,8 @@ public class enum_thorough_typeunsafe_runme { if (enum_thorough_typeunsafe.hairTestA8(blonde) != blonde) throw new RuntimeException("hairTest Global A8 failed"); if (enum_thorough_typeunsafe.hairTestA9(blonde) != blonde) throw new RuntimeException("hairTest Global A9 failed"); if (enum_thorough_typeunsafe.hairTestAA(blonde) != blonde) throw new RuntimeException("hairTest Global AA failed"); + if (enum_thorough_typeunsafe.hairTestAB(blonde) != blonde) throw new RuntimeException("hairTest Global AB failed"); + if (enum_thorough_typeunsafe.hairTestAC(blonde) != blonde) throw new RuntimeException("hairTest Global AC failed"); if (enum_thorough_typeunsafe.hairTestB1(blonde) != blonde) throw new RuntimeException("hairTest Global B1 failed"); if (enum_thorough_typeunsafe.hairTestB2(blonde) != blonde) throw new RuntimeException("hairTest Global B2 failed"); @@ -321,6 +330,8 @@ public class enum_thorough_typeunsafe_runme { if (enum_thorough_typeunsafe.hairTestB8(blonde) != blonde) throw new RuntimeException("hairTest Global B8 failed"); if (enum_thorough_typeunsafe.hairTestB9(blonde) != blonde) throw new RuntimeException("hairTest Global B9 failed"); if (enum_thorough_typeunsafe.hairTestBA(blonde) != blonde) throw new RuntimeException("hairTest Global BA failed"); + if (enum_thorough_typeunsafe.hairTestBB(blonde) != blonde) throw new RuntimeException("hairTest Global BB failed"); + if (enum_thorough_typeunsafe.hairTestBC(blonde) != blonde) throw new RuntimeException("hairTest Global BC failed"); if (enum_thorough_typeunsafe.hairTestC1(blonde) != blonde) throw new RuntimeException("hairTest Global C1 failed"); if (enum_thorough_typeunsafe.hairTestC2(blonde) != blonde) throw new RuntimeException("hairTest Global C2 failed"); @@ -332,6 +343,8 @@ public class enum_thorough_typeunsafe_runme { if (enum_thorough_typeunsafe.hairTestC8(blonde) != blonde) throw new RuntimeException("hairTest Global C8 failed"); if (enum_thorough_typeunsafe.hairTestC9(blonde) != blonde) throw new RuntimeException("hairTest Global C9 failed"); if (enum_thorough_typeunsafe.hairTestCA(blonde) != blonde) throw new RuntimeException("hairTest Global CA failed"); + if (enum_thorough_typeunsafe.hairTestCB(blonde) != blonde) throw new RuntimeException("hairTest Global CB failed"); + if (enum_thorough_typeunsafe.hairTestCC(blonde) != blonde) throw new RuntimeException("hairTest Global CC failed"); } { FirStruct f = new FirStruct();