Fix verbosity levels again

src/framework/Testee.ts

@@ -9,7 +9,7 @@ import {TestScenario} from './scenario/TestScenario';
 import {OutofPlaceSpecification, PlatformType, TestbedSpecification} from '../testbeds/TestbedSpecification';
 import {CompileOutput, CompilerFactory} from '../manage/Compiler';
 import {WABT} from '../util/env';
-import {Outcome} from '../reporter/verbosity/Describer';
+import {Outcome} from '../reporter/describers/Describer';
 import {WASM} from '../sourcemap/Wasm';
 import {DummyProxy} from '../testbeds/Emulator';
 import {ScenarioResult, Skipped, StepOutcome, SuiteResult} from '../reporter/Results';

src/framework/Verifier.ts

@@ -1,7 +1,7 @@
 import {Behaviour, Description, Step} from './scenario/Step';
 import {StepOutcome} from '../reporter/Results';
 import {getValue} from './Testee';
-import {Outcome} from '../reporter/verbosity/Describer';
+import {Outcome} from '../reporter/describers/Describer';
 import {bold} from 'ansi-colors';
 
 // decorator for Step class

src/manage/Compiler.ts

@@ -406,4 +406,3 @@ function getIndex(line: string): number {
 function getName(line: string): string {
     return find(/-> "([^"]+)"/, line);
 }
-

src/reporter/Reporter.ts

@@ -1,12 +1,34 @@
-import {StepOutcome, SuiteResult} from './Results';
+import {SuiteResult} from './Results';
 import {Archiver} from '../framework/Archiver';
 import {Style} from './Style';
 import {Verbosity} from './index';
 import {version} from '../../package.json';
-import {NormalSuiteDescriber} from './verbosity/SuiteDescribers';
 import {green, red, yellow} from 'ansi-colors';
-import {Outcome, StepDescriber} from './verbosity/Describer';
+import {Outcome, SilentDescriber} from './describers/Describer';
 import {indent} from '../util/printing';
