jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename test functions in multiple_inheritance_abstract testcase

Browse source 
new names are just more friendly for analysing the test
This commit is contained in:
William S Fulton 2016-02-06 08:26:53 +00:00
commit 7379ea7848
2 changed files with 96 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

132
Examples/test-suite/java/multiple_inheritance_abstract_runme.java
View file

@ -12,110 +12,110 @@ public class multiple_inheritance_abstract_runme {
} }
//Test base class as a parameter in java //Test base class as a parameter in java
int jfoo1(CBase1 cb1){ int jcbase1b(CBase1 cb1){
return cb1.foo1(); return cb1.cbase1y();
} }
int jbar1(ABase1 ab1){ int jabase1(ABase1 ab1){
return ab1.bar1(); return ab1.abase1();
} }
int jfoo2(CBase2 cb2){ int jcbase2(CBase2 cb2){
return cb2.foo2(); return cb2.cbase2();
} }
public static void main(String argv[]) { public static void main(String argv[]) {
//Test Derived1 //Test Derived1
Derived1 d1=new Derived1(); Derived1 d1=new Derived1();
if(d1.foo1()!=3) if(d1.cbase1y()!=3)
throw new RuntimeException("Derived1::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived1::cbase1y() failed in multiple_inheritance_abstract");
if(d1.foo2()!=4) if(d1.cbase2()!=4)
throw new RuntimeException("Derived::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived::cbase2() failed in multiple_inheritance_abstract");
//Test Derived2 //Test Derived2
Derived2 d2=new Derived2(); Derived2 d2=new Derived2();
if(d2.foo1()!=6) if(d2.cbase1y()!=6)
throw new RuntimeException("Derived2::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::cbase1y() failed in multiple_inheritance_abstract");
if(d2.bar1()!=5) if(d2.abase1()!=5)
throw new RuntimeException("Derived2::bar1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::abase1() failed in multiple_inheritance_abstract");
//Test Derived3 //Test Derived3
Derived3 d3=new Derived3(); Derived3 d3=new Derived3();
if( d3.foo1()!=7) if( d3.cbase1y()!=7)
throw new RuntimeException("Derived3::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::cbase1y() failed in multiple_inheritance_abstract");
if(d3.foo2()!=8) if(d3.cbase2()!=8)
throw new RuntimeException("Derived3::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::cbase2() failed in multiple_inheritance_abstract");
if(d3.bar1()!=9) if(d3.abase1()!=9)
throw new RuntimeException("Derived3::bar1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::abase1() failed in multiple_inheritance_abstract");
//Test interfaces from c++ classes //Test interfaces from c++ classes
CBase1 cb1=new SWIGTYPE_CBase1(); CBase1 cb1=new SWIGTYPE_CBase1();
CBase2 cb2=new SWIGTYPE_CBase2(); CBase2 cb2=new SWIGTYPE_CBase2();
if(cb1.foo1()!=1) if(cb1.cbase1y()!=1)
throw new RuntimeException("CBase1::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("CBase1::cbase1y() failed in multiple_inheritance_abstract");
if(cb2.foo2()!=2) if(cb2.cbase2()!=2)
throw new RuntimeException("CBase2::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("CBase2::cbase2() failed in multiple_inheritance_abstract");
//Test abstract class as return value //Test abstract class as return value
ABase1 ab1=d3.clone(); ABase1 ab1=d3.clone();
if( ab1.bar1()!=9) if( ab1.abase1()!=9)
throw new RuntimeException("Derived3::bar1() through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::abase1() through ABase1 failed in multiple_inheritance_abstract");
//Test concrete base class as return value //Test concrete base class as return value
CBase1 cb6=d2.clone(); CBase1 cb6=d2.clone();
CBase2 cb7=d1.clone(); CBase2 cb7=d1.clone();
if(cb6.foo1()!=6) if(cb6.cbase1y()!=6)
throw new RuntimeException("Derived2::foo1() through CBase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::cbase1y() through CBase1 failed in multiple_inheritance_abstract");
if(cb7.foo2()!=4) if(cb7.cbase2()!=4)
throw new RuntimeException("Derived1:foo2() through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived1:cbase2() through ABase1 failed in multiple_inheritance_abstract");
//Test multi inheritance //Test multi inheritance
CBase1 cb3=new Derived1(); CBase1 cb3=new Derived1();
CBase1 cb4=new Derived3(); CBase1 cb4=new Derived3();
CBase2 cb5=new Derived3(); CBase2 cb5=new Derived3();
ABase1 ab6=new Derived2(); ABase1 ab6=new Derived2();
if(cb3.foo1()!=3) if(cb3.cbase1y()!=3)
throw new RuntimeException("Derived1::foo1()through CBase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived1::cbase1y()through CBase1 failed in multiple_inheritance_abstract");
if(cb4.foo1()!=7) if(cb4.cbase1y()!=7)
throw new RuntimeException("Derived3::foo1()through CBase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::cbase1y()through CBase1 failed in multiple_inheritance_abstract");
if(cb5.foo2()!=8) if(cb5.cbase2()!=8)
throw new RuntimeException("Derived3::foo2()through CBase2 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::cbase2()through CBase2 failed in multiple_inheritance_abstract");
if(ab6.bar1()!=5) if(ab6.abase1()!=5)
throw new RuntimeException("Derived2::bar1()through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::abase1()through ABase1 failed in multiple_inheritance_abstract");
//Test base classes as parameter in java //Test base classes as parameter in java
multiple_inheritance_abstract_runme mhar=new multiple_inheritance_abstract_runme(); multiple_inheritance_abstract_runme mhar=new multiple_inheritance_abstract_runme();
if(mhar.jfoo1(d1)!=3) if(mhar.jcbase1b(d1)!=3)
throw new RuntimeException("jfoo1()through Derived1 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jcbase1b()through Derived1 as parameter failed in multiple_inheritance_abstract");
if(mhar.jfoo1(d2)!=6) if(mhar.jcbase1b(d2)!=6)
throw new RuntimeException("jfoo1()through Derived2 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jcbase1b()through Derived2 as parameter failed in multiple_inheritance_abstract");
if(mhar.jfoo1(d3)!=7) if(mhar.jcbase1b(d3)!=7)
throw new RuntimeException("jfoo1()through Derived3 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jcbase1b()through Derived3 as parameter failed in multiple_inheritance_abstract");
if(mhar.jfoo2(d1)!=4) if(mhar.jcbase2(d1)!=4)
throw new RuntimeException("jfoo2()through Derived1 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jcbase2()through Derived1 as parameter failed in multiple_inheritance_abstract");
if(mhar.jfoo2(d3)!=8) if(mhar.jcbase2(d3)!=8)
throw new RuntimeException("jfoo2()through Derived3 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jcbase2()through Derived3 as parameter failed in multiple_inheritance_abstract");
if(mhar.jbar1(d2)!=5) if(mhar.jabase1(d2)!=5)
throw new RuntimeException("jbar1()through Derived2 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jabase1()through Derived2 as parameter failed in multiple_inheritance_abstract");
if(mhar.jbar1(d3)!=9) if(mhar.jabase1(d3)!=9)
throw new RuntimeException("jbar1()through Derived3 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jabase1()through Derived3 as parameter failed in multiple_inheritance_abstract");
/* /*
//Test ABase1 as a parameter //Test ABase1 as a parameter
if(multiple_inheritance_abstract.foo6(d2)!=5) if(multiple_inheritance_abstract.InputABase1(d2)!=5)
throw new RuntimeException("foo6() through Derived2 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputABase1() through Derived2 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo6(d3)!=9) if(multiple_inheritance_abstract.InputABase1(d3)!=9)
throw new RuntimeException("foo6() through Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputABase1() through Derived3 as a parameter failed in multiple_inheritance_abstract");
//Test CBase1 CBase2 as parameters //Test CBase1 CBase2 as parameters
if(multiple_inheritance_abstract.foo7(d3)!=7) if(multiple_inheritance_abstract.InputCBase1(d3)!=7)
throw new RuntimeException("foo7() ,Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputCBase1() ,Derived3 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo7(d1)!=3) if(multiple_inheritance_abstract.InputCBase1(d1)!=3)
throw new RuntimeException("foo7() ,Derived1 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputCBase1() ,Derived1 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo7(d2)!=6) if(multiple_inheritance_abstract.InputCBase1(d2)!=6)
throw new RuntimeException("foo7() ,Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputCBase1() ,Derived3 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo8(d3)!=4) if(multiple_inheritance_abstract.InputCBase2(d3)!=4)
throw new RuntimeException("foo8() ,Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputCBase2() ,Derived3 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo8(d1)!=8) if(multiple_inheritance_abstract.InputCBase2(d1)!=8)
throw new RuntimeException("foo8() ,Derived1 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("InputCBase2() ,Derived1 as a parameter failed in multiple_inheritance_abstract");
*/ */
} }
} }

