Modify unit tests for typescript-fetch, issue 21259 to check for closing parens & fix a typo in TypeScriptFetchModelTest

Author: cgual-omnidian

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java

@@ -356,19 +356,21 @@ public void givenSchemaIsOneOfAndComposedSchemasArePrimitiveThenReturnStatements
 
         Path exampleModelPath = Paths.get(outputPath + "/models/MyCustomSpeed.ts");
         //FromJSON
-        TestUtils.assertFileContains(exampleModelPath, "typeof json === 'number'");
-        TestUtils.assertFileContains(exampleModelPath, "typeof json === 'string'");
-        TestUtils.assertFileContains(exampleModelPath, "json === 'fixed-value-a' || json === 'fixed-value-b' || json === 'fixed-value-c'");
-        TestUtils.assertFileContains(exampleModelPath, "isNaN(new Date(json).getTime())");
-        TestUtils.assertFileContains(exampleModelPath, "json.every(item => typeof item === 'number'");
-        TestUtils.assertFileContains(exampleModelPath, "json.every(item => typeof item === 'string' && (item === 'oneof-array-enum-a' || item === 'oneof-array-enum-b' || item === 'oneof-array-enum-c')");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof json !== 'object')");
+        TestUtils.assertFileContains(exampleModelPath, "(instanceOfMyNumericValue(json))");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof json === 'number' && (json === 10 || json === 20 || json === 30))");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof json === 'string' && (json === 'fixed-value-a' || json === 'fixed-value-b' || json === 'fixed-value-c'))");
+        TestUtils.assertFileContains(exampleModelPath, "(isNaN(new Date(json).getTime())");
+        TestUtils.assertFileContains(exampleModelPath, "(json.every(item => typeof item === 'number'))");
+        TestUtils.assertFileContains(exampleModelPath, "(json.every(item => typeof item === 'string' && (item === 'oneof-array-enum-a' || item === 'oneof-array-enum-b' || item === 'oneof-array-enum-c')))");
         //ToJSON
-        TestUtils.assertFileContains(exampleModelPath, "typeof value === 'number'");
-        TestUtils.assertFileContains(exampleModelPath, "typeof value === 'string'");
-        TestUtils.assertFileContains(exampleModelPath, "value === 'fixed-value-a' || value === 'fixed-value-b' || value === 'fixed-value-c'");
-        TestUtils.assertFileContains(exampleModelPath, "value instanceof Date");
-        TestUtils.assertFileContains(exampleModelPath, "value.every(item => typeof item === 'number'");
-        TestUtils.assertFileContains(exampleModelPath, "value.every(item => typeof item === 'string' && (item === 'oneof-array-enum-a' || item === 'oneof-array-enum-b' || item === 'oneof-array-enum-c')");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof value !== 'object')");
+        TestUtils.assertFileContains(exampleModelPath, "(instanceOfMyNumericValue(value))");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof value === 'number' && (value === 10 || value === 20 || value === 30))");
+        TestUtils.assertFileContains(exampleModelPath, "(typeof value === 'string' && (value === 'fixed-value-a' || value === 'fixed-value-b' || value === 'fixed-value-c'))");
+        TestUtils.assertFileContains(exampleModelPath, "(value instanceof Date)");
+        TestUtils.assertFileContains(exampleModelPath, "(value.every(item => typeof item === 'number'))");
+        TestUtils.assertFileContains(exampleModelPath, "(value.every(item => typeof item === 'string' && (item === 'oneof-array-enum-a' || item === 'oneof-array-enum-b' || item === 'oneof-array-enum-c')))");
     }
 
     /**

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java

@@ -47,7 +47,7 @@
 @SuppressWarnings("static-method")
 public class TypeScriptFetchModelTest {
 
-    @Test(description = "convert a simple TypeScript Angular model")
+    @Test(description = "convert a simple TypeScript Fetch model")
     public void simpleModelTest() {
         final Schema model = new Schema()
                 .description("a sample model")