Update encoding

PlugFox · Nov 28, 2023 · 51ab2ea · 51ab2ea
1 parent b99e3e8
commit 51ab2ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/lib/src/state/state_util.dart b/lib/src/state/state_util.dart
@@ -239,7 +239,11 @@ abstract final class StateUtil {
                 value = _decodeComponent(element.substring(index + 1));
               }
               if (result[key] case String currentValue) {
-                result[key] = '$currentValue; $value';
+                if (currentValue.isEmpty) {
+                  result[key] = value;
+                } else {
+                  result[key] = '$currentValue; $value';
+                }
               } else {
                 result[key] = value;
               }

diff --git a/test/octopus_test.dart b/test/octopus_test.dart
@@ -4,7 +4,9 @@ import 'src/state_test.dart' as state_test;
 
 void main() {
   group('unit', () {
+    test('placeholder', () {
+      expect(true, isTrue);
+    });
     state_test.main();
-    state_test.main(); // TODO(plugfox): remove this line
   });
 }
diff --git a/test/src/state_test.dart b/test/src/state_test.dart
@@ -21,9 +21,9 @@ void main() => group('state', () {
             '..Profile/'
             '..Settings';
         expect(() => StateUtil.decodeLocation(location), returnsNormally);
-        print('$location\n'
+        /* print('$location\n'
             '-->\n'
-            '${StateUtil.decodeLocation(location).toString()}');
+            '${StateUtil.decodeLocation(location).toString()}'); */
       });
 
       test('empty_url', () {
@@ -60,7 +60,8 @@ void main() => group('state', () {
       });
 
       test('decode_and_encode_cyrillic_state', () {
-        const location = 'route~name=Привет мир';
+        const location =
+            'route~name=Привет мир?теплое=Мягкое&Вкусное=кислое&флаг';
         final state = StateUtil.decodeLocation(location);
         expect(state.children, hasLength(1));
         expect(
@@ -87,6 +88,9 @@ void main() => group('state', () {
                 ),
               ),
         );
+        expect(state.arguments['теплое'], equals('Мягкое'));
+        expect(state.arguments['Вкусное'], equals('кислое'));
+        expect(state.arguments['флаг'], isEmpty);
         expect(() => state.location, returnsNormally);
       });
     });