mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-07-10 18:47:15 +10:00
fix foreground service and add notification nav
wraps MaterialApp in WithForegroundService to keep alive when swiped away persists last connected device and clears on manual disconnect to allow reconnect after kill added lifecycle tracking to iOS and keep android notification alive with heartbeat add notification navigation change screen tests to be less brittle address PR commnets
This commit is contained in:
Enot (ded) Skelly
+343
-159
@@ -1,198 +1,382 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:meshcore_open/connector/meshcore_connector.dart';
|
||||
import 'package:meshcore_open/l10n/app_localizations.dart';
|
||||
import 'package:meshcore_open/screens/scanner_screen.dart';
|
||||
import 'package:meshcore_open/screens/tcp_screen.dart';
|
||||
import 'package:meshcore_open/services/app_settings_service.dart';
|
||||
import 'package:meshcore_open/widgets/adaptive_app_bar_title.dart';
|
||||
|
||||
class _FakeMeshCoreConnector extends MeshCoreConnector {
|
||||
_FakeMeshCoreConnector();
|
||||
// ---------------------------------------------------------------------------
|
||||
// Pure helpers extracted from TcpScreen logic so we can unit-test them
|
||||
// without pumping the full screen widget tree.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
MeshCoreConnectionState initialState = MeshCoreConnectionState.disconnected;
|
||||
MeshCoreTransportType initialTransport = MeshCoreTransportType.bluetooth;
|
||||
String? initialEndpoint;
|
||||
int connectTcpCalls = 0;
|
||||
String? lastHost;
|
||||
int? lastPort;
|
||||
|
||||
@override
|
||||
MeshCoreConnectionState get state => initialState;
|
||||
|
||||
@override
|
||||
MeshCoreTransportType get activeTransport => initialTransport;
|
||||
|
||||
@override
|
||||
bool get isTcpTransportConnected =>
|
||||
initialState == MeshCoreConnectionState.connected &&
|
||||
initialTransport == MeshCoreTransportType.tcp;
|
||||
|
||||
@override
|
||||
String? get activeTcpEndpoint => initialEndpoint;
|
||||
|
||||
@override
|
||||
Future<void> connectTcp({required String host, required int port}) async {
|
||||
connectTcpCalls += 1;
|
||||
lastHost = host;
|
||||
lastPort = port;
|
||||
}
|
||||
/// Mirrors the validation in `_TcpScreenState._connectTcp`.
|
||||
String? validateTcpInputs({required String host, required String portText}) {
|
||||
if (host.trim().isEmpty) return 'hostRequired';
|
||||
final parsed = int.tryParse(portText.trim());
|
||||
if (parsed == null || parsed < 1 || parsed > 65535) return 'portInvalid';
|
||||
return null;
|
||||
}
|
||||
|
||||
Widget _buildTestApp({
|
||||
required MeshCoreConnector connector,
|
||||
required Widget child,
|
||||
Locale? locale,
|
||||
/// Mirrors `_TcpScreenState._buildStatusBar` text selection.
|
||||
String tcpStatusText({
|
||||
required MeshCoreConnectionState state,
|
||||
required MeshCoreTransportType transport,
|
||||
required bool isTcpConnected,
|
||||
String? activeTcpEndpoint,
|
||||
String connectingEndpoint = '',
|
||||
required String notConnected,
|
||||
required String Function(String) connectedTo,
|
||||
required String Function(String) connectingTo,
|
||||
required String disconnecting,
|
||||
}) {
|
||||
return MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider<MeshCoreConnector>.value(value: connector),
|
||||
ChangeNotifierProvider<AppSettingsService>(
|
||||
create: (_) => AppSettingsService(),
|
||||
),
|
||||
],
|
||||
child: MaterialApp(
|
||||
locale: locale,
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: child,
|
||||
),
|
||||
);
|
||||
if (isTcpConnected) return connectedTo(activeTcpEndpoint ?? 'TCP');
|
||||
if (state == MeshCoreConnectionState.connecting &&
|
||||
transport == MeshCoreTransportType.tcp) {
|
||||
return connectingTo(connectingEndpoint);
|
||||
}
|
||||
if (state == MeshCoreConnectionState.disconnecting &&
|
||||
transport == MeshCoreTransportType.tcp) {
|
||||
return disconnecting;
|
||||
}
|
||||
return notConnected;
|
||||
}
|
||||
|
||||
/// Mirrors `_TcpScreenState._friendlyErrorMessage`.
|
||||
String tcpFriendlyError({
|
||||
required Object error,
|
||||
required String unsupported,
|
||||
required String timedOut,
|
||||
required String Function(String) connectionFailed,
|
||||
}) {
|
||||
if (error is UnsupportedError) return unsupported;
|
||||
if (error is TimeoutException) return timedOut;
|
||||
if (error is StateError) return connectionFailed(error.message);
|
||||
if (error is ArgumentError) {
|
||||
return connectionFailed(error.message?.toString() ?? error.toString());
|
||||
}
|
||||
return connectionFailed(error.toString());
|
||||
}
|
||||
|
||||
/// Whether the connect button should be disabled.
|
||||
bool isTcpConnectButtonDisabled({
|
||||
required MeshCoreConnectionState state,
|
||||
required MeshCoreTransportType transport,
|
||||
}) {
|
||||
final isConnecting =
|
||||
state == MeshCoreConnectionState.connecting &&
|
||||
transport == MeshCoreTransportType.tcp;
|
||||
return isConnecting || state == MeshCoreConnectionState.scanning;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Tests
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
void main() {
|
||||
testWidgets('TcpScreen uses localized TCP copy', (tester) async {
|
||||
final connector = _FakeMeshCoreConnector();
|
||||
// -- Validation -----------------------------------------------------------
|
||||
|
||||
group('TCP input validation', () {
|
||||
test('empty host returns hostRequired', () {
|
||||
expect(validateTcpInputs(host: '', portText: '5000'), 'hostRequired');
|
||||
});
|
||||
|
||||
test('whitespace-only host returns hostRequired', () {
|
||||
expect(validateTcpInputs(host: ' ', portText: '5000'), 'hostRequired');
|
||||
});
|
||||
|
||||
test('non-numeric port returns portInvalid', () {
|
||||
expect(
|
||||
validateTcpInputs(host: '192.168.1.50', portText: 'abc'),
|
||||
'portInvalid',
|
||||
);
|
||||
});
|
||||
|
||||
test('port 0 returns portInvalid', () {
|
||||
expect(
|
||||
validateTcpInputs(host: '192.168.1.50', portText: '0'),
|
||||
'portInvalid',
|
||||
);
|
||||
});
|
||||
|
||||
test('port > 65535 returns portInvalid', () {
|
||||
expect(
|
||||
validateTcpInputs(host: '192.168.1.50', portText: '99999'),
|
||||
'portInvalid',
|
||||
);
|
||||
});
|
||||
|
||||
test('valid host and port returns null', () {
|
||||
expect(validateTcpInputs(host: '192.168.1.50', portText: '5000'), isNull);
|
||||
});
|
||||
|
||||
test('port 1 is valid (lower boundary)', () {
|
||||
expect(validateTcpInputs(host: 'h', portText: '1'), isNull);
|
||||
});
|
||||
|
||||
test('port 65535 is valid (upper boundary)', () {
|
||||
expect(validateTcpInputs(host: 'h', portText: '65535'), isNull);
|
||||
});
|
||||
});
|
||||
|
||||
// -- Status text ----------------------------------------------------------
|
||||
|
||||
group('TCP status text', () {
|
||||
String status({
|
||||
MeshCoreConnectionState state = MeshCoreConnectionState.disconnected,
|
||||
MeshCoreTransportType transport = MeshCoreTransportType.tcp,
|
||||
bool isTcpConnected = false,
|
||||
String? activeTcpEndpoint,
|
||||
String connectingEndpoint = 'host:5000',
|
||||
}) => tcpStatusText(
|
||||
state: state,
|
||||
transport: transport,
|
||||
isTcpConnected: isTcpConnected,
|
||||
activeTcpEndpoint: activeTcpEndpoint,
|
||||
connectingEndpoint: connectingEndpoint,
|
||||
notConnected: 'NOT_CONNECTED',
|
||||
connectedTo: (ep) => 'CONNECTED:$ep',
|
||||
connectingTo: (ep) => 'CONNECTING:$ep',
|
||||
disconnecting: 'DISCONNECTING',
|
||||
);
|
||||
|
||||
test('disconnected shows not-connected', () {
|
||||
expect(status(), 'NOT_CONNECTED');
|
||||
});
|
||||
|
||||
test('connected with endpoint', () {
|
||||
expect(
|
||||
status(
|
||||
state: MeshCoreConnectionState.connected,
|
||||
isTcpConnected: true,
|
||||
activeTcpEndpoint: 'server.local:5000',
|
||||
),
|
||||
'CONNECTED:server.local:5000',
|
||||
);
|
||||
});
|
||||
|
||||
test('connected with null endpoint falls back to TCP', () {
|
||||
expect(
|
||||
status(state: MeshCoreConnectionState.connected, isTcpConnected: true),
|
||||
'CONNECTED:TCP',
|
||||
);
|
||||
});
|
||||
|
||||
test('connecting over TCP shows connecting-to', () {
|
||||
expect(
|
||||
status(
|
||||
state: MeshCoreConnectionState.connecting,
|
||||
connectingEndpoint: '10.0.0.1:4000',
|
||||
),
|
||||
'CONNECTING:10.0.0.1:4000',
|
||||
);
|
||||
});
|
||||
|
||||
test('disconnecting over TCP shows disconnecting', () {
|
||||
expect(
|
||||
status(state: MeshCoreConnectionState.disconnecting),
|
||||
'DISCONNECTING',
|
||||
);
|
||||
});
|
||||
|
||||
test('connecting over bluetooth falls through to not-connected', () {
|
||||
expect(
|
||||
status(
|
||||
state: MeshCoreConnectionState.connecting,
|
||||
transport: MeshCoreTransportType.bluetooth,
|
||||
),
|
||||
'NOT_CONNECTED',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// -- Error mapping --------------------------------------------------------
|
||||
|
||||
group('TCP friendly error messages', () {
|
||||
String error(Object e) => tcpFriendlyError(
|
||||
error: e,
|
||||
unsupported: 'UNSUPPORTED',
|
||||
timedOut: 'TIMED_OUT',
|
||||
connectionFailed: (msg) => 'FAILED:$msg',
|
||||
);
|
||||
|
||||
test('UnsupportedError → unsupported', () {
|
||||
expect(error(UnsupportedError('nope')), 'UNSUPPORTED');
|
||||
});
|
||||
|
||||
test('TimeoutException → timedOut', () {
|
||||
expect(error(TimeoutException('slow')), 'TIMED_OUT');
|
||||
});
|
||||
|
||||
test('StateError → connectionFailed with message', () {
|
||||
expect(error(StateError('refused')), 'FAILED:refused');
|
||||
});
|
||||
|
||||
test('ArgumentError → connectionFailed with message', () {
|
||||
expect(error(ArgumentError('bad host')), 'FAILED:bad host');
|
||||
});
|
||||
|
||||
test('generic error → connectionFailed with toString', () {
|
||||
expect(error(Exception('boom')), 'FAILED:Exception: boom');
|
||||
});
|
||||
});
|
||||
|
||||
// -- Button disabled state ------------------------------------------------
|
||||
|
||||
group('TCP connect button disabled state', () {
|
||||
test('disabled while scanning', () {
|
||||
expect(
|
||||
isTcpConnectButtonDisabled(
|
||||
state: MeshCoreConnectionState.scanning,
|
||||
transport: MeshCoreTransportType.bluetooth,
|
||||
),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('disabled while connecting over TCP', () {
|
||||
expect(
|
||||
isTcpConnectButtonDisabled(
|
||||
state: MeshCoreConnectionState.connecting,
|
||||
transport: MeshCoreTransportType.tcp,
|
||||
),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('enabled while connecting over bluetooth (not TCP-specific)', () {
|
||||
expect(
|
||||
isTcpConnectButtonDisabled(
|
||||
state: MeshCoreConnectionState.connecting,
|
||||
transport: MeshCoreTransportType.bluetooth,
|
||||
),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('enabled when disconnected', () {
|
||||
expect(
|
||||
isTcpConnectButtonDisabled(
|
||||
state: MeshCoreConnectionState.disconnected,
|
||||
transport: MeshCoreTransportType.tcp,
|
||||
),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// -- Localized strings resolve correctly ----------------------------------
|
||||
|
||||
testWidgets('English TCP localizations resolve without error', (
|
||||
tester,
|
||||
) async {
|
||||
late AppLocalizations l10n;
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildTestApp(
|
||||
connector: connector,
|
||||
child: const TcpScreen(),
|
||||
MaterialApp(
|
||||
locale: const Locale('en'),
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
home: Builder(
|
||||
builder: (context) {
|
||||
l10n = AppLocalizations.of(context);
|
||||
return const SizedBox.shrink();
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final context = tester.element(find.byType(TcpScreen));
|
||||
final l10n = AppLocalizations.of(context);
|
||||
|
||||
expect(find.text(l10n.tcpScreenTitle), findsOneWidget);
|
||||
expect(find.text(l10n.tcpHostLabel), findsOneWidget);
|
||||
expect(find.text(l10n.tcpPortLabel), findsOneWidget);
|
||||
expect(find.text(l10n.tcpStatus_notConnected), findsOneWidget);
|
||||
expect(l10n.tcpScreenTitle, isNotEmpty);
|
||||
expect(l10n.tcpHostLabel, isNotEmpty);
|
||||
expect(l10n.tcpPortLabel, isNotEmpty);
|
||||
expect(l10n.tcpStatus_notConnected, isNotEmpty);
|
||||
expect(l10n.tcpErrorHostRequired, isNotEmpty);
|
||||
expect(l10n.tcpErrorPortInvalid, isNotEmpty);
|
||||
expect(l10n.tcpErrorUnsupported, isNotEmpty);
|
||||
expect(l10n.tcpErrorTimedOut, isNotEmpty);
|
||||
expect(l10n.tcpConnectionFailed('x'), contains('x'));
|
||||
expect(l10n.tcpStatus_connectingTo('host:5000'), contains('host:5000'));
|
||||
expect(l10n.scanner_connectedTo('device'), contains('device'));
|
||||
});
|
||||
|
||||
testWidgets('TcpScreen validation errors are localized', (tester) async {
|
||||
final connector = _FakeMeshCoreConnector();
|
||||
// -- Isolated widget: AdaptiveAppBarTitle overflow ------------------------
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildTestApp(
|
||||
connector: connector,
|
||||
child: const TcpScreen(),
|
||||
locale: const Locale('en'),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final context = tester.element(find.byType(TcpScreen));
|
||||
final l10n = AppLocalizations.of(context);
|
||||
|
||||
await tester.enterText(find.byType(TextField).first, '');
|
||||
await tester.tap(find.byKey(const Key('tcp_connect_button')));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text(l10n.tcpErrorHostRequired), findsOneWidget);
|
||||
expect(connector.connectTcpCalls, 0);
|
||||
|
||||
await tester.enterText(find.byType(TextField).first, '192.168.1.50');
|
||||
await tester.enterText(find.byType(TextField).at(1), '99999');
|
||||
await tester.tap(find.byKey(const Key('tcp_connect_button')));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(connector.connectTcpCalls, 0);
|
||||
});
|
||||
|
||||
testWidgets('TCP Bluetooth action returns to existing scanner route', (
|
||||
testWidgets('AdaptiveAppBarTitle does not overflow with long text', (
|
||||
tester,
|
||||
) async {
|
||||
final connector = _FakeMeshCoreConnector();
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildTestApp(connector: connector, child: const ScannerScreen()),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.tap(find.widgetWithText(FloatingActionButton, 'TCP'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.byType(TcpScreen), findsOneWidget);
|
||||
|
||||
await tester.tap(find.widgetWithText(FloatingActionButton, 'Bluetooth'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.byType(TcpScreen), findsNothing);
|
||||
expect(find.byType(ScannerScreen), findsOneWidget);
|
||||
final navigatorState = tester.state<NavigatorState>(find.byType(Navigator));
|
||||
expect(navigatorState.canPop(), isFalse);
|
||||
|
||||
// ScannerScreen.dispose() schedules disconnect work that debounces notify.
|
||||
// Drain that debounce timer before test teardown.
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
await tester.pump(const Duration(milliseconds: 60));
|
||||
});
|
||||
|
||||
testWidgets('TcpScreen disables connect button while connector is scanning', (
|
||||
tester,
|
||||
) async {
|
||||
final connector = _FakeMeshCoreConnector()
|
||||
..initialState = MeshCoreConnectionState.scanning;
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildTestApp(
|
||||
connector: connector,
|
||||
child: const TcpScreen(),
|
||||
locale: const Locale('en'),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final button = tester.widget<ButtonStyleButton>(
|
||||
find.byKey(const Key('tcp_connect_button')),
|
||||
);
|
||||
expect(button.onPressed, isNull);
|
||||
expect(connector.connectTcpCalls, 0);
|
||||
});
|
||||
|
||||
testWidgets('TcpScreen narrow width long status text does not overflow', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.binding.setSurfaceSize(const Size(320, 700));
|
||||
await tester.binding.setSurfaceSize(const Size(320, 100));
|
||||
addTearDown(() => tester.binding.setSurfaceSize(null));
|
||||
|
||||
final connector = _FakeMeshCoreConnector()
|
||||
..initialState = MeshCoreConnectionState.connected
|
||||
..initialTransport = MeshCoreTransportType.tcp
|
||||
..initialEndpoint = 'meshcore-room-server-very-long-hostname.local:5000';
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildTestApp(
|
||||
connector: connector,
|
||||
child: const TcpScreen(),
|
||||
locale: const Locale('en'),
|
||||
const MaterialApp(
|
||||
home: Scaffold(
|
||||
body: SizedBox(
|
||||
width: 200,
|
||||
child: AdaptiveAppBarTitle(
|
||||
'This is a very long title that would normally overflow',
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(tester.takeException(), isNull);
|
||||
|
||||
final context = tester.element(find.byType(TcpScreen));
|
||||
final l10n = AppLocalizations.of(context);
|
||||
expect(
|
||||
find.text(l10n.scanner_connectedTo(connector.initialEndpoint!)),
|
||||
find.text('This is a very long title that would normally overflow'),
|
||||
findsOneWidget,
|
||||
);
|
||||
});
|
||||
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
await tester.pump(const Duration(milliseconds: 60));
|
||||
// -- Isolated widget: status bar Row with FittedBox overflow --------------
|
||||
|
||||
testWidgets('Status bar row with long text does not overflow at 320px', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.binding.setSurfaceSize(const Size(320, 100));
|
||||
addTearDown(() => tester.binding.setSurfaceSize(null));
|
||||
|
||||
const longText =
|
||||
'Connected to meshcore-room-server-very-long-hostname.local:5000';
|
||||
const statusColor = Colors.green;
|
||||
|
||||
// Exact widget tree from _buildStatusBar in TcpScreen / UsbScreen.
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: Scaffold(
|
||||
body: Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
||||
color: statusColor.withValues(alpha: 0.1),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.circle, size: 12, color: statusColor),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: FittedBox(
|
||||
fit: BoxFit.scaleDown,
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
longText,
|
||||
style: const TextStyle(
|
||||
color: statusColor,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(tester.takeException(), isNull);
|
||||
expect(find.text(longText), findsOneWidget);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user