57
Examples/test-suite/multiple_inheritance_abstract.i
View file

@ -9,13 +9,13 @@ DECLARE_INTERFACE_RENAME(CBase2, CBase2, SWIGTYPE_CBase2)
%inline %{ %inline %{
struct CBase1 { struct CBase1 {
virtual void foo9() { virtual void cbase1x() {
return ; return;
} }
virtual int foo1() { virtual int cbase1y() {
return 1; return 1;
} }
int foo3() { int cbase1z() {
return 10; return 10;
} }
virtual ~CBase1() { virtual ~CBase1() {
@ -23,7 +23,7 @@ DECLARE_INTERFACE_RENAME(CBase2, CBase2, SWIGTYPE_CBase2)
}; };
struct CBase2 { struct CBase2 {
virtual int foo2() { virtual int cbase2() {
return 2; return 2;
} }
virtual ~CBase2() { virtual ~CBase2() {
@ -31,19 +31,19 @@ DECLARE_INTERFACE_RENAME(CBase2, CBase2, SWIGTYPE_CBase2)
}; };
struct ABase1 { struct ABase1 {
virtual int bar1() = 0; virtual int abase1() = 0;
virtual ~ABase1() { virtual ~ABase1() {
} }
}; };
struct Derived1 : CBase2, CBase1 { struct Derived1 : CBase2, CBase1 {
virtual int foo1() { virtual int cbase1y() {
return 3; return 3;
} }
virtual void foo9() { virtual void cbase1x() {
return; return;
} }
virtual int foo2() { virtual int cbase2() {
return 4; return 4;
} }
virtual CBase2 *clone() { virtual CBase2 *clone() {
@ -52,51 +52,54 @@ DECLARE_INTERFACE_RENAME(CBase2, CBase2, SWIGTYPE_CBase2)
}; };
struct Derived2 : CBase1, ABase1 { struct Derived2 : CBase1, ABase1 {
virtual int bar1() { virtual int abase1() {
return 5; return 5;
} }
virtual int foo1() { virtual void cbase1x() {
return 6;
}
virtual void foo9() {
return; return;
} }
virtual int cbase1y() {
return 6;
}
virtual CBase1 *clone() { virtual CBase1 *clone() {
return new Derived2(*this); return new Derived2(*this);
} }
}; };
struct Derived3 : ABase1, CBase1, CBase2 { struct Derived3 : ABase1, CBase1, CBase2 {
virtual int foo1() { virtual int cbase1y() {
return 7; return 7;
} }
virtual int foo2() { virtual int cbase2() {
return 8; return 8;
} }
virtual int bar1() { virtual int abase1() {
return 9; return 9;
} }
virtual void foo9() { virtual void cbase1x() {
} }
virtual ABase1 *clone() { virtual ABase1 *clone() {
return new Derived3(*this); return new Derived3(*this);
} }
}; };
ABase1 *foo4(Derived3 d) { ABase1 *InputDerived3(Derived3 d) {
return d.clone(); return d.clone();
} }
int foo5(CBase1 cb1, CBase2 cb2) { int InputValueCBase1(CBase1 cb1) {
return cb1.foo1() + cb2.foo2(); return cb1.cbase1y();
} }
int foo6(ABase1 *pab1) { int InputValueCBase2(CBase2 cb2) {
return pab1->bar1(); return cb2.cbase2();
} }
int foo7(CBase1 *pcb1) { int InputABase1(ABase1 *pab1) {
return pcb1->foo1(); return pab1->abase1();
} }
int foo8(CBase2 *pcb2) { int InputCBase1(CBase1 *pcb1) {
return pcb2->foo2(); return pcb1->cbase1y();
}
int InputCBase2(CBase2 *pcb2) {
return pcb2->cbase2();
} }
%} %}