diff options
Diffstat (limited to 'Examples/test-suite/java/director_classes_runme.java')
-rw-r--r-- | Examples/test-suite/java/director_classes_runme.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Examples/test-suite/java/director_classes_runme.java b/Examples/test-suite/java/director_classes_runme.java index 5992b5dd9..292cded7f 100644 --- a/Examples/test-suite/java/director_classes_runme.java +++ b/Examples/test-suite/java/director_classes_runme.java @@ -21,8 +21,8 @@ Base - FullyOverloaded(int 10) Base - FullyOverloaded(bool 1) Base - SemiOverloaded(int -678) Base - SemiOverloaded(bool 1) -Base - DefaultParms(10, 2.2) -Base - DefaultParms(10, 1.1) +Base - DefaultParms(10, 2.25) +Base - DefaultParms(10, 1.125) -------------------------------- Derived - Val(444.555) Derived - Ref(444.555) @@ -32,8 +32,8 @@ Derived - FullyOverloaded(int 10) Derived - FullyOverloaded(bool 1) Derived - SemiOverloaded(int -678) Base - SemiOverloaded(bool 1) -Derived - DefaultParms(10, 2.2) -Derived - DefaultParms(10, 1.1) +Derived - DefaultParms(10, 2.25) +Derived - DefaultParms(10, 1.125) -------------------------------- JavaDerived - Val(444.555) JavaDerived - Ref(444.555) @@ -43,8 +43,8 @@ JavaDerived - FullyOverloaded(int 10) JavaDerived - FullyOverloaded(bool True) JavaDerived - SemiOverloaded(-678) Base - SemiOverloaded(bool 1) -JavaDerived - DefaultParms(10, 2.2) -JavaDerived - DefaultParms(10, 1.1) +JavaDerived - DefaultParms(10, 2.25) +JavaDerived - DefaultParms(10, 1.125) ------------ Finish ------------ */ @@ -128,7 +128,7 @@ public class director_classes_runme { if (!myCaller.SemiOverloadedCall(true).equals("Base" + "::SemiOverloaded(bool)")) throw new RuntimeException("failed"); // Default parameters methods test - if (!(myCaller.DefaultParmsCall(10, 2.2)).equals(baseSimpleName + "::DefaultParms(int, double)")) throw new RuntimeException("failed"); + if (!(myCaller.DefaultParmsCall(10, 2.25)).equals(baseSimpleName + "::DefaultParms(int, double)")) throw new RuntimeException("failed"); if (myBase instanceof JavaDerived) { // special handling for Java derived classes, there is no way to do this any other way if (!myCaller.DefaultParmsCall(10).equals(baseSimpleName + "::DefaultParms(int, double)")) throw new RuntimeException("failed"); } else { @@ -205,12 +205,12 @@ class JavaDerived extends Base // Note the following method can never be called from unmanaged code. // It is here only for code that calls it directly from managed code. // But should always be defined to ensure behaviour is consistent - // independent of where DefaultParsms is called from (managed or unmanaged code). + // independent of where DefaultParams is called from (managed or unmanaged code). // Note this method can never be called from unmanaged code public String DefaultParms(int x) { if (director_classes.getPrintDebug()) System.out.println("JavaDerived - DefaultParms(" + x + ")"); - return DefaultParms(x, 1.1/*use C++ default here*/); + return DefaultParms(x, 1.125/*use C++ default here*/); } } |