Merge pull request #108 from Nexushunter/refactor-testing

Refactor testing

Author: gibahjoe

.github/workflows/code_quality.yml

@@ -25,9 +25,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Start Docker compose containers
-        if: ${{ matrix.work_dir == 'openapi-generator' }}
-        run: docker-compose -f "docker-compose.yaml" up -d --build
       - name: Setup Dart
         uses: dart-lang/setup-dart@v1.5.0
         with:
@@ -36,6 +33,9 @@ jobs:
         run: dart pub get
       - name: Validate formatting
         run: dart format ./ --set-exit-if-changed
+      - name: Generate Mocks
+        if: ${{ matrix.work_dir == 'openapi-generator' }}
+        run: dart run build_runner build --delete-conflicting-outputs
       - name: Run analyzer
         run: dart analyze --fatal-warnings
       - name: Run tests
@@ -51,9 +51,6 @@ jobs:
           verbose: true
           flags: ${{ matrix.work_dir }}
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      - name: Stop Docker Container
-        if: ${{ matrix.work_dir == 'openapi-generator' && always() }}
-        run: docker-compose -f "docker-compose.yaml" down
 
   build:
     name: Build example project 🛠️

example/pubspec.yaml

@@ -27,7 +27,11 @@ dependency_overrides:
     path: ../openapi-generator
   openapi_generator_cli:
     path: ../openapi-generator-cli
-
+  source_gen:
+    git:
+      ref: reviver
+      url: https://github.com/Nexushunter/source_gen
+      path: source_gen
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions

openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart

@@ -1,8 +1,11 @@
+library openapi_generator_annotations;
+
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
 import 'package:meta/meta.dart';
+import 'package:source_gen/source_gen.dart';
 
 /// Config base class
 /// Your annotated class must extend this config class
@@ -226,11 +229,6 @@ class RemoteSpec extends InputSpec {
   const RemoteSpec.empty() : this(path: 'http://localhost:8080/');
 
   Uri get url => Uri.parse(path);
-
-  RemoteSpec.fromMap(Map<String, dynamic> map)
-      : headerDelegate =
-            map['headerDelegate'] ?? const RemoteSpecHeaderDelegate(),
-        super.fromMap(map);
 }
 
 /// Default [RemoteSpecHeaderDelegate] used when retrieving a remote OAS spec.
@@ -266,12 +264,6 @@ class AWSRemoteSpecHeaderDelegate extends RemoteSpecHeaderDelegate {
     this.accessKeyId = null,
   }) : super();
 
-  AWSRemoteSpecHeaderDelegate.fromMap(Map<String, dynamic> map)
-      : bucket = map['bucket'],
-        accessKeyId = map['accessKeyId'],
-        secretAccessKey = map['secretAccessKey'],
-        super.fromMap(map);
-
   /// Generates the [header] map used within the GET request.
   ///
   /// Assumes that the user's auth AWS credentials

openapi-generator-annotations/pubspec.yaml

@@ -10,8 +10,16 @@ environment:
 dependencies:
   crypto: '>=3.0.0 <4.0.0'
   meta: '>=1.3.0 <2.0.0'
+  source_gen: 
 
 dev_dependencies:
   test:
   source_gen_test:
   lint:
+
+dependency_overrides:
+  source_gen:
+    git:
+      ref: reviver
+      url: https://github.com/Nexushunter/source_gen.git
+      path: source_gen

openapi-generator-annotations/test/openapi_generator_annotations_test.dart

@@ -91,6 +91,7 @@ void main() {
             expect(remote.path, 'http://localhost:8080/');
             expect(remote.headerDelegate, isA<RemoteSpecHeaderDelegate>());
           });
+
           test('uses path', () {
             final remote = RemoteSpec(path: 'https://example.com/path');
             expect(remote.path, 'https://example.com/path');
@@ -112,7 +113,6 @@ void main() {
               accessKeyId: 'test',
               secretAccessKey: 'test',
             );
-
             test('signs the url correctly', () {
               final now = DateTime.now();
               final actual = delegate.authHeaderContent(
@@ -176,6 +176,7 @@ void main() {
               }
             });
             test('uses the provided environment', () async {
+              print(Directory.current.path);
               final result = Process.runSync(
                 'dart',
                 [

openapi-generator/.gitignore

@@ -169,4 +169,6 @@ example/.dart_tool
 
 # Generated test output
 test/specs/test-cached.json
-test/specs/localstack/**
+test/specs/commands-cache.json
+test/specs/localstack
+test/mocks.mocks.dart

openapi-generator/Makefile

@@ -0,0 +1,4 @@
+.PHONY: gen
+
+gen:
+	dart run build_runner build --delete-conflicting-outputs

openapi-generator/docker-compose.yaml

@@ -1,8 +1,6 @@
 import 'dart:mirrors';
 
 import 'package:analyzer/dart/element/type.dart';
-import 'package:openapi_generator/src/utils.dart';
-import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
 import 'package:source_gen/source_gen.dart' show ConstantReader, TypeChecker;
 
 /// Extension adding the type methods to `ConstantReader`.
@@ -73,100 +71,3 @@ extension TypeMethods on ConstantReader {
     return values[enumIndex];
   }
 }
-
-extension ReadProperty on ConstantReader {
-  T readPropertyOrDefault<T>(String name, T defaultValue) {
-    final v = peek(name);
-    if (v == null) {
-      return defaultValue;
-    }
-
-    if (isA(v, InputSpec)) {
-      final revived = v.revive();
-
-      if (isA(v, RemoteSpec)) {
-        final map = revived.namedArguments;
-        final delegate = map['headerDelegate'];
-        final mapped = <String, dynamic>{
-          'path': convertToPropertyValue(map['path']!),
-        };
-        if (delegate?.isNull ?? true) {
-          return RemoteSpec.fromMap(mapped) as T;
-        } else {
-          final delegateReader = ConstantReader(delegate);
-          if (isA(delegateReader, AWSRemoteSpecHeaderDelegate)) {
-            mapped['headerDelegate'] = AWSRemoteSpecHeaderDelegate.fromMap(
-              delegateReader.revive().namedArguments.map(
-                    (key, value) => MapEntry(
-                      key,
-                      convertToPropertyValue(value),
-                    ),
-                  ),
-            );
-          }
-          return RemoteSpec.fromMap(mapped) as T;
-        }
-      } else {
-        final map = revived.namedArguments.map(
-          (key, value) => MapEntry(
-            key,
-            convertToPropertyValue(value),
-          ),
-        );
-        return InputSpec.fromMap(map) as T;
-      }
-    }
-
-    if (isA(v, AdditionalProperties)) {
-      final map = v.revive().namedArguments.map(
-            (key, value) => MapEntry(
-              key,
-              convertToPropertyValue(value),
-            ),
-          );
-      if (isA(v, DioProperties)) {
-        return DioProperties.fromMap(map) as T;
-      } else if (isA(v, DioAltProperties)) {
-        return DioAltProperties.fromMap(map) as T;
-      } else {
-        return AdditionalProperties.fromMap(map) as T;
-      }
-    }
-
-    if (isA(v, InlineSchemaOptions)) {
-      return InlineSchemaOptions.fromMap(
-        v.revive().namedArguments.map(
-              (key, value) => MapEntry(
-                key,
-                convertToPropertyValue(value),
-              ),
-            ),
-      ) as T;
-    }
-
-    if (isA(v, Map<String, String>)) {
-      return v.mapValue.map((key, value) => MapEntry(
-          convertToPropertyValue(key!) as String,
-          convertToPropertyValue(value!) as String)) as T;
-    } else if (isA(v, bool)) {
-      return v.boolValue as T;
-    } else if (isA(v, double)) {
-      return v.doubleValue as T;
-    } else if (isA(v, int)) {
-      return v.intValue as T;
-    } else if (isA(v, String)) {
-      return v.stringValue as T;
-    } else if (isA(v, Set)) {
-      return v.setValue.map(convertToPropertyValue) as T;
-    } else if (isA(v, List)) {
-      return v.listValue.map(convertToPropertyValue) as T;
-    } else if (isA(v, Enum)) {
-      return v.enumValue();
-    } else {
-      return defaultValue;
-    }
-  }
-}
-
-bool isA(ConstantReader? v, Type t) =>
-    v?.instanceOf(TypeChecker.fromRuntime(t)) ?? false;

openapi-generator/lib/src/extensions/type_methods.dart

@@ -59,23 +59,23 @@ FutureOr<Map<String, dynamic>> loadSpec(
     }
   } else {
     Map<String, String>? headers;
-    if (specConfig.headerDelegate is AWSRemoteSpecHeaderDelegate) {
-      try {
-        headers = (specConfig.headerDelegate as AWSRemoteSpecHeaderDelegate)
-            .header(path: specConfig.url.path);
-      } catch (e, st) {
-        return Future.error(
-          OutputMessage(
-            message: 'failed to generate AWS headers',
-            additionalContext: e,
-            stackTrace: st,
-            level: Level.SEVERE,
-          ),
-        );
-      }
-    } else {
-      headers = specConfig.headerDelegate.header();
-    }
+    // if (specConfig.headerDelegate is AWSRemoteSpecHeaderDelegate) {
+    //   try {
+    //     headers = (specConfig.headerDelegate as AWSRemoteSpecHeaderDelegate)
+    //         .header(path: specConfig.url.path);
+    //   } catch (e, st) {
+    //     return Future.error(
+    //       OutputMessage(
+    //         message: 'failed to generate AWS headers',
+    //         additionalContext: e,
+    //         stackTrace: st,
+    //         level: Level.SEVERE,
+    //       ),
+    //     );
+    //   }
+    // } else {
+    //   headers = specConfig.headerDelegate.header();
+    // }
 
     final resp = await http.get(specConfig.url, headers: headers);
     if (resp.statusCode == 200) {