fixup! feat: improve DataSchemaValue handling

eclipse-thingweb · Dec 23, 2023 · 8598ea4 · 8598ea4
1 parent db7697e
commit 8598ea4
Showing 1 changed file with 103 additions and 106 deletions.
diff --git a/test/core/content_serdes_test.dart b/test/core/content_serdes_test.dart
@@ -17,112 +17,109 @@ Content _getTestContent(String input) {
 
 void main() {
   group('Content Serdes Tests', () {
-    setUp(() {
-      // Additional setup goes here.
+    test('Content Validation', () async {
+      final contentSerdes = ContentSerdes();
+
+      final testContent1 = _getTestContent('42');
+      final successfulSchema = DataSchema.fromJson(
+        <String, dynamic>{'type': 'number'},
+        PrefixMapping(),
+      );
+
+      expect(
+        await contentSerdes.contentToValue(testContent1, successfulSchema),
+        42,
+      );
+
+      final testContent2 = _getTestContent('42');
+      final failingSchema = DataSchema.fromJson(
+        <String, dynamic>{'type': 'string'},
+        PrefixMapping(),
+      );
+
+      expect(
+        contentSerdes.contentToValue(testContent2, failingSchema),
+        throwsA(const TypeMatcher<ContentSerdesException>()),
+      );
+
+      expect(
+        () =>
+            contentSerdes.valueToContent(42, failingSchema, 'application/json'),
+        throwsA(const TypeMatcher<ContentSerdesException>()),
+      );
+
+      final testContent3 = _getTestContent('');
+      expect(
+        await contentSerdes.contentToValue(testContent3, null),
+        null,
+      );
+    });
+    test('Codec Registration', () async {
+      final contentSerdes = ContentSerdes();
+
+      expect(
+        contentSerdes.supportedMediaTypes,
+        ['application/json', 'application/cbor', 'application/link-format'],
+      );
+
+      expect(
+        contentSerdes.offeredMediaTypes,
+        ['application/json', 'application/cbor'],
+      );
+
+      expect(
+        () => contentSerdes.addOfferedMediaType('application/xml'),
+        throwsArgumentError,
+      );
+
+      contentSerdes.addOfferedMediaType('application/td+json; charset=utf-8');
+
+      expect(
+        contentSerdes.offeredMediaTypes,
+        [
+          'application/json',
+          'application/cbor',
+          'application/td+json; charset=utf-8',
+        ],
+      );
+
+      contentSerdes.removeOfferedMediaType('application/json');
+
+      expect(
+        contentSerdes.offeredMediaTypes,
+        [
+          'application/cbor',
+          'application/td+json; charset=utf-8',
+        ],
+      );
+
+      contentSerdes
+        ..assignCodec('application/xml', JsonCodec())
+        ..addOfferedMediaType('application/xml');
+
+      expect(
+        contentSerdes.supportedMediaTypes,
+        [
+          'application/json',
+          'application/cbor',
+          'application/link-format',
+          'application/xml',
+        ],
+      );
+
+      expect(
+        contentSerdes.offeredMediaTypes,
+        [
+          'application/cbor',
+          'application/td+json; charset=utf-8',
+          'application/xml',
+        ],
+      );
+
+      expect(
+        () => contentSerdes.assignCodec('foo', JsonCodec()),
+        throwsArgumentError,
+      );
     });
-  });
-
-  test('Content Validation', () async {
-    final contentSerdes = ContentSerdes();
-
-    final testContent1 = _getTestContent('42');
-    final successfulSchema = DataSchema.fromJson(
-      <String, dynamic>{'type': 'number'},
-      PrefixMapping(),
-    );
-
-    expect(
-      await contentSerdes.contentToValue(testContent1, successfulSchema),
-      42,
-    );
-
-    final testContent2 = _getTestContent('42');
-    final failingSchema = DataSchema.fromJson(
-      <String, dynamic>{'type': 'string'},
-      PrefixMapping(),
-    );
-
-    expect(
-      contentSerdes.contentToValue(testContent2, failingSchema),
-      throwsA(const TypeMatcher<ContentSerdesException>()),
-    );
-
-    expect(
-      () => contentSerdes.valueToContent(42, failingSchema, 'application/json'),
-      throwsA(const TypeMatcher<ContentSerdesException>()),
-    );
-
-    final testContent3 = _getTestContent('');
-    expect(
-      await contentSerdes.contentToValue(testContent3, null),
-      null,
-    );
-  });
-  test('Codec Registration', () async {
-    final contentSerdes = ContentSerdes();
-
-    expect(
-      contentSerdes.supportedMediaTypes,
-      ['application/json', 'application/cbor', 'application/link-format'],
-    );
-
-    expect(
-      contentSerdes.offeredMediaTypes,
-      ['application/json', 'application/cbor'],
-    );
-
-    expect(
-      () => contentSerdes.addOfferedMediaType('application/xml'),
-      throwsArgumentError,
-    );
-
-    contentSerdes.addOfferedMediaType('application/td+json; charset=utf-8');
-
-    expect(
-      contentSerdes.offeredMediaTypes,
-      [
-        'application/json',
-        'application/cbor',
-        'application/td+json; charset=utf-8',
-      ],
-    );
-
-    contentSerdes.removeOfferedMediaType('application/json');
-
-    expect(
-      contentSerdes.offeredMediaTypes,
-      [
-        'application/cbor',
-        'application/td+json; charset=utf-8',
-      ],
-    );
-
-    contentSerdes
-      ..assignCodec('application/xml', JsonCodec())
-      ..addOfferedMediaType('application/xml');
-
-    expect(
-      contentSerdes.supportedMediaTypes,
-      [
-        'application/json',
-        'application/cbor',
-        'application/link-format',
-        'application/xml',
-      ],
-    );
-
-    expect(
-      contentSerdes.offeredMediaTypes,
-      [
-        'application/cbor',
-        'application/td+json; charset=utf-8',
-        'application/xml',
-      ],
-    );
-
-    expect(
-      () => contentSerdes.assignCodec('foo', JsonCodec()),
-      throwsArgumentError,
-    );
   });
 }