Commit db8d359

@@ -36,5 +36,19 @@ void main() {
           init.userColumns[c2.internalIdentifier]?.formatPattern);
       expect(fromJson.toJson(), init.toJson());
     });
+
+    test('should restore TimeColumns from configurations', () {
+      final initialManager = ExportColumnsManager();
+      initialManager.addOrUpdate(TimeColumn('testA', 'dd'));
+      initialManager.addOrUpdate(TimeColumn('testB', 'mmm'));
+      initialManager.addOrUpdate(TimeColumn('testC', 'asdsa'));
+
+      expect(initialManager.userColumns.length, 3);
+      expect(initialManager.userColumns.values, everyElement(isA<TimeColumn>()));
+
+      final fromJson = ExportColumnsManager.fromJson(initialManager.toJson());
+      expect(fromJson.userColumns.length, 3);
+      expect(fromJson.userColumns.values, everyElement(isA<TimeColumn>()));
+    });
   });
 }
\ No newline at end of file

@@ -16,7 +16,7 @@ void main() {
     test('should return correct columns depending on mode', () {
       final config = ActiveExportColumnConfiguration(
           activePreset: ExportImportPreset.bloodPressureApp,
-          userSelectedColumnIds: ['a', 'b', 'c'],
+          userSelectedColumnIds: ['userColumn.a', 'userColumn.b', 'userColumn.c'],
       );
       expect(config.getActiveColumns(ExportColumnsManager()), everyElement(isA<NativeColumn>()));
 

@@ -20,7 +20,7 @@ void main() {
       expect(find.text('Please enter a value'), findsOneWidget);
       expect(find.text('null'), findsOneWidget);
       expect(find.byType(MeasurementListRow), findsOneWidget);
-      expect(find.byIcon(Icons.info_outline), findsOneWidget);
+      expect(find.byIcon(Icons.info_outline).hitTestable(), findsOneWidget);
       expect(find.byIcon(Icons.arrow_downward), findsNWidgets(2));
     });
     testWidgets('should prefill values', (widgetTester) async {
@@ -36,7 +36,7 @@ void main() {
       expect(find.text('csvTitle'), findsOneWidget);
       expect(find.text(r'formatPattern$SYS'), findsOneWidget);
       expect(find.byType(MeasurementListRow), findsOneWidget);
-      expect(find.byIcon(Icons.info_outline), findsOneWidget);
+      expect(find.byIcon(Icons.info_outline).hitTestable(), findsOneWidget);
       expect(find.byIcon(Icons.arrow_downward), findsNWidgets(2));
     });
     testWidgets('should show preview', (widgetTester) async {
@@ -55,8 +55,8 @@ void main() {
 
       expect(find.byType(InformationScreen), findsNothing);
 
-      expect(find.byIcon(Icons.info_outline), findsOneWidget);
-      await widgetTester.tap(find.byIcon(Icons.info_outline));
+      expect(find.byIcon(Icons.info_outline).hitTestable(), findsOneWidget);
+      await widgetTester.tap(find.byIcon(Icons.info_outline).hitTestable(),);
       await widgetTester.pumpAndSettle();
 
       expect(find.byType(InformationScreen), findsOneWidget);