fix: add multiple blackbox tests and fix small bugs (#371)

Co-authored-by: Maciej Urbańczyk <urbanczyk.maciej.95@gmail.com>
Co-authored-by: Alejandra Quetzalli  <19964402+alequetzalli@users.noreply.github.com>

Author: 3 people

.github/workflows/blackbox-testing.yml

@@ -32,5 +32,8 @@ jobs:
       - if: matrix.os == 'windows-latest'
         name: Setup csc.exe
         uses: yoavain/Setup-CSC@v7
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.8'
       - name: Test output
         run: npm run test:blackbox

Dockerfile

@@ -9,7 +9,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
     && apt-get install -yq nodejs 
 
 # Install golang
-RUN curl -fsSL https://golang.org/dl/go1.16.5.linux-amd64.tar.gz | tar -C /usr/local -xz
+RUN curl -fsSL https://golang.org/dl/go1.16.8.linux-amd64.tar.gz | tar -C /usr/local -xz
 ENV PATH="${PATH}:/usr/local/go/bin"
 
 # Install dotnet SDK

docs/development.md

@@ -7,24 +7,15 @@ You can either build the image and run the needed commands manually or rather us
 
 - `npm run docker:build` builds the docker image with the tag `asyncapi/modelina` (the rest of the scripts run this one as well).
 - `npm run docker:test` runs the main test suite.
-- `npm run docker:test:blackbox` runs the blackbox test suite.
+- `npm run docker:test:blackbox` runs the BlackBox test suite.
 
 ## Environment setup
 
 To setup the environment follow these steps:
 1. Setup the project by first installing the dependencies `npm install`
 2. Make sure the tests pass by running `npm run test` script
-    - [Blackbox testing](#blackbox-testing) are excluded when running the `test` script because it require some extra setup. Please refer to [Blackbox testing section](#blackbox-testing) below.
     - You can update snapshots by running `npm run test -- -u`
 3. Make sure code is well formatted and secure `npm run lint`
 
-## Blackbox testing
-Please refer to [Docker section](#docker) above if you wanna run the tests directly in Docker without configuring anything extra on your machine. 
-If you prefer to install all the dependencies locally, keep reading.
-
-The blackbox testing have some different requirements in order to successfully run:
-- To to run the `java` blackbox tests, you need to have JDK installed.
-- To to run the `ts` blackbox tests, you need to have TypeScript installed globally - `npm install -g typescript`.
-- To to run the `C#` blackbox tests, you need to have C# compiler installed globally. - https://www.mono-project.com/download/stable/
-
-By default the blackbox tests are not run with the regular `npm run test`, but can be run with `npm run test:blackbox`.
+## BlackBox testing
+We have several BlackBox tests that are run separately from the `npm run test` script. Please refer to the [BlackBox documentation](../test/blackbox) for further information.

src/generators/csharp/CSharpGenerator.ts

@@ -32,12 +32,15 @@ export class CSharpGenerator extends AbstractGenerator<CSharpOptions> {
   render(model: CommonModel, inputModel: CommonInputModel): Promise<RenderOutput> {
     const kind = TypeHelpers.extractKind(model);
     switch (kind) {
+    case ModelKind.UNION:
+      //We dont support union in Csharp generator, however, if union is an object, we render it as a class.
+      if (!model.type?.includes('object')) {break;}
+      return this.renderClass(model, inputModel);
     case ModelKind.OBJECT: 
       return this.renderClass(model, inputModel);
     case ModelKind.ENUM: 
       return this.renderEnum(model, inputModel);
     }
-
     return Promise.resolve(RenderOutput.toRenderOutput({ result: '', dependencies: [] }));
   }
 

src/generators/csharp/CSharpRenderer.ts

@@ -68,10 +68,6 @@ export abstract class CSharpRenderer extends AbstractRenderer<CSharpOptions> {
   }
 
   toCSharpType(type: string | undefined, model: CommonModel): string {
-    if (type === undefined) {
-      return 'dynamic';
-    }
-
     switch (type) {
     case 'string':
       return 'string';
@@ -90,7 +86,7 @@ export abstract class CSharpRenderer extends AbstractRenderer<CSharpOptions> {
       const arrayType = model.items ? this.renderType(model.items) : 'dynamic';
       return `${arrayType}[]`;
     }
-    default: return type;
+    default: return 'dynamic';
     }
   }
 }

src/generators/go/GoGenerator.ts

@@ -55,12 +55,15 @@ export class GoGenerator extends AbstractGenerator<GoOptions> {
   render(model: CommonModel, inputModel: CommonInputModel): Promise<RenderOutput> {
     const kind = TypeHelpers.extractKind(model);
     switch (kind) {
+    case ModelKind.UNION:
+      // We don't support union in Go generator, however, if union is an object, we render it as a struct.
+      if (!model.type?.includes('object')) {break;}
+      return this.renderStruct(model, inputModel);
     case ModelKind.OBJECT: 
       return this.renderStruct(model, inputModel);
     case ModelKind.ENUM: 
       return this.renderEnum(model, inputModel);
     }
-
     return Promise.resolve(RenderOutput.toRenderOutput({ result: '', dependencies: [] }));
   }
 

src/generators/go/GoRenderer.ts

@@ -96,10 +96,6 @@ export abstract class GoRenderer extends AbstractRenderer<GoOptions> {
 
   /* eslint-disable sonarjs/no-duplicate-string */
   toGoType(type: string | undefined, model: CommonModel): string {
-    if (type === undefined) {
-      return 'interface{}';
-    }
-
     switch (type) {
     case 'string':
       return 'string';
@@ -113,12 +109,12 @@ export abstract class GoRenderer extends AbstractRenderer<GoOptions> {
       return 'interface{}';
     case 'array': {
       if (Array.isArray(model.items)) {
-        return model.items.length > 1? '[]interface{}' : `[]${this.renderType(model.items[0])}`;
+        return model.items.length > 1 ? '[]interface{}' : `[]${this.renderType(model.items[0])}`;
       }
       const arrayType = model.items ? this.renderType(model.items) : 'interface{}';
       return `[]${arrayType}`;
     }
-    default: return type;
+    default: return 'interface{}';
     }
   }
 }

src/generators/java/JavaGenerator.ts

@@ -29,10 +29,13 @@ export class JavaGenerator extends AbstractGenerator<JavaOptions> {
 
   render(model: CommonModel, inputModel: CommonInputModel): Promise<RenderOutput> {
     const kind = TypeHelpers.extractKind(model);
-    if (kind === ModelKind.ENUM) {
+    // We don't support union in Java generator, however, if union is an object, we render it as a class.
+    if (kind === ModelKind.OBJECT || (kind === ModelKind.UNION && model.type?.includes('object'))) {
+      return this.renderClass(model, inputModel);
+    } else if (kind === ModelKind.ENUM) {
       return this.renderEnum(model, inputModel);
     }
-    return this.renderClass(model, inputModel);
+    return Promise.resolve(RenderOutput.toRenderOutput({ result: '', dependencies: [] }));
   }
 
   async renderClass(model: CommonModel, inputModel: CommonInputModel): Promise<RenderOutput> {

src/generators/java/renderers/ClassRenderer.ts

@@ -20,7 +20,7 @@ export class ClassRenderer extends JavaRenderer {
     if (this.options?.collectionType === 'List') {
       this.addDependency('import java.util.List;');
     }
-    if (this.model.additionalProperties !== undefined) {
+    if (this.model.additionalProperties !== undefined || this.model.patternProperties !== undefined) {
       this.addDependency('import java.util.Map;');
     }
 

src/generators/typescript/Constants.ts

@@ -51,6 +51,7 @@ export const RESERVED_TYPESCRIPT_KEYWORDS = [
   'from',
   'of',
   // Strict mode reserved words
+  'arguments',
   'as',
   'implements',
   'interface',