Skip to content

Commit 886b0bb

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
Add 19 missing E2E tests for README examples, fix VersionAwareTransport usage
- Add tests for: service methods, service transact, GNSS year, get-last-location, get-installer-package-name, telephony country ISO, WiFi (add-network, disconnect, set-ssid, set-psk, set-key-mgmt, enable), Camera (characteristics, torch), Audio (microphones, direction, zoom), Bluetooth (initialize, send-hci-command) - Update openBinder() to return *versionaware.Transport - Update getSurfaceFlingerAIDL, getActivityManager, getService helpers to accept *versionaware.Transport - Wrap concurrent test drivers with versionaware.NewTransport
1 parent 18b92ca commit 886b0bb

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

tests/e2e/e2e_test.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,24 @@ import (
1414
"github.com/stretchr/testify/require"
1515

1616
"github.com/xaionaro-go/aidl/binder"
17+
"github.com/xaionaro-go/aidl/binder/versionaware"
1718
aidlerrors "github.com/xaionaro-go/aidl/errors"
1819
"github.com/xaionaro-go/aidl/kernelbinder"
1920
"github.com/xaionaro-go/aidl/parcel"
2021
"github.com/xaionaro-go/aidl/servicemanager"
2122
)
2223

23-
func openBinder(t *testing.T) *kernelbinder.Driver {
24+
func openBinder(t *testing.T) *versionaware.Transport {
2425
t.Helper()
2526
ctx := context.Background()
2627
driver, err := kernelbinder.Open(ctx, binder.WithMapSize(128*1024))
2728
require.NoError(t, err, "failed to open /dev/binder")
29+
transport, err := versionaware.NewTransport(ctx, driver, 0)
30+
require.NoError(t, err, "failed to create version-aware transport")
2831
t.Cleanup(func() {
2932
_ = driver.Close(ctx)
3033
})
31-
return driver
34+
return transport
3235
}
3336

3437
// requireOrSkip calls require.NoError unless the error is a transient
@@ -148,7 +151,7 @@ const surfaceComposerDescriptor = "android.gui.ISurfaceComposer"
148151
func getSurfaceFlingerAIDL(
149152
ctx context.Context,
150153
t *testing.T,
151-
driver *kernelbinder.Driver,
154+
driver *versionaware.Transport,
152155
) binder.IBinder {
153156
t.Helper()
154157
sm := servicemanager.New(driver)
@@ -251,7 +254,7 @@ const activityManagerDescriptor = "android.app.IActivityManager"
251254
func getActivityManager(
252255
ctx context.Context,
253256
t *testing.T,
254-
driver *kernelbinder.Driver,
257+
driver *versionaware.Transport,
255258
) binder.IBinder {
256259
t.Helper()
257260
sm := servicemanager.New(driver)
@@ -480,7 +483,13 @@ func TestConcurrentTransactions(t *testing.T) {
480483
}
481484
defer func() { _ = driver.Close(ctx) }()
482485

483-
sm := servicemanager.New(driver)
486+
transport, err := versionaware.NewTransport(ctx, driver, 0)
487+
if err != nil {
488+
errs[idx] = err
489+
return
490+
}
491+
492+
sm := servicemanager.New(transport)
484493
services, err := sm.ListServices(ctx)
485494
if err != nil {
486495
errs[idx] = err

tests/e2e/exceptions_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/xaionaro-go/aidl/binder"
14+
"github.com/xaionaro-go/aidl/binder/versionaware"
1415
aidlerrors "github.com/xaionaro-go/aidl/errors"
15-
"github.com/xaionaro-go/aidl/kernelbinder"
1616
"github.com/xaionaro-go/aidl/parcel"
1717
"github.com/xaionaro-go/aidl/servicemanager"
1818
)
@@ -21,7 +21,7 @@ import (
2121
func getService(
2222
ctx context.Context,
2323
t *testing.T,
24-
driver *kernelbinder.Driver,
24+
driver *versionaware.Transport,
2525
name string,
2626
) binder.IBinder {
2727
t.Helper()

0 commit comments

Comments
 (0)