Skip to content

Commit c17fdb0

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
fix(tests/e2e): fix build errors and add missing wrapper tests
- Fix 22 pre-existing build errors: wrong constructor names, wrong type names, wrong method names (e.g., NewManager -> NewAudioManager, pm.Manager -> pm.PackageManager, ctx.PackageManager -> ctx.GetPackageManager) - Add ringtone package to E2E Init tests - Upgrade documents, mediastore, pdf Init-only tests to full wrapper tests that exercise real APIs (URI building, bitmap creation, etc.) - Add settings and ringtone wrapper tests
1 parent 4fafedc commit c17fdb0

3 files changed

Lines changed: 239 additions & 48 deletions

File tree

tests/e2e/e2e.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"github.com/AndroidGoLab/jni/media/player"
4444
"github.com/AndroidGoLab/jni/media/projection"
4545
"github.com/AndroidGoLab/jni/media/recorder"
46+
"github.com/AndroidGoLab/jni/media/ringtone"
4647
"github.com/AndroidGoLab/jni/media/session"
4748
"github.com/AndroidGoLab/jni/net"
4849
"github.com/AndroidGoLab/jni/net/nsd"
@@ -142,7 +143,7 @@ func runE2ETests(cvm *C.JavaVM) {
142143
run("NewProxy", testNewProxy)
143144

144145
// --- Generated wrapper package Init (validates all FindClass + GetMethodID) ---
145-
fmt.Fprintln(os.Stderr, "--- Package Init (all 53) ---")
146+
fmt.Fprintln(os.Stderr, "--- Package Init (all 54) ---")
146147
run("Init/accounts", initTest(accounts.Init))
147148
run("Init/alarm", initTest(alarm.Init))
148149
run("Init/app", initTest(app.Init))
@@ -183,6 +184,7 @@ func runE2ETests(cvm *C.JavaVM) {
183184
run("Init/projection", initTest(projection.Init))
184185
run("Init/recorder", initTest(recorder.Init))
185186
run("Init/resolver", initTest(resolver.Init))
187+
run("Init/ringtone", initTest(ringtone.Init))
186188
run("Init/session", initTest(session.Init))
187189
run("Init/settings", initTest(settings.Init))
188190
run("Init/speech", initTest(speech.Init))
@@ -252,9 +254,11 @@ func runE2ETests(cvm *C.JavaVM) {
252254
run("nfc/Adapter", testNfcAdapterWrapper)
253255
run("preferences/Wrapper", testPreferencesWrapper)
254256
run("resolver/Wrapper", testResolverWrapper)
255-
run("documents/Init", testDocumentsInitWrapper)
256-
run("mediastore/Init", testMediastoreInitWrapper)
257-
run("pdf/Init", testPdfInitWrapper)
257+
run("documents/Wrapper", testDocumentsWrapper)
258+
run("mediastore/Wrapper", testMediastoreWrapper)
259+
run("pdf/Wrapper", testPdfWrapper)
260+
run("ringtone/Wrapper", testRingtoneWrapper)
261+
run("settings/Wrapper", testSettingsWrapper)
258262
run("toast/Init", testToastInitWrapper)
259263

260264
fmt.Fprintf(os.Stderr, "\n=== Results: %d passed, %d failed ===\n", passed, failed)

tests/e2e/e2e_svc1_tests.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ func testPmWrapper(vm *jni.VM) error {
8282
}
8383
defer ctx.Close()
8484

85-
// PackageManager is obtained via Context.PackageManager(), not a NewManager.
86-
pmObj, err := ctx.PackageManager()
85+
// PackageManager is obtained via Context.GetPackageManager(), not a NewManager.
86+
pmObj, err := ctx.GetPackageManager()
8787
if err != nil {
8888
return fmt.Errorf("get package manager: %w", err)
8989
}
@@ -101,12 +101,12 @@ func testPmWrapper(vm *jni.VM) error {
101101
return nil
102102
})
103103

104-
mgr := &pm.Manager{
104+
mgr := &pm.PackageManager{
105105
VM: vm,
106106
Obj: pmGlobal,
107107
}
108108

109-
_, err = mgr.HasSystemFeature("android.hardware.touchscreen")
109+
_, err = mgr.HasSystemFeature1("android.hardware.touchscreen")
110110
if err != nil {
111111
return fmt.Errorf("hasSystemFeature: %w", err)
112112
}
@@ -209,11 +209,11 @@ func testDisplayWrapper(vm *jni.VM) error {
209209

210210
// The windowManager type and its methods are unexported, so we can only
211211
// verify that the system service is obtained successfully.
212-
mgr, err := display.NewwindowManager(ctx)
212+
mgr, err := display.NewWindowManager(ctx)
213213
if err != nil {
214214
return fmt.Errorf("new window manager: %w", err)
215215
}
216-
defer deleteGlobalRef(vm, mgr.Obj)
216+
defer mgr.Close()
217217
return nil
218218
}
219219

0 commit comments

Comments
 (0)