From b74a17279b1f554d84c153100d63a1b5ad59b4b8 Mon Sep 17 00:00:00 2001
From: Chris Waldon <christopher.waldon.dev@gmail.com>
Date: Fri, 26 Jun 2020 15:40:17 -0400
Subject: [PATCH] tests: add tests for calling new method types

---
 jni_test.go       | 163 +++++++++++++++++++++++++++++++++++++++++++++-
 test/AClass.class | Bin 690 -> 1126 bytes
 test/AClass.java  |  28 ++++++++
 3 files changed, 190 insertions(+), 1 deletion(-)

diff --git a/jni_test.go b/jni_test.go
index 1685fb7..8301719 100644
--- a/jni_test.go
+++ b/jni_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	vm JVM
+	vm     JVM
 	vmOnce sync.Once
 )
 
@@ -145,6 +145,167 @@ func TestIntMethod(t *testing.T) {
 	}
 }
 
+func TestBooleanMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetBoolean", "()Z")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallBooleanMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if !res {
+			t.Errorf("Method returned %v, not expected value of %v.", res, true)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestByteMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetByte", "()B")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallByteMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 127 {
+			t.Errorf("Method returned %d, not expected value of %d.", res, 127)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestCharMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetChar", "()C")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallCharMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 65432 {
+			t.Errorf("Method returned %d, not expected value of %d.", res, 65432)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestShortMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetShort", "()S")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallShortMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 512 {
+			t.Errorf("Method returned %d, not expected value of %d.", res, 512)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestLongMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetLong", "()J")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallLongMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 1<<33 {
+			t.Errorf("Method returned %d, not expected value of %d.", res, 1<<33)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestFloatMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetFloat", "()F")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallFloatMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 4.321 {
+			t.Errorf("Method returned %f, not expected value of %f.", res, 4.321)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
+func TestDoubleMethod(t *testing.T) {
+	err := Do(vm, func(env Env) error {
+		cls := FindClass(env, "test/AClass")
+		mid := GetMethodID(env, cls, "<init>", "()V")
+		inst, err := NewObject(env, cls, mid)
+		mid = GetMethodID(env, cls, "GetDouble", "()D")
+		if mid == nil {
+			t.Errorf("MethodID is nil")
+		}
+		res, err := CallDoubleMethod(env, inst, mid)
+		if err != nil {
+			t.Errorf("Method invocation failed")
+		}
+		if res != 5.4321 {
+			t.Errorf("Method returned %f, not expected value of %f.", res, 5.4321)
+		}
+		return nil
+	})
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+}
+
 func TestVoidMethod(t *testing.T) {
 	err := Do(vm, func(env Env) error {
 		cls := FindClass(env, "test/AClass")
diff --git a/test/AClass.class b/test/AClass.class
index b7a71a57148d9b5ece864774dc192580f4e96473..608a39e722ca1b7473287c70df4816e0d42aa6a1 100644
GIT binary patch
literal 1126
zcmZvcTTc^F6ouF6Ogp^+1;Gmx6hvr8p<<$mh8Un&Q$zHjh6kS<+6k15Gf6uo`sBO6
zz-OPm#9K^w@CW##)V0q{CSgL8&YZK)x7S%`@6-PId-@x|1KcSh1H*z@Mix1R%CU3e
zG(5*YY&<(ScDtcMZnN+A!-on+t-fDC9t8`<GD;{bltOnHHny9dGaQoa`{9Y>DX6w^
z<7G?;R33&-*zZP*2Jr8FmV0OTg}L?a(TCjD%;{@y>8Pk+HiMq4FtOM7-KV2h2kzjx
zbKo&je(Z)FEz|btiB{SScFqLNTD!ha7j3_*p&WDcpvb{a5O}WR>(mztmW1AfRHoEU
zG;ba`13hml<Ym93U=Z!qiGaPpKh(gJ2xxhM69FxS0yB1lk#<YXT^gZ1y}z~H>v6ye
zWovEiF~8aM;;I%q!D!HRTYWiZDJtc<bODR3p;Re@f)tV?0{T6{5!=P*MMhUhD87sK
zFDTpi3G1t7FG)-*7%)i}a2Z$PoT|=X1HNJGV?v7}$Q3Y)xtLt!TcX+7?-)x9k5PD>
z%hklpDh!R6Z2Jc+^W`~iCh2O5(0t-%o-@6N<fQG)aA^To`IN)X#%RV&b8@t6ELy~g
zeUUUOZ_}XcwuI|xaH^69MQa&1Vo*vZisobnX;PRKtR`gC5OW%npO~Q_t%!<S=d1>K
z%4rgpQx`s`z%?Q^ZpL6W?lC2&zof_wGPja`Es>O4le6c}sr_Bvn|tKfupTQfvtj&E
mB5%)C&+FEGSp1*Jqmi_Dftm8jReEQxM07xttGBtD!Nz}jr-WSq

literal 690
zcmZut%Syvg5Iwg^lRl!Y_1zaJqBRS<aVdfnlz`}>;@UI~5{W68Yro2kF9a8UfFC8E
zds_pRZtl#TIp@ro`TqI*0&s|S33+T5VWO^{hK;6;mVlE=Uq(Tc$gv*_2v5NJ`&dU&
z63Jr$qqBc4VD?7CP@r-iCE>;6{UCg}@&_?1&RHn?TE<JHMpMP<|0|juPia_Q5@?V`
z&LkmDC-%v3$RriWcRUR)90l>zL8(7_d<eqRNX;vs^kP3v5AOW2@1Tg1g92;^7Hl?U
zn9A-1Ay8GAZtN$w-OIsU7)We!`#evQBasAVLa`YO%qYgU%-=2%g0bX&K)A*`a?cv;
zs2Y2KK_!cf1uRZEP0awz7Z^_&+S1h`krh;@$Sp>tp0B^cm=#{2u##NL%<OTPf|p(Q
z4LS2>jvEE85md|EwD{9A6ld1XDqG8$ooz0pR<hj29O+FStWNw26iXdvhkgvkg4<}$
fGt=Th+dSx6wn1B4;e_h&-^P>UnCz}oFNcj^`e#<W

diff --git a/test/AClass.java b/test/AClass.java
index 4ea82d6..f5a8fd9 100644
--- a/test/AClass.java
+++ b/test/AClass.java
@@ -21,6 +21,34 @@ public class AClass {
 		return intval;
 	}
 
+	public boolean GetBoolean() {
+    	return true;
+	}
+
+	public byte GetByte() {
+    	return 127;
+	}
+
+	public char GetChar() {
+    	return 65432;
+	}
+
+	public short GetShort() {
+    	return 512;
+	}
+
+	public long GetLong() {
+    	return 1L<<33;
+	}
+
+	public float GetFloat() {
+    	return 4.321f;
+	}
+
+	public double GetDouble() {
+    	return 5.4321;
+	}
+
 	public void SetInt(int val) {
 		intval = val;
 	}