+import {
+    MinimalSuiteDescriber,
+    NormalSuiteDescriber,
+    ShortSuiteDescriber,
+    SuiteDescriber
+} from './describers/SuiteDescribers';
+
+function describer(verbosity: Verbosity, item: SuiteResult): SuiteDescriber {
+    switch (verbosity) {
+        case Verbosity.none:
+            return new SilentDescriber<SuiteResult>(item);
+        case Verbosity.minimal:
+            return new MinimalSuiteDescriber(item);
+        case Verbosity.short:
+            return new ShortSuiteDescriber(item);
+        case Verbosity.normal:
+        case Verbosity.more:
+        case Verbosity.all:
+        case Verbosity.debug:
+        default:
+            return new NormalSuiteDescriber(item);
+    }
+}
 
 export class Reporter {
     private output: string = '';
@@ -42,7 +64,7 @@ export class Reporter {
 
     report(suiteResult: SuiteResult) {
         this.suites.push(suiteResult);
-        const report: string[] = new NormalSuiteDescriber(suiteResult).describe(this.style);
+        const report: string[] = describer(this.verbosity, suiteResult).describe(this.style);
 
         for (const line of report) {
             console.log(this.indent() + line);
@@ -115,8 +137,4 @@ export class Reporter {
     test(title: string) {
         this.output += `  test: ${title}\n`;
     }
-
-    step(result: StepOutcome) {
-        this.output += `    ${new StepDescriber(result).describe(this.style).flat()}\n`;
-    }
 }

src/reporter/Results.ts

@@ -1,5 +1,5 @@
 import {Step} from '../framework/scenario/Step';
-import {Outcome} from './verbosity/Describer';
+import {Outcome} from './describers/Describer';
 import {TestScenario} from '../framework/scenario/TestScenario';
 import {Suite} from '../framework/Framework';
 

src/reporter/verbosity/Describer.ts → src/reporter/describers/Describer.ts

@@ -2,11 +2,13 @@ import {Result, StepOutcome} from '../Results';
 import {Style} from '../Style';
 
 export interface Describable<R extends Result> {
+    readonly item: R;
+
     describe(style: Style): string[];
 }
 
 export abstract class Describer<R extends Result> implements Describable<R> {
-    public item: R;
+    public readonly item: R;
 
     constructor(item: R) {
         this.item = item;
@@ -15,7 +17,7 @@ export abstract class Describer<R extends Result> implements Describable<R> {
     abstract describe(style: Style): string[];
 }
 
-class SilentDescriber<R extends Result> extends Describer<R> {
+export class SilentDescriber<R extends Result> extends Describer<R> {
     describe(style: Style): string[] {
         return [];
     }

src/reporter/verbosity/ScenarioDescribers.ts → src/reporter/describers/ScenarioDescribers.ts

@@ -1,4 +1,4 @@
-// decorator class for minimal verbosity
+// decorator class for minimal describers
 import {Outcome, Describer, StepDescriber} from './Describer';
 import {ScenarioResult} from '../Results';
 import {Style} from '../Style';
@@ -42,6 +42,3 @@ export class NormalScenarioDescriber extends ShortScenarioDescriber {
         return report;
     }
 }
-
-//  / factory                /
-// reporter(verbosity, style).report()

src/reporter/verbosity/SuiteDescribers.ts → src/reporter/describers/SuiteDescribers.ts

@@ -11,8 +11,9 @@ const table: (style: Style) => Map<Outcome, string> =
         [Outcome.failed, style.colors.failure(style.labels.failure)],
         [Outcome.skipped, style.colors.skipped(style.labels.suiteSkipped)]]);
 
+export abstract class SuiteDescriber extends Describer<SuiteResult> {}
 
-export class MinimalSuiteDescriber extends Describer<SuiteResult> {
+export class MinimalSuiteDescriber extends SuiteDescriber {
     describe(style: Style): string[] {
         const report: string[] = [];
         const status = (this.item.outcome === Outcome.error ? style.colors.error(style.labels.error) :
@@ -22,7 +23,7 @@ export class MinimalSuiteDescriber extends Describer<SuiteResult> {
     }
 }
 
-export class ShortSuiteDescriber extends Describer<SuiteResult> {
+export class ShortSuiteDescriber extends SuiteDescriber {
     describe(style: Style): string[] {
         let report: string[] = [];
         report = report.concat(this.overview(style));
@@ -57,6 +58,7 @@ export class NormalSuiteDescriber extends ShortSuiteDescriber {
 
         this.item.outcomes().forEach((scenario, index) => {
             report = report.concat(new NormalScenarioDescriber(scenario, `(#${index + 1})`).describe(style));
+            report.push('');
         });
 
         if (this.item.outcome === Outcome.error) {

src/util/retry.ts

@@ -11,7 +11,6 @@ export function retry<T>(promise: () => Promise<T>, retries: number): Promise<T>
                 trying = ++attempt < retries;
             }
         }
-
         reject(`exhausted number of retries (${retries})`);
     });
 }

tests/examples/example.ts

@@ -1,4 +1,5 @@
 import {
+    Description,
     EmulatorSpecification,
     Expected,
     Framework,
@@ -73,6 +74,28 @@ debug.test({
     }]
 });
 
+const DUMP: Step = {
+    title: 'Send DUMP command',
+    instruction: {kind: Kind.Request, value: Message.dump},
+    expected: [
+    {'pc': {kind: 'description', value: Description.defined} as Expected<string>},
+    {
+        'breakpoints': {
+            kind: 'comparison', value: (state: Object, value: Array<any>) => {
+                return value.length === 0;
+            }, message: 'list of breakpoints should be empty'
+        } as Expected<Array<any>>
+    },
+    {'callstack[0].sp': {kind: 'primitive', value: -1} as Expected<number>},
+    {'callstack[0].fp': {kind: 'primitive', value: -1} as Expected<number>}]
+};
+
+debug.test({
+    title: 'Test DUMP blink',
+    program: `tests/examples/blink.wast`,
+    steps: [DUMP]
+});
+
 const primitives = framework.suite('Test primitives');
 
 primitives.testee('debug[:8700]', new EmulatorSpecification(8700));