Merge pull request #98 from LoveCommunity/refactor/test-code

extract code gen method `code`
LoveCommunity · Jul 28, 2022 · 47f5459 · 47f5459
2 parents e862905 + 7e09b46
commit 47f5459
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 45 deletions.
diff --git a/test/test_gen/combine_test/test_cases/test_dispose_observation.dart b/test/test_gen/combine_test/test_cases/test_dispose_observation.dart
@@ -6,15 +6,15 @@ String testObservableCombineDisposeObservation(int? number) {
   final count = number ?? 2;
   return '''
     test('${observableCombineTestHeader(number)} dispose observation will dispose all source observations', () {
-      ${[
+      ${code([
         _invokes(),
         ...observables(count, _observable),
         observableCombine(number),
         _startObserve(),
         expectInvokesList<String>([]),
         _stopObserve(),
         expectInvokesList<String>(_expects(count)),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -58,15 +58,15 @@ String testStatesCombineDisposeObservation(int? number) {
   final count = number ?? 2;
   return '''
     test('${statesCombineTestHeader(number)} dispose observation will dispose all source observations', () {
-      ${[
+      ${code([
         _invokes(),
         ...statesIterable(count, _states),
         statesCombine(number),
         _startObserve(),
         expectInvokesList<String>([]),
         _stopObserve(),
         expectInvokesList<String>(_expects(count)),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/combine_test/test_cases/test_emit_if_all_sources_emitted.dart b/test/test_gen/combine_test/test_cases/test_emit_if_all_sources_emitted.dart
@@ -6,7 +6,7 @@ String testObservableCombineEmitIfAllSourcesEmitted(int? number) {
   final count = number ?? 2;
   return '''
     test('${observableCombineTestHeader(number)} emit if all sources emitted', () async {
-      ${[
+      ${code([
         ...observables(count, _observable),
         observableCombine(number),
         observableTester(),
@@ -15,7 +15,7 @@ String testObservableCombineEmitIfAllSourcesEmitted(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects(count)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -41,15 +41,15 @@ String testStatesCombineInitialEmit(int? number) {
   final count = number ?? 2;
   return '''
     test('${statesCombineTestHeader(number)} initial emit', () {
-      ${[
+      ${code([
         ...statesIterable(count, _states),
         statesCombine(number),
         statesTester(),
         expectTesterRecorded<String>([]),
         testerStartObserve(),
         expectTesterRecorded<String>(_expects(count)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/combine_test/test_cases/test_emit_latest_combined_value.dart b/test/test_gen/combine_test/test_cases/test_emit_latest_combined_value.dart
@@ -6,7 +6,7 @@ String testObservableCombineEmitLatestCombinedValue(int? number) {
   final count = number ?? 2;
   return '''
     test('${observableCombineTestHeader(number)} emit latest combined value when a source emit', () async {
-      ${[
+      ${code([
         ...observables(count, sampleObservable),
         observableCombine(number),
         observableTester(),
@@ -15,7 +15,7 @@ String testObservableCombineEmitLatestCombinedValue(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects2(count)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -43,7 +43,7 @@ String testStatesCombineEmitLatestCombinedValue(int? number) {
   final count = number ?? 2;
   return '''
     test('${statesCombineTestHeader(number)} emit latest combined value when a source emit', () async {
-      ${[
+      ${code([
         ...statesIterable(count, sampleStates),
         statesCombine(number),
         statesTester(),
@@ -52,7 +52,7 @@ String testStatesCombineEmitLatestCombinedValue(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects2(count)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
diff --git a/test/test_gen/combine_test/test_cases/test_not_emit_after_observation_disposed.dart b/test/test_gen/combine_test/test_cases/test_not_emit_after_observation_disposed.dart
@@ -6,7 +6,7 @@ String testObservableCombineNotEmitAfterObservationDispose(int? number) {
   final count = number ?? 2;
   return '''
     test('${observableCombineTestHeader(number)} will not emit data after observation disposed', () async {
-      ${[
+      ${code([
         ...observables(count, sampleObservable),
         observableCombine(number),
         observableTester(),
@@ -15,7 +15,7 @@ String testObservableCombineNotEmitAfterObservationDispose(int? number) {
         expectTesterRecorded<String>(_expects(count)),
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects(count)),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -30,7 +30,7 @@ String testStatesCombineNotEmitAfterObservationDispose(int? number) {
   final count = number ?? 2;
   return '''
     test('${statesCombineTestHeader(number)} will not emit data after observation disposed', () async {
-      ${[
+      ${code([
         ...statesIterable(count, sampleStates),
         statesCombine(number),
         statesTester(),
@@ -39,7 +39,7 @@ String testStatesCombineNotEmitAfterObservationDispose(int? number) {
         expectTesterRecorded<String>(_expects(count)),
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects(count)),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
diff --git a/test/test_gen/configurable_computed_test/test_cases/test_compute_with_other_scope_value.dart b/test/test_gen/configurable_computed_test/test_cases/test_compute_with_other_scope_value.dart
@@ -7,12 +7,12 @@ String testComputeWithOtherScopeValue(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` compute with other scope value', () async {
-      ${[
+      ${code([
         _scopeRoot(n),
         getComputed(),
         _first(),
         _expect(n),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_custom_equals.dart b/test/test_gen/configurable_computed_test/test_cases/test_custom_equals.dart
@@ -6,7 +6,7 @@ String testCustomEquals(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` custom equals', () async {
-      ${[
+      ${code([
         _scopeRoot(n),
         getComputed(),
         statesTester(),
@@ -15,7 +15,7 @@ String testCustomEquals(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(_expects2(n)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -40,14 +40,14 @@ String _scopeRoot(int n) {
 String _states(bool isLast, int n) {
   return '''
     final states$n = States<String>((setState) {
-      ${[
+      ${code([
         "setState('${n}a');",
         if (isLast) ...[
           "Future(() => setState('${n}b'));",
           "Future(() => setState('${n}aa'));",
           "Future(() => setState('${n}bb'));",
         ],
-      ].join('\n')}
+      ])}
       return Disposable.empty;
     });
   ''';

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_default_equals.dart b/test/test_gen/configurable_computed_test/test_cases/test_default_equals.dart
@@ -6,7 +6,7 @@ String testDefaultEquals(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` default equals', () async {
-      ${[
+      ${code([
         _scopeRoot(n),
         getComputed(),
         statesTester(),
@@ -15,7 +15,7 @@ String testDefaultEquals(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(expectAB(n)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -39,14 +39,14 @@ String _scopeRoot(int n) {
 String _states(bool isLast, int n) {
   return '''
     final states$n = States<String>((setState) {
-      ${[
+      ${code([
         "setState('${n}a');",
         if (isLast) ...[
           "Future(() => setState('${n}a'));",
           "Future(() => setState('${n}b'));",
           "Future(() => setState('${n}b'));",
         ],
-      ].join('\n')}
+      ])}
       return Disposable.empty;
     });
   ''';

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_emit_latest_combined_value.dart b/test/test_gen/configurable_computed_test/test_cases/test_emit_latest_combined_value.dart
@@ -6,7 +6,7 @@ String testEmitLatestCombinedValue(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` emit latest combined value when a source emit', () async {
-      ${[
+      ${code([
         _scopeRoot(n),
         getComputed(),
         statesTester(),
@@ -15,7 +15,7 @@ String testEmitLatestCombinedValue(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(expectAB(n)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_is_sync_configuration.dart b/test/test_gen/configurable_computed_test/test_cases/test_is_sync_configuration.dart
@@ -1,14 +1,15 @@
 
+import '../../shared/codes.dart';
 import '../shared/codes.dart';
 
 String testIsSyncConfiguration(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` is sync configuration', () {
-      ${[
+      ${code([
         sampleScopeRoot(n: n, awaiting: false),
         _expect(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_late.dart b/test/test_gen/configurable_computed_test/test_cases/test_late.dart
@@ -6,11 +6,11 @@ String testLateIsFalse(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` compute immediately when late is false', () async {
-      ${[
+      ${code([
         intInvokes(),
         _scopeRoot(n: n, assign: false, computedLate: false),
         expectInvokes(1),
-      ].join('\n')}
+      ])}
     });
   ''';
 }
@@ -19,13 +19,13 @@ String testLateIsTrue(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` compute immediately when late is true', () async {
-      ${[
+      ${code([
         intInvokes(),
         _scopeRoot(n: n, assign: true, computedLate: true),
         expectInvokes(0),
         getComputed(assign: false),
         expectInvokes(1),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/...test_gen/configurable_computed_test/test_cases/test_not_forward_after_scope_disposed.dart b/...test_gen/configurable_computed_test/test_cases/test_not_forward_after_scope_disposed.dart
@@ -6,7 +6,7 @@ String testNotForwardAfterScopeDisposed(int? number) {
   final n = number!;
   return '''
     test("`Computed$number` exposed `States` won't forward data after scope disposed", () async {
-      ${[
+      ${code([
         _scopeRoot(n),
         getComputed(),
         statesTester(),
@@ -16,7 +16,7 @@ String testNotForwardAfterScopeDisposed(int? number) {
         awaitEmptyFuture(),
         expectTesterRecorded<String>(expectAllA(n)),
         testerStopObserve(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/configurable_computed_test/test_cases/test_share_same_instance.dart b/test/test_gen/configurable_computed_test/test_cases/test_share_same_instance.dart
@@ -6,12 +6,12 @@ String testShareSameInstance(int? number) {
   final n = number!;
   return '''
     test('`Computed$number` share same instance in scope with name', () async {
-      ${[
+      ${code([
         sampleScopeRoot(n: n),
         ...generateN(n, (n) => getComputed(assignTo: 'computed$n')),
         _isIdentical(),
         _expect(),
-      ].join('\n')}
+      ])}
     });
   ''';
 }

diff --git a/test/test_gen/shared/codes.dart b/test/test_gen/shared/codes.dart
@@ -3,12 +3,15 @@ String testAll({
   required List<String Function(int?)> tests,
   required List<int?> numbers,
 }) {
-  final allTests = tests
-    .expand((test) => numbers.map(test))
-    .join('\n');
+  final allTests = code(tests
+    .expand((test) => numbers.map(test)));
   return 'void _main() {$allTests}';
 }
 
+String code(Iterable<String> codes) {
+  return codes.join('\n');
+}
+
 Iterable<String> observables(
   int count, 
   String Function(bool isLast, int n) observable
@@ -40,10 +43,10 @@ Iterable<String> sampleStatesIterable(int count) {
 String sampleObservable(bool isLast, int n) {
   return '''
     final observable$n = Observable<String>((onData) {
-       ${[
+       ${code([
         "onData('${n}a');",
         if (isLast) "Future(() => onData('${n}b'));"
-       ].join('\n')}
+       ])}
       return Disposable.empty;
     });
   ''';
@@ -52,10 +55,10 @@ String sampleObservable(bool isLast, int n) {
 String sampleStates(bool isLast, int n) {
   return '''
     final states$n = States<String>((setState) {
-       ${[
+       ${code([
         "setState('${n}a');",
         if (isLast) "Future(() => setState('${n}b'));"
-       ].join('\n')}
+       ])}
       return Disposable.empty;
     });
   ''';