[Swig-cvs] SWIG/Examples/test-suite/java director_classic_runme.java, 1.1, 1.2

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Examples/test-suite/java
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11527/Examples/test-suite/java

Modified Files:
	director_classic_runme.java 
Log Message:
More comprehensive test

Index: director_classic_runme.java
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/java/director_classic_runme.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** director_classic_runme.java	12 Jul 2006 20:18:08 -0000	1.1
--- director_classic_runme.java	27 Jul 2006 22:25:25 -0000	1.2
***************
*** 43,46 ****
--- 43,85 ----
        person.delete();
      }
+ 
+     // Semis - don't override id() in target language
+     { 
+       Person person = new TargetLangSemiPerson();
+       check(person, "Person"); 
+       person.delete();
+     }
+     { 
+       Person person = new TargetLangSemiChild();
+       check(person, "Child"); 
+       person.delete();
+     }
+     { 
+       Person person = new TargetLangSemiGrandChild();
+       check(person, "GrandChild"); 
+       person.delete();
+     }
+ 
+     // Orphans - don't override id() in C++
+     { 
+       Person person = new OrphanPerson();
+       check(person, "Person"); 
+       person.delete();
+     }
+     { 
+       Person person = new OrphanChild();
+       check(person, "Child"); 
+       person.delete();
+     }
+     { 
+       Person person = new TargetLangOrphanPerson();
+       check(person, "TargetLangOrphanPerson"); 
+       person.delete();
+     }
+     { 
+       Person person = new TargetLangOrphanChild();
+       check(person, "TargetLangOrphanChild"); 
+       person.delete();
+     }
    }
  
***************
*** 120,121 ****
--- 159,217 ----
  }
  
+ // Semis - don't override id() in target language
+ class TargetLangSemiPerson extends Person
+ {
+   public TargetLangSemiPerson()
+   {
+     super();
+   }
+   // No id() override
+ }
+ 
+ class TargetLangSemiChild extends Child
+ {
+   public TargetLangSemiChild()
+   {
+     super();
+   }
+   // No id() override
+ }
+ 
+ class TargetLangSemiGrandChild extends GrandChild
+ {
+   public TargetLangSemiGrandChild()
+   {
+     super();
+   }
+   // No id() override
+ }
+ 
+ // Orphans - don't override id() in C++
+ class TargetLangOrphanPerson extends OrphanPerson
+ {
+   public TargetLangOrphanPerson()
+   {
+     super();
+   }
+ 
+   public String id()
+   {
+     String identifier = "TargetLangOrphanPerson";
+     return identifier;
+   }
+ }
+ 
+ class TargetLangOrphanChild extends OrphanChild
+ {
+   public TargetLangOrphanChild()
+   {
+     super();
+   }
+ 
+   public String id()
+   {
+     String identifier = "TargetLangOrphanChild";
+     return identifier;
+   }
+ }
+