Skip to content

Commit b6ca936

Browse files
committed
Move flutter service tests to dart
Moving it to dart allows them to be re-used between both SDKs.
1 parent ad4afc0 commit b6ca936

File tree

11 files changed

+46
-3
lines changed

11 files changed

+46
-3
lines changed

src/SDK/Language/Dart.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,16 @@ public function getFiles(): array
401401
'destination' => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',
402402
'template' => 'dart/docs/example.md.twig',
403403
],
404+
[
405+
'scope' => 'service',
406+
'destination' => '/test/services/{{service.name | caseDash}}_test.dart',
407+
'template' => 'dart/test/services/service_test.dart.twig',
408+
],
409+
[
410+
'scope' => 'definition',
411+
'destination' => '/test/src/models/{{definition.name | caseSnake }}_test.dart',
412+
'template' => 'dart/test/src/models/model_test.dart.twig',
413+
],
404414
[
405415
'scope' => 'default',
406416
'destination' => '/test/id_test.dart',

src/SDK/Language/Flutter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public function getFiles(): array
243243
[
244244
'scope' => 'service',
245245
'destination' => '/test/services/{{service.name | caseDash}}_test.dart',
246-
'template' => 'flutter/test/services/service_test.dart.twig',
246+
'template' => 'dart/test/services/service_test.dart.twig',
247247
],
248248
[
249249
'scope' => 'definition',

templates/dart/pubspec.yaml.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ dependencies:
1313
dev_dependencies:
1414
lints: ^2.0.1
1515
test: ^1.22.0
16+
mockito: ^5.4.2

templates/dart/test/id_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import 'package:{{ language.params.packageName }}/{{ language.params.packageName }}.dart';
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37

48
void main() {
59
group('unique()', () {

templates/dart/test/permission_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import 'package:{{ language.params.packageName }}/{{ language.params.packageName }}.dart';
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37

48
void main() {
59
group('read()', () {

templates/dart/test/query_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import 'package:{{ language.params.packageName }}/{{ language.params.packageName }}.dart';
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37

48
class BasicFilterQueryTest {
59
final String description;

templates/dart/test/role_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import 'package:{{ language.params.packageName }}/{{ language.params.packageName }}.dart';
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37

48
void main() {
59
group('any()', () {

templates/flutter/test/services/service_test.dart.twig renamed to templates/dart/test/services/service_test.dart.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{% import 'flutter/base/utils.twig' as utils %}
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37
import 'package:mockito/mockito.dart';
48
import 'package:{{ language.params.packageName }}/models.dart' as models;
59
import 'package:{{ language.params.packageName }}/src/enums.dart';
@@ -65,7 +69,7 @@ void main() {
6569
{%~ if method.responseModel and method.responseModel != 'any' ~%}
6670
final Map<String, dynamic> data = {
6771
{%- for definition in spec.definitions ~%}{%~ if definition.name == method.responseModel -%}{%~ for property in definition.properties | filter((param) => param.required) ~%}
68-
'{{property.name | escapeKeyword | escapeDollarSign}}': {% if property.type == 'object' %}<String, dynamic>{}{% elseif property.type == 'array' %}[]{% elseif property.type == 'string' %}'{{property.example}}'{% elseif property.type == 'boolean' %}true{% else %}{{property.example}}{% endif %},{%~ endfor ~%}{% set break = true %}{%- else -%}{% set continue = true %}{%- endif -%}{%~ endfor -%}
72+
'{{property.name | escapeDollarSign}}': {% if property.type == 'object' %}<String, dynamic>{}{% elseif property.type == 'array' %}[]{% elseif property.type == 'string' %}'{{property.example | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property.example}}{% endif %},{%~ endfor ~%}{% set break = true %}{%- else -%}{% set continue = true %}{%- endif -%}{%~ endfor -%}
6973

7074
};
7175
{%~ else ~%}
@@ -92,7 +96,7 @@ void main() {
9296
{%~ endif ~%}
9397

9498
final response = await {{service.name | caseCamel}}.{{method.name | caseCamel}}({%~ for parameter in method.parameters.all | filter((param) => param.required) ~%}
95-
{{parameter.name | escapeKeyword | caseCamel}}: {% if parameter.type == 'object' %}{}{% elseif parameter.type == 'file' %}InputFile.fromPath(path: './image.png'){% else %}'{{parameter.example}}'{%~ endif ~%},{%~ endfor ~%}
99+
{{parameter.name | escapeKeyword | caseCamel}}: {% if parameter.type == 'object' %}{}{% elseif parameter.type == 'array' %}[]{% elseif parameter.type == 'file' %}InputFile.fromPath(path: './image.png'){% elseif parameter.type == 'boolean' %}true{% elseif parameter.type == 'string' %}'{% if parameter.example is not empty %}{{parameter.example | escapeDollarSign}}{% endif %}'{% elseif parameter.type == 'integer' and parameter['x-example'] is empty %}1{% elseif parameter.type == 'number' and parameter['x-example'] is empty %}1.0{% else %}{{parameter.example}}{%~ endif ~%},{%~ endfor ~%}
96100
);
97101

98102
{%- if method.type == '___location' ~%}

templates/dart/test/src/enums_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import 'package:{{ language.params.packageName }}/src/enums.dart';
2+
{% if 'dart' in language.params.packageName %}
3+
import 'package:test/test.dart';
4+
{% else %}
25
import 'package:flutter_test/flutter_test.dart';
6+
{% endif %}
37

48
void main() {
59
group('name()', () {

templates/dart/test/src/models/model_test.dart.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>{% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier }}{% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, dynamic>{% else %}{{property | typeName}}{% endif %}{% endif %}{% endmacro %}
22
import 'package:{{ language.params.packageName }}/models.dart';
3+
{% if 'dart' in language.params.packageName %}
4+
import 'package:test/test.dart';
5+
{% else %}
36
import 'package:flutter_test/flutter_test.dart';
7+
{% endif %}
48

59
void main() {
610
group('{{ definition.name | caseUcfirst | overrideIdentifier }}', () {

0 commit comments

Comments
 (0)