From 84a06843e0853853f3d16b4b2b7c0a4d8fd70542 Mon Sep 17 00:00:00 2001
From: "thomashii@dukefirehawk.com" <thomashii@dukefirehawk.com>
Date: Sun, 5 Nov 2023 17:34:41 +0800
Subject: [PATCH] Fixed mismatch messages

---
 packages/test/CHANGELOG.md          |  8 ++++---
 packages/test/lib/src/matchers.dart |  7 +++---
 packages/test/test/simple_test.dart | 36 +++++++++++------------------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/packages/test/CHANGELOG.md b/packages/test/CHANGELOG.md
index e0abebd7..978a8865 100644
--- a/packages/test/CHANGELOG.md
+++ b/packages/test/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## 8.0.1
 
-* Added `describeMismatch` to `hasStatus`
-* Added `describeMismatch` to `hasContentType`
-* Added `describeMismatch` to `hasValidBody`
+* Fixed `hasStatus` mismatch message
+* Fixed `hasContentType` mismatch message
+* Fixed `hasValidBody` mismatch message
+* Fixed `hasHeader` mismatch message
+* Fixed `hasHeader` failed test case
 
 ## 8.0.0
 
diff --git a/packages/test/lib/src/matchers.dart b/packages/test/lib/src/matchers.dart
index 15627247..875618a0 100644
--- a/packages/test/lib/src/matchers.dart
+++ b/packages/test/lib/src/matchers.dart
@@ -153,11 +153,10 @@ class _HasHeader extends Matcher {
         return contains(key.toLowerCase())
             .matches(item.headers.keys, matchState);
       } else {
-        if (!item.headers.containsKey(key.toLowerCase())) return false;
+        var headerKey = item.headers[key.toLowerCase()];
+        if (headerKey == null) return false;
         var v = value is Iterable ? (value as Iterable) : [value];
-        return v
-            .map((x) => x.toString())
-            .every(item.headers[key.toLowerCase()]!.split(',').contains);
+        return v.map((x) => x.toString()).every(headerKey.split(',').contains);
       }
     } else {
       return false;
diff --git a/packages/test/test/simple_test.dart b/packages/test/test/simple_test.dart
index 431da3a4..822364d2 100644
--- a/packages/test/test/simple_test.dart
+++ b/packages/test/test/simple_test.dart
@@ -1,7 +1,9 @@
+import 'dart:convert';
 import 'dart:io';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_container/mirrors.dart';
 import 'package:angel3_test/angel3_test.dart';
+import 'package:angel3_validate/angel3_validate.dart';
 import 'package:angel3_websocket/server.dart';
 import 'package:test/test.dart';
 
@@ -12,7 +14,7 @@ void main() {
   setUp(() async {
     app = Angel(reflector: MirrorsReflector())
       ..get('/hello', (req, res) => 'Hello')
-      ..get('/user_info', (req, res) => {'u': req.uri!.userInfo})
+      ..get('/user_info', (req, res) => {'u': req.uri?.userInfo})
       ..get(
           '/error',
           (req, res) => throw AngelHttpException.forbidden(message: 'Test')
@@ -66,32 +68,23 @@ void main() {
         final response = await client.get(Uri.parse('/hello'));
         expect(response, isJson('Hello'));
       });
-    });
-  });
-
-/*
-  group('matchers', () {
-    group('isJson+hasStatus', () {
-      test('get', () async {
-        final response = await client.get('/hello');
-        expect(response, isJson('Hello'));
-      });
 
       test('post', () async {
-        final response = await client.post('/hello', body: {'foo': 'baz'});
+        final response =
+            await client.post(Uri.parse('/hello'), body: {'foo': 'baz'});
         expect(response, allOf(hasStatus(200), isJson({'bar': 'baz'})));
       });
     });
 
     test('isAngelHttpException', () async {
-      var res = await client.get('/error');
+      var res = await client.get(Uri.parse('/error'));
       print(res.body);
       expect(res, isAngelHttpException());
       expect(
           res,
           isAngelHttpException(
               statusCode: 403, message: 'Test', errors: ['foo', 'bar']));
-    });
+    }, skip: 'This is a bug to be fixed, skip for now');
 
     test('userInfo from Uri', () async {
       var url = Uri(userInfo: 'foo:bar', path: '/user_info');
@@ -106,7 +99,7 @@ void main() {
       var url = Uri(path: '/user_info');
       print('URL: $url');
       var res = await client.get(url, headers: {
-        'authorization': 'Basic ' + (base64Url.encode(utf8.encode('foo:bar')))
+        'authorization': 'Basic ${base64Url.encode(utf8.encode('foo:bar'))}'
       });
       print(res.body);
       var m = json.decode(res.body) as Map;
@@ -114,20 +107,20 @@ void main() {
     });
 
     test('hasBody', () async {
-      var res = await client.get('/body');
+      var res = await client.get(Uri.parse('/body'));
       expect(res, hasBody());
       expect(res, hasBody('OK'));
     });
 
     test('hasHeader', () async {
-      var res = await client.get('/hello');
+      var res = await client.get(Uri.parse('/hello'));
       expect(res, hasHeader('server'));
-      expect(res, hasHeader('server', 'angel'));
-      expect(res, hasHeader('server', ['angel']));
+      expect(res, hasHeader('server', 'Angel3'));
+      expect(res, hasHeader('server', ['Angel3']));
     });
 
     test('hasValidBody+hasContentType', () async {
-      var res = await client.get('/valid');
+      var res = await client.get(Uri.parse('/valid'));
       print('Body: ${res.body}');
       expect(res, hasContentType('application/json'));
       expect(res, hasContentType(ContentType('application', 'json')));
@@ -143,7 +136,7 @@ void main() {
     });
 
     test('gzip decode', () async {
-      var res = await client.get('/gzip');
+      var res = await client.get(Uri.parse('/gzip'));
       print('Body: ${res.body}');
       expect(res, hasHeader('content-encoding', 'gzip'));
       expect(res, hasBody('Poop'));
@@ -174,5 +167,4 @@ void main() {
           equals(<String, dynamic>{'foo': 'bar'}));
     });
   });
-  */
 }