From: William F. <wsf...@us...> - 2004-11-28 19:19:51
|
Update of /cvsroot/swig/SWIG/Examples/test-suite/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4420/Examples/test-suite/java Modified Files: enum_thorough_proper_runme.java enum_thorough_runme.java enum_thorough_simple_runme.java enum_thorough_typeunsafe_runme.java Log Message: const enum SWIGTYPE & typemap tests more enum tests Index: enum_thorough_typeunsafe_runme.java =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** enum_thorough_typeunsafe_runme.java 24 May 2004 19:58:10 -0000 1.1 --- enum_thorough_typeunsafe_runme.java 28 Nov 2004 19:19:41 -0000 1.2 *************** *** 39,42 **** --- 39,44 ---- 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"); *************** *** 44,47 **** --- 46,50 ---- 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"); } { *************** *** 102,105 **** --- 105,109 ---- 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"); *************** *** 110,113 **** --- 114,118 ---- 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"); } { *************** *** 300,303 **** --- 305,310 ---- 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"); *************** *** 311,314 **** --- 318,323 ---- 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"); *************** *** 322,325 **** --- 331,336 ---- 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"); *************** *** 333,336 **** --- 344,349 ---- 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"); } { Index: enum_thorough_runme.java =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/test-suite/java/enum_thorough_runme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** enum_thorough_runme.java 24 May 2004 19:58:10 -0000 1.1 --- enum_thorough_runme.java 28 Nov 2004 19:19:41 -0000 1.2 *************** *** 39,42 **** --- 39,44 ---- 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"); *************** *** 44,47 **** --- 46,50 ---- 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"); } { *************** *** 102,105 **** --- 105,109 ---- 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"); *************** *** 110,113 **** --- 114,118 ---- 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"); } { *************** *** 300,303 **** --- 305,310 ---- 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"); *************** *** 311,314 **** --- 318,323 ---- 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"); *************** *** 322,325 **** --- 331,336 ---- 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"); *************** *** 333,336 **** --- 344,349 ---- 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"); } { Index: enum_thorough_simple_runme.java =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/test-suite/java/enum_thorough_simple_runme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** enum_thorough_simple_runme.java 24 May 2004 19:58:10 -0000 1.1 --- enum_thorough_simple_runme.java 28 Nov 2004 19:19:41 -0000 1.2 *************** *** 39,42 **** --- 39,44 ---- 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"); *************** *** 44,47 **** --- 46,50 ---- 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"); } { *************** *** 102,105 **** --- 105,109 ---- 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"); *************** *** 110,113 **** --- 114,118 ---- 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"); } { *************** *** 300,303 **** --- 305,310 ---- 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"); *************** *** 311,314 **** --- 318,323 ---- 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"); *************** *** 322,325 **** --- 331,336 ---- 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"); *************** *** 333,336 **** --- 344,349 ---- 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"); } { Index: enum_thorough_proper_runme.java =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/test-suite/java/enum_thorough_proper_runme.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** enum_thorough_proper_runme.java 15 Jun 2004 19:51:18 -0000 1.1 --- enum_thorough_proper_runme.java 28 Nov 2004 19:19:41 -0000 1.2 *************** *** 39,42 **** --- 39,44 ---- 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"); *************** *** 44,47 **** --- 46,50 ---- 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"); } { *************** *** 102,105 **** --- 105,109 ---- 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"); *************** *** 110,113 **** --- 114,118 ---- 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"); } { *************** *** 300,303 **** --- 305,310 ---- 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"); *************** *** 311,314 **** --- 318,323 ---- 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"); *************** *** 322,325 **** --- 331,336 ---- 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"); *************** *** 333,336 **** --- 344,349 ---- 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"); } { |