fix: Fix multiple iterations timeout bug

enqueuer-land · Apr 2, 2019 · 039f7c1 · 039f7c1
1 parent 8cff56b
commit 039f7c1
Show file tree

Hide file tree

Showing 15 changed files with 1,357 additions and 1,334 deletions.
diff --git a/output/examples.json b/output/examples.json
diff --git a/output/examples.yml b/output/examples.yml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "commander": "^2.19.0",
     "express": "^4.16.4",
     "glob": "^7.1.3",
-    "json-placeholder-replacer": "^1.0.31",
+    "json-placeholder-replacer": "^1.0.32",
     "log4js": "^4.0.2",
     "prettyjson": "^1.2.1",
     "request": "^2.88.0",

diff --git a/src/code-generators/assertion-code-generator.test.ts b/src/code-generators/assertion-code-generator.test.ts
@@ -3,7 +3,8 @@ import {AssertionCodeGenerator} from './assertion-code-generator';
 describe('AssertionCodeGenerator', () => {
 
     it('Should pass tests instance name', () => {
-        const assertionCodeGenerator: AssertionCodeGenerator = new AssertionCodeGenerator('tests', 'asserter', 'assertion');
+        const assertionCodeGenerator: AssertionCodeGenerator =
+            new AssertionCodeGenerator('tests', 'asserter', 'assertion');
         const code: string = assertionCodeGenerator.generate();
 
         expect(code).toBe('try {\n' +
@@ -13,8 +14,10 @@ describe('AssertionCodeGenerator', () => {
             '                .forEach(key =>       evaluated[key] = eval(assertion[key])   );\n' +
             '            tests.push(asserter.assert(evaluated, assertion));\n' +
             '        } catch (err) {\n' +
+            "            const msg = `Error executing assertion: '${err}'`;\n" +
+            '            Logger.error(msg);\n' +
             '            tests.push({\n' +
-            "                description: `Error executing assertion: '${err}'`,\n" +
+            '                description: msg,\n' +
             '                valid: false,\n' +
             "                label: 'Assertion code valid'\n" +
             '            });\n' +

diff --git a/src/code-generators/assertion-code-generator.ts b/src/code-generators/assertion-code-generator.ts
@@ -1,4 +1,3 @@
-
 export class AssertionCodeGenerator {
     private readonly testsName: string;
     private readonly assertionName: string;
@@ -18,8 +17,10 @@ export class AssertionCodeGenerator {
                 .forEach(key =>       evaluated[key] = eval(${this.assertionName}[key])   );
             ${this.testsName}.push(${this.asserterInstanceName}.assert(evaluated, ${this.assertionName}));
         } catch (err) {
+            const msg = \`Error executing assertion: '\${err}'\`;
+            Logger.error(msg);
             ${this.testsName}.push({
-                description: \`Error executing assertion: '\${err}'\`,
+                description: msg,
                 valid: false,
                 label: 'Assertion code valid'
             });

diff --git a/src/code-generators/event-code-generator.ts b/src/code-generators/event-code-generator.ts
@@ -37,6 +37,7 @@ export class EventCodeGenerator {
 
         dynamicFunction.addArgument(this.storeInstanceName, Store.getData());
         dynamicFunction.addArgument(this.testsInstanceName, this.tests);
+        dynamicFunction.addArgument('Logger', Logger);
 
         functionArguments.forEach(argument => {
             dynamicFunction.addArgument(argument.name, argument.value);
@@ -55,8 +56,10 @@ export class EventCodeGenerator {
         return `try {
                         ${this.script}
                     } catch (err) {
+                        const msg = \`Error executing '${this.name}.script' code: '\${err}'\`;
+                        Logger.error(msg);
                         ${this.testsInstanceName}.push({
-                                description: \`Error executing '${this.name}.script' code: '\${err}'\`,
+                                description: msg,
                                 valid: false,
                                 label: "Valid 'script snippet' code"
                             });
@@ -79,6 +82,7 @@ export class EventCodeGenerator {
             dynamicFunction.addArgument(this.storeInstanceName, Store.getData());
             dynamicFunction.addArgument(this.testsInstanceName, this.tests);
             dynamicFunction.addArgument('assertion', assertion);
+            dynamicFunction.addArgument('Logger', Logger);
 
             functionArguments.forEach(argument => {
                 dynamicFunction.addArgument(argument.name, argument.value);

diff --git a/src/code-generators/store-code-generator.test.ts b/src/code-generators/store-code-generator.test.ts
@@ -17,19 +17,23 @@ describe('StoreCodeGenerator', () => {
         expect(code).toBe('try {\n' +
             '                        storeName[\'first\'] = firstValue;\n' +
             '                    } catch (err) {\n' +
+            '                        const msg = `Error executing store \'first\' code: \'${err}\'`;\n' +
+            '                        Logger.error(msg);\n' +
             '                        tests.push({\n' +
-            '                                description: `Error executing store \'first\' code: \'${err}\'`,\n' +
+            '                                description: msg,\n' +
             '                                valid: false,\n' +
-            '                                label: \"Valid \'store\' in event auto-generated code\"\n' +
+            '                                label: \"Valid \'store\' in event code\"\n' +
             '                            });\n' +
             '                    }\n' +
             'try {\n' +
             '                        storeName[\'second\'] = secondValue;\n' +
             '                    } catch (err) {\n' +
+            '                        const msg = `Error executing store \'second\' code: \'${err}\'`;\n' +
+            '                        Logger.error(msg);\n' +
             '                        tests.push({\n' +
-            '                                description: `Error executing store \'second\' code: \'${err}\'`,\n' +
+            '                                description: msg,\n' +
             '                                valid: false,\n' +
-            '                                label: \"Valid \'store\' in event auto-generated code\"\n' +
+            '                                label: \"Valid \'store\' in event code\"\n' +
             '                            });\n' +
             '                    }\n');
     });

diff --git a/src/code-generators/store-code-generator.ts b/src/code-generators/store-code-generator.ts
@@ -13,10 +13,12 @@ export class StoreCodeGenerator {
             code += `try {
                         ${this.storeInstanceName}['${key}'] = ${store[key]};
                     } catch (err) {
+                        const msg = \`Error executing store '${key}' code: '\${err}'\`;
+                        Logger.error(msg);
                         ${this.testsName}.push({
-                                description: \`Error executing store '${key}' code: '\${err}'\`,
+                                description: msg,
                                 valid: false,
-                                label: "Valid 'store' in event auto-generated code"
+                                label: "Valid 'store' in event code"
                             });
                     }\n`;
 

diff --git a/src/configurations/file-content-map-creator.test.ts b/src/configurations/file-content-map-creator.test.ts
@@ -27,6 +27,14 @@ describe('FileContentMapCreator', () => {
         expect(readFileSyncMock).toHaveBeenCalledWith(filename);
     });
 
+    it('Handle exceptions undefined field', () => {
+        const requisition = {value: undefined};
+
+        // @ts-ignore
+        expect(() => new FileContentMapCreator(requisition)).not.toThrow();
+
+    });
+
     it('Parse from file with right parser', () => {
         const fileContent = 'fileContent';
         const readFileSyncMock = jest.fn(() => fileContent);

diff --git a/src/configurations/file-content-map-creator.ts b/src/configurations/file-content-map-creator.ts
@@ -21,7 +21,7 @@ export class FileContentMapCreator {
             const attribute = node[key];
             if (typeof attribute === 'object') {
                 this.checkChildren(attribute);
-            } else {
+            } else if (attribute !== undefined) {
                 this.findTags(JSON.stringify(attribute));
             }
         }
@@ -76,7 +76,7 @@ export class FileContentMapCreator {
             for (let i = 0; i < pairs.length; i++) {
                 const pair = pairs[i].split('=');
                 let value: any = pair[1];
-                if (value  === undefined) {
+                if (value === undefined) {
                     value = true;
                 }
                 query[pair[0]] = value;

diff --git a/src/enqueuer-runner.ts b/src/enqueuer-runner.ts
@@ -17,6 +17,7 @@ export class EnqueuerRunner {
     }
 
     public async execute(): Promise<boolean> {
+        Logger.info('Let\'s rock');
         const configuration = Configuration.getInstance();
         const requisitionFileParser = new RequisitionFilePatternParser(configuration.getFiles());
         const requisitions = requisitionFileParser.parse();

diff --git a/src/reporters/publishers/multi-publishers-reporter.ts b/src/reporters/publishers/multi-publishers-reporter.ts
@@ -15,16 +15,17 @@ export class MultiPublishersReporter {
         let errorsCounter = 0;
         if (this.publishers.length > 0) {
             Logger.info(`Publishers are publishing messages`);
+
+            await Promise.all(this.publishers.map(async publisher => {
+                try {
+                    await publisher.publish();
+                } catch (err) {
+                    ++errorsCounter;
+                    Logger.error(err);
+                }
+            }));
+            Logger.info(`Publishers have published their messages`);
         }
-        await Promise.all(this.publishers.map(async publisher => {
-            try {
-                await publisher.publish();
-            } catch (err) {
-                ++errorsCounter;
-                Logger.error(err);
-            }
-        }));
-        Logger.info(`Publishers have published their messages`);
         return errorsCounter;
     }
 

diff --git a/src/reporters/requisition-reporter.ts b/src/reporters/requisition-reporter.ts
@@ -22,12 +22,11 @@ export class RequisitionReporter {
         this.requisitionAttributes = requisitionAttributes;
         const onInitFunctionTests = this.executeOnInitFunction();
         if (this.requisitionAttributes.timeout === undefined) {
-            this.requisitionAttributes.timeout = RequisitionReporter.DEFAULT_TIMEOUT;
-        } else if (this.requisitionAttributes.timeout <= 0) {
-            delete this.requisitionAttributes.timeout;
+            this.timeout = RequisitionReporter.DEFAULT_TIMEOUT;
+        } else if (this.requisitionAttributes.timeout > 0) {
+            this.timeout = this.requisitionAttributes.timeout;
         }
         this.startTime = new Date();
-        this.timeout = this.requisitionAttributes.timeout;
         this.reportGenerator = new RequisitionReportGenerator(this.requisitionAttributes, this.timeout);
         this.reportGenerator.addTests(onInitFunctionTests);
         this.multiSubscriptionsReporter = new MultiSubscriptionsReporter(this.requisitionAttributes.subscriptions);

diff --git a/src/reporters/subscription/subscription-reporter.ts b/src/reporters/subscription/subscription-reporter.ts
@@ -38,14 +38,14 @@ export class SubscriptionReporter {
         };
 
         this.executeOnInitFunction(subscriptionAttributes);
-        if (subscriptionAttributes.timeout === undefined) {
-            subscriptionAttributes.timeout = SubscriptionReporter.DEFAULT_TIMEOUT;
-        } else if (subscriptionAttributes.timeout <= 0) {
-            delete subscriptionAttributes.timeout;
-        }
 
         Logger.debug(`Instantiating subscription ${subscriptionAttributes.type}`);
         this.subscription = DynamicModulesManager.getInstance().getProtocolManager().createSubscription(subscriptionAttributes);
+        if (subscriptionAttributes.timeout === undefined) {
+            this.subscription.timeout = SubscriptionReporter.DEFAULT_TIMEOUT;
+        } else if (subscriptionAttributes.timeout <= 0) {
+            delete this.subscription.timeout;
+        }
         this.killListener = (signal: Signals) => this.handleKillSignal(signal, this.subscription.type || 'undefined');
     }
 
@@ -57,7 +57,7 @@ export class SubscriptionReporter {
 
     public startTimeout(onTimeOutCallback: Function) {
         if (this.subscription.timeout) {
-            Logger.info(`Starting subscription '${this.subscription.name}'`);
+            Logger.info(`Starting subscription '${this.subscription.name}' timeout`);
             new Timeout(() => {
                 if (!this.subscription.messageReceived) {
                     this.totalTime = new DateController();