From c6d5c0313af7620353eaba28bac64571caa1a765 Mon Sep 17 00:00:00 2001
From: Ricardo Boss <mail@ricardoboss.de>
Date: Thu, 4 Apr 2024 03:32:24 +0200
Subject: [PATCH] Test and fix sendPrimitive

---
 .github/workflows/dart.yml                    |   2 +-
 .run/watch kiota_abstractions.run.xml         |  17 +
 ...watch.run.xml => watch kiota_http.run.xml} |   4 +-
 .../lib/src/http_client_request_adapter.dart  |  61 +--
 packages/kiota_http/pubspec.yaml              |   2 +
 packages/kiota_http/test/dummy_test.dart      |   7 -
 .../http_client_request_adapter_test.dart     |  67 +++
 ...ttp_client_request_adapter_test.mocks.dart | 482 ++++++++++++++++++
 8 files changed, 594 insertions(+), 48 deletions(-)
 create mode 100644 .run/watch kiota_abstractions.run.xml
 rename .run/{build_runner watch.run.xml => watch kiota_http.run.xml} (87%)
 delete mode 100644 packages/kiota_http/test/dummy_test.dart
 create mode 100644 packages/kiota_http/test/http_client_request_adapter_test.dart
 create mode 100644 packages/kiota_http/test/http_client_request_adapter_test.mocks.dart

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 8e04434..3485f35 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -42,7 +42,7 @@ jobs:
         working-directory: packages/${{ matrix.package }}
 
       - name: Run build_runner
-        if: contains(fromJson('[ "kiota_abstractions" ]'), matrix.package)
+        if: contains(fromJson('[ "kiota_abstractions", "kiota_http" ]'), matrix.package)
         run: dart run build_runner build --delete-conflicting-outputs
         working-directory: packages/${{ matrix.package }}
 
diff --git a/.run/watch kiota_abstractions.run.xml b/.run/watch kiota_abstractions.run.xml
new file mode 100644
index 0000000..6917eea
--- /dev/null
+++ b/.run/watch kiota_abstractions.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="watch kiota_abstractions" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="dart run build_runner watch" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/packages/kiota_abstractions/" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/build_runner watch.run.xml b/.run/watch kiota_http.run.xml
similarity index 87%
rename from .run/build_runner watch.run.xml
rename to .run/watch kiota_http.run.xml
index 2ee9648..bd6d3ce 100644
--- a/.run/build_runner watch.run.xml	
+++ b/.run/watch kiota_http.run.xml	
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="build_runner watch" type="ShConfigurationType">
+  <configuration default="false" name="watch kiota_http" type="ShConfigurationType">
     <option name="SCRIPT_TEXT" value="dart run build_runner watch" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
     <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/packages/kiota_http/" />
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
diff --git a/packages/kiota_http/lib/src/http_client_request_adapter.dart b/packages/kiota_http/lib/src/http_client_request_adapter.dart
index a31cb31..b5a39b9 100644
--- a/packages/kiota_http/lib/src/http_client_request_adapter.dart
+++ b/packages/kiota_http/lib/src/http_client_request_adapter.dart
@@ -247,45 +247,30 @@ class HttpClientRequestAdapter implements RequestAdapter {
       return null;
     }
 
-    if (ModelType is bool?) {
-      return rootNode.getBoolValue() as ModelType;
-    }
-
-    if (ModelType is int?) {
-      return rootNode.getIntValue() as ModelType;
-    }
-
-    if (ModelType is double?) {
-      return rootNode.getDoubleValue() as ModelType;
-    }
-
-    if (ModelType is String?) {
-      return rootNode.getStringValue() as ModelType;
-    }
-
-    if (ModelType is DateTime?) {
-      return rootNode.getDateTimeValue() as ModelType;
-    }
-
-    if (ModelType is DateOnly?) {
-      return rootNode.getDateOnlyValue() as ModelType;
-    }
-
-    if (ModelType is TimeOnly?) {
-      return rootNode.getTimeOnlyValue() as ModelType;
-    }
-
-    if (ModelType is Duration?) {
-      return rootNode.getDurationValue() as ModelType;
-    }
-
-    if (ModelType is UuidValue?) {
-      return rootNode.getGuidValue() as ModelType;
+    switch (ModelType) {
+      case const (bool):
+        return rootNode.getBoolValue() as ModelType;
+      case const (int):
+        return rootNode.getIntValue() as ModelType;
+      case const (double):
+        return rootNode.getDoubleValue() as ModelType;
+      case const (String):
+        return rootNode.getStringValue() as ModelType;
+      case const (DateTime):
+        return rootNode.getDateTimeValue() as ModelType;
+      case const (DateOnly):
+        return rootNode.getDateOnlyValue() as ModelType;
+      case const (TimeOnly):
+        return rootNode.getTimeOnlyValue() as ModelType;
+      case const (Duration):
+        return rootNode.getDurationValue() as ModelType;
+      case const (UuidValue):
+        return rootNode.getGuidValue() as ModelType;
+      default:
+        throw ArgumentError(
+          'The type $ModelType is not supported for primitive deserialization',
+        );
     }
-
-    throw ArgumentError(
-      'The type $ModelType is not supported for primitive deserialization',
-    );
   }
 
   @override
diff --git a/packages/kiota_http/pubspec.yaml b/packages/kiota_http/pubspec.yaml
index 64abdb5..5e7ffe9 100644
--- a/packages/kiota_http/pubspec.yaml
+++ b/packages/kiota_http/pubspec.yaml
@@ -17,3 +17,5 @@ dependencies:
 dev_dependencies:
   strict: ^2.0.0
   test: ^1.25.2
+  mockito: ^5.4.4
+  build_runner: ^2.4.8
diff --git a/packages/kiota_http/test/dummy_test.dart b/packages/kiota_http/test/dummy_test.dart
deleted file mode 100644
index 4db2e30..0000000
--- a/packages/kiota_http/test/dummy_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:test/test.dart';
-
-void main() {
-  test('dummy test', () {
-    expect(1, 1);
-  });
-}
diff --git a/packages/kiota_http/test/http_client_request_adapter_test.dart b/packages/kiota_http/test/http_client_request_adapter_test.dart
new file mode 100644
index 0000000..3b9b730
--- /dev/null
+++ b/packages/kiota_http/test/http_client_request_adapter_test.dart
@@ -0,0 +1,67 @@
+import 'dart:typed_data';
+
+import 'package:http/http.dart' as http;
+import 'package:kiota_abstractions/kiota_abstractions.dart';
+import 'package:kiota_http/kiota_http.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:test/test.dart';
+
+import 'http_client_request_adapter_test.mocks.dart';
+
+@GenerateMocks([
+  http.Client,
+  AuthenticationProvider,
+  ParseNodeFactory,
+  SerializationWriterFactory,
+  ParseNode,
+])
+void main() {
+  group('HttpClientRequestAdapter', () {
+    test('sendPrimitive String', () async {
+      final client = MockClient();
+      final authProvider = MockAuthenticationProvider();
+      final pNodeFactory = MockParseNodeFactory();
+      final sWriterFactory = MockSerializationWriterFactory();
+      final parseNode = MockParseNode();
+
+      const stringContent = 'Hello, World!';
+      final contentBytes = Uint8List.fromList(stringContent.codeUnits);
+
+      final adapter = HttpClientRequestAdapter(
+        client: client,
+        authProvider: authProvider,
+        pNodeFactory: pNodeFactory,
+        sWriterFactory: sWriterFactory,
+      );
+
+      final info = RequestInformation(
+        httpMethod: HttpMethod.get,
+        urlTemplate: 'https://example.test/primitive',
+      );
+
+      when(authProvider.authenticateRequest(info))
+          .thenAnswer((_) async => Future<void>.value());
+
+      when(client.send(any)).thenAnswer((_) async {
+        return http.StreamedResponse(
+          Stream.fromIterable([contentBytes]),
+          200,
+          headers: {
+            'content-type': 'text/plain',
+          },
+        );
+      });
+
+      when(pNodeFactory.getRootParseNode('text/plain', contentBytes))
+          .thenReturn(parseNode);
+
+      when(parseNode.getStringValue()).thenReturn(stringContent);
+
+      final stringResult = await adapter.sendPrimitive<String>(info);
+
+      expect(stringResult, isNotNull);
+      expect(stringResult, stringContent);
+    });
+  });
+}
diff --git a/packages/kiota_http/test/http_client_request_adapter_test.mocks.dart b/packages/kiota_http/test/http_client_request_adapter_test.mocks.dart
new file mode 100644
index 0000000..dac4f8a
--- /dev/null
+++ b/packages/kiota_http/test/http_client_request_adapter_test.mocks.dart
@@ -0,0 +1,482 @@
+// Mocks generated by Mockito 5.4.4 from annotations
+// in kiota_http/test/http_client_request_adapter_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+import 'dart:convert' as _i5;
+import 'dart:typed_data' as _i7;
+
+import 'package:http/http.dart' as _i2;
+import 'package:kiota_abstractions/kiota_abstractions.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeResponse_0 extends _i1.SmartFake implements _i2.Response {
+  _FakeResponse_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeStreamedResponse_1 extends _i1.SmartFake
+    implements _i2.StreamedResponse {
+  _FakeStreamedResponse_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeParseNode_2 extends _i1.SmartFake implements _i3.ParseNode {
+  _FakeParseNode_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeSerializationWriter_3 extends _i1.SmartFake
+    implements _i3.SerializationWriter {
+  _FakeSerializationWriter_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [Client].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockClient extends _i1.Mock implements _i2.Client {
+  MockClient() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Future<_i2.Response> head(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #head,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #head,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<_i2.Response> get(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #get,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #get,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<_i2.Response> post(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i5.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #post,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #post,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<_i2.Response> put(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i5.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #put,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #put,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<_i2.Response> patch(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i5.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #patch,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #patch,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<_i2.Response> delete(
+    Uri? url, {
+    Map<String, String>? headers,
+    Object? body,
+    _i5.Encoding? encoding,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #delete,
+          [url],
+          {
+            #headers: headers,
+            #body: body,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Response>.value(_FakeResponse_0(
+          this,
+          Invocation.method(
+            #delete,
+            [url],
+            {
+              #headers: headers,
+              #body: body,
+              #encoding: encoding,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Response>);
+
+  @override
+  _i4.Future<String> read(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #read,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i4.Future<String>.value(_i6.dummyValue<String>(
+          this,
+          Invocation.method(
+            #read,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i4.Future<String>);
+
+  @override
+  _i4.Future<_i7.Uint8List> readBytes(
+    Uri? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #readBytes,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i4.Future<_i7.Uint8List>.value(_i7.Uint8List(0)),
+      ) as _i4.Future<_i7.Uint8List>);
+
+  @override
+  _i4.Future<_i2.StreamedResponse> send(_i2.BaseRequest? request) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #send,
+          [request],
+        ),
+        returnValue:
+            _i4.Future<_i2.StreamedResponse>.value(_FakeStreamedResponse_1(
+          this,
+          Invocation.method(
+            #send,
+            [request],
+          ),
+        )),
+      ) as _i4.Future<_i2.StreamedResponse>);
+
+  @override
+  void close() => super.noSuchMethod(
+        Invocation.method(
+          #close,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [AuthenticationProvider].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAuthenticationProvider extends _i1.Mock
+    implements _i3.AuthenticationProvider {
+  MockAuthenticationProvider() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Future<void> authenticateRequest(
+    _i3.RequestInformation? request, [
+    Map<String, Object>? additionalAuthenticationContext,
+  ]) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #authenticateRequest,
+          [
+            request,
+            additionalAuthenticationContext,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [ParseNodeFactory].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockParseNodeFactory extends _i1.Mock implements _i3.ParseNodeFactory {
+  MockParseNodeFactory() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get validContentType => (super.noSuchMethod(
+        Invocation.getter(#validContentType),
+        returnValue: _i6.dummyValue<String>(
+          this,
+          Invocation.getter(#validContentType),
+        ),
+      ) as String);
+
+  @override
+  _i3.ParseNode getRootParseNode(
+    String? contentType,
+    _i7.Uint8List? content,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getRootParseNode,
+          [
+            contentType,
+            content,
+          ],
+        ),
+        returnValue: _FakeParseNode_2(
+          this,
+          Invocation.method(
+            #getRootParseNode,
+            [
+              contentType,
+              content,
+            ],
+          ),
+        ),
+      ) as _i3.ParseNode);
+}
+
+/// A class which mocks [SerializationWriterFactory].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockSerializationWriterFactory extends _i1.Mock
+    implements _i3.SerializationWriterFactory {
+  MockSerializationWriterFactory() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get validContentType => (super.noSuchMethod(
+        Invocation.getter(#validContentType),
+        returnValue: _i6.dummyValue<String>(
+          this,
+          Invocation.getter(#validContentType),
+        ),
+      ) as String);
+
+  @override
+  _i3.SerializationWriter getSerializationWriter(String? contentType) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getSerializationWriter,
+          [contentType],
+        ),
+        returnValue: _FakeSerializationWriter_3(
+          this,
+          Invocation.method(
+            #getSerializationWriter,
+            [contentType],
+          ),
+        ),
+      ) as _i3.SerializationWriter);
+}
+
+/// A class which mocks [ParseNode].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockParseNode extends _i1.Mock implements _i3.ParseNode {
+  MockParseNode() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set onBeforeAssignFieldValues(_i3.ParsableHook? _onBeforeAssignFieldValues) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onBeforeAssignFieldValues,
+          _onBeforeAssignFieldValues,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  set onAfterAssignFieldValues(_i3.ParsableHook? _onAfterAssignFieldValues) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onAfterAssignFieldValues,
+          _onAfterAssignFieldValues,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i3.ParseNode? getChildNode(String? identifier) =>
+      (super.noSuchMethod(Invocation.method(
+        #getChildNode,
+        [identifier],
+      )) as _i3.ParseNode?);
+
+  @override
+  Iterable<T> getCollectionOfPrimitiveValues<T>() => (super.noSuchMethod(
+        Invocation.method(
+          #getCollectionOfPrimitiveValues,
+          [],
+        ),
+        returnValue: <T>[],
+      ) as Iterable<T>);
+
+  @override
+  Iterable<T> getCollectionOfEnumValues<T extends Enum>() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCollectionOfEnumValues,
+          [],
+        ),
+        returnValue: <T>[],
+      ) as Iterable<T>);
+
+  @override
+  Iterable<T> getCollectionOfObjectValues<T extends _i3.Parsable>(
+          _i3.ParsableFactory<T>? factory) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCollectionOfObjectValues,
+          [factory],
+        ),
+        returnValue: <T>[],
+      ) as Iterable<T>);
+
+  @override
+  T? getObjectValue<T extends _i3.Parsable>(_i3.ParsableFactory<T>? factory) =>
+      (super.noSuchMethod(Invocation.method(
+        #getObjectValue,
+        [factory],
+      )) as T?);
+}