fix(3.22.x): use the values for AutovalidateMode instead of testing each

Co-authored-by: Gustl22 <[email protected]>
peiffer-innovations · Aug 22, 2024 · f08555b · f08555b
1 parent 2e796e5
commit f08555b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 51 deletions.
diff --git a/json_theme/lib/src/codec/theme_encoder.dart b/json_theme/lib/src/codec/theme_encoder.dart
@@ -238,32 +238,12 @@ class ThemeEncoder {
     return _stripDynamicNull(result);
   }
 
-  /// Encodes the given [value] to a [String].  Supported values are:
-  /// * `always`
-  /// * `disabled`
-  /// * `onUserInteraction`
-  /// * `onUnfocus`
+  /// Encodes the given [value] to a [String].
   static String? encodeAutovalidateMode(AutovalidateMode? value) {
     String? result;
 
     if (value != null) {
-      switch (value) {
-        case AutovalidateMode.always:
-          result = 'always';
-          break;
-
-        case AutovalidateMode.disabled:
-          result = 'disabled';
-          break;
-
-        case AutovalidateMode.onUserInteraction:
-          result = 'onUserInteraction';
-          break;
-
-        case AutovalidateMode.onUnfocus:
-          result = 'onUnfocus';
-          break;
-      }
+      return value.name;
     }
 
     return _stripDynamicNull(result);

diff --git a/json_theme/test/json_theme_test.dart b/json_theme/test/json_theme_test.dart
@@ -495,35 +495,11 @@ void main() {
       AutovalidateMode.always,
     );
 
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('always'),
-      AutovalidateMode.always,
-    );
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('disabled'),
-      AutovalidateMode.disabled,
-    );
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('onUserInteraction'),
-      AutovalidateMode.onUserInteraction,
-    );
-
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.always),
-      'always',
-    );
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.disabled),
-      'disabled',
-    );
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.onUserInteraction),
-      'onUserInteraction',
-    );
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.onUnfocus),
-      'onUnfocus',
-    );
+    // Test each values from AutovalidateMode enum
+    for (var value in AutovalidateMode.values) {
+      expect(ThemeDecoder.decodeAutovalidateMode(value.name), value);
+      expect(ThemeEncoder.encodeAutovalidateMode(value), value.name);
+    }
   });
 
   test('Axis', () {