Cosmetic spacing changes in test case

This commit is contained in:
William S Fulton 2016-02-05 19:34:36 +00:00
commit a16a818523
2 changed files with 189 additions and 172 deletions

View file

@ -10,6 +10,7 @@ public class multiple_inheritance_abstract_runme {
System.exit(1); System.exit(1);
} }
} }
//Test base class as a parameter in java //Test base class as a parameter in java
int jfoo1(CBase1 cb1){ int jfoo1(CBase1 cb1){
return cb1.foo1(); return cb1.foo1();
@ -20,6 +21,7 @@ return ab1.bar1();
int jfoo2(CBase2 cb2){ int jfoo2(CBase2 cb2){
return cb2.foo2(); return cb2.foo2();
} }
public static void main(String argv[]) { public static void main(String argv[]) {
//Test Derived1 //Test Derived1
Derived1 d1=new Derived1(); Derived1 d1=new Derived1();
@ -27,12 +29,14 @@ return cb2.foo2();
throw new RuntimeException("Derived1::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived1::foo1() failed in multiple_inheritance_abstract");
if(d1.foo2()!=4) if(d1.foo2()!=4)
throw new RuntimeException("Derived::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived::foo2() failed in multiple_inheritance_abstract");
//Test Derived2 //Test Derived2
Derived2 d2=new Derived2(); Derived2 d2=new Derived2();
if(d2.foo1()!=6) if(d2.foo1()!=6)
throw new RuntimeException("Derived2::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::foo1() failed in multiple_inheritance_abstract");
if(d2.bar1()!=5) if(d2.bar1()!=5)
throw new RuntimeException("Derived2::bar1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::bar1() failed in multiple_inheritance_abstract");
//Test Derived3 //Test Derived3
Derived3 d3=new Derived3(); Derived3 d3=new Derived3();
if( d3.foo1()!=7) if( d3.foo1()!=7)
@ -41,6 +45,7 @@ return cb2.foo2();
throw new RuntimeException("Derived3::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::foo2() failed in multiple_inheritance_abstract");
if(d3.bar1()!=9) if(d3.bar1()!=9)
throw new RuntimeException("Derived3::bar1() failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::bar1() 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();
@ -48,10 +53,12 @@ return cb2.foo2();
throw new RuntimeException("CBase1::foo1() failed in multiple_inheritance_abstract"); throw new RuntimeException("CBase1::foo1() failed in multiple_inheritance_abstract");
if(cb2.foo2()!=2) if(cb2.foo2()!=2)
throw new RuntimeException("CBase2::foo2() failed in multiple_inheritance_abstract"); throw new RuntimeException("CBase2::foo2() 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.bar1()!=9)
throw new RuntimeException("Derived3::bar1() through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::bar1() 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();
@ -59,6 +66,7 @@ if(cb6.foo1()!=6)
throw new RuntimeException("Derived2::foo1() through CBase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::foo1() through CBase1 failed in multiple_inheritance_abstract");
if(cb7.foo2()!=4) if(cb7.foo2()!=4)
throw new RuntimeException("Derived1:foo2() through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived1:foo2() 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();
@ -72,6 +80,7 @@ if(cb7.foo2()!=4)
throw new RuntimeException("Derived3::foo2()through CBase2 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived3::foo2()through CBase2 failed in multiple_inheritance_abstract");
if(ab6.bar1()!=5) if(ab6.bar1()!=5)
throw new RuntimeException("Derived2::bar1()through ABase1 failed in multiple_inheritance_abstract"); throw new RuntimeException("Derived2::bar1()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.jfoo1(d1)!=3)
@ -88,11 +97,14 @@ if(mhar.jbar1(d2)!=5)
throw new RuntimeException("jbar1()through Derived2 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jbar1()through Derived2 as parameter failed in multiple_inheritance_abstract");
if(mhar.jbar1(d3)!=9) if(mhar.jbar1(d3)!=9)
throw new RuntimeException("jbar1()through Derived3 as parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("jbar1()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.foo6(d2)!=5)
throw new RuntimeException("foo6() through Derived2 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("foo6() through Derived2 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo6(d3)!=9) if(multiple_inheritance_abstract.foo6(d3)!=9)
throw new RuntimeException("foo6() through Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("foo6() 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.foo7(d3)!=7)
throw new RuntimeException("foo7() ,Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("foo7() ,Derived3 as a parameter failed in multiple_inheritance_abstract");
@ -103,7 +115,7 @@ if(multiple_inheritance_abstract.foo7(d2)!=6)
if(multiple_inheritance_abstract.foo8(d3)!=4) if(multiple_inheritance_abstract.foo8(d3)!=4)
throw new RuntimeException("foo8() ,Derived3 as a parameter failed in multiple_inheritance_abstract"); throw new RuntimeException("foo8() ,Derived3 as a parameter failed in multiple_inheritance_abstract");
if(multiple_inheritance_abstract.foo8(d1)!=8) if(multiple_inheritance_abstract.foo8(d1)!=8)
throw new RuntimeException("foo8() ,Derived1 as a parameter failed in multiple_inheritance_abstract");*/ throw new RuntimeException("foo8() ,Derived1 as a parameter failed in multiple_inheritance_abstract");
*/
} }
} }

View file

@ -21,6 +21,7 @@ return 10;
virtual ~CBase1() { virtual ~CBase1() {
} }
}; };
struct CBase2 { struct CBase2 {
virtual int foo2() { virtual int foo2() {
return 2; return 2;
@ -28,6 +29,7 @@ return 2;
virtual ~CBase2() { virtual ~CBase2() {
} }
}; };
struct ABase1 { struct ABase1 {
virtual int bar1() = 0; virtual int bar1() = 0;
virtual ~ABase1() { virtual ~ABase1() {
@ -48,6 +50,7 @@ virtual CBase2* clone(){
return new Derived1(*this); return new Derived1(*this);
} }
}; };
struct Derived2 : CBase1, ABase1 { struct Derived2 : CBase1, ABase1 {
virtual int bar1() { virtual int bar1() {
return 5; return 5;
@ -62,6 +65,7 @@ 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 foo1() {
return 7; return 7;
@ -78,6 +82,7 @@ virtual ABase1* clone(){
return new Derived3(*this); return new Derived3(*this);
} }
}; };
ABase1 *foo4(Derived3 d) { ABase1 *foo4(Derived3 d) {
return d.clone(); return d.clone();
} }