Restructure suite x testee relationship

Author: tolauwae

src/framework/Framework.ts

@@ -7,43 +7,49 @@ import {TestbedSpecification} from '../testbeds/TestbedSpecification';
 export interface Suite {
     title: string;
     tests: TestScenario[];
+    testees: Testee[];
 }
 
 interface DependenceTree {
     test: TestScenario;
     children: DependenceTree[];
 }
 
+export interface TesteeOptions {
+    disabled?: boolean;
+    timeout?: number;
+    connectionTimout?: number;
+}
+
 export class Framework {
     private static implementation: Framework;
 
-    private testees: Testee[] = [];
-    private suites: Suite[] = [];
+    private testSuites: Suite[] = [];
 
     public runs: number = 1;
 
     private constructor() {
     }
 
     private currentSuite(): Suite {
-        return this.suites[this.suites.length - 1];
+        return this.testSuites[this.testSuites.length - 1];
     }
 
-    public testee(name: string, specification: TestbedSpecification, scheduler: Scheduler = new HybridScheduler(), disabled: boolean = false) {
-        const testee = new Testee(name, specification, scheduler);
-        if (disabled) {
+    public testee(name: string, specification: TestbedSpecification, scheduler: Scheduler = new HybridScheduler(), options: TesteeOptions = {}) {
+        const testee = new Testee(name, specification, scheduler, options.timeout ?? 2000, options.connectionTimout ?? 5000);
+        if (options.disabled) {
             testee.skipall();
         }
 
-        this.testees.push(testee);
+        this.currentSuite().testees.push(testee);
     }
 
-    public platforms(): Testee[] {
-        return this.testees;
+    public suites(): Suite[] {
+        return this.testSuites;
     }
 
     public suite(title: string) {
-        this.suites.push({title: title, tests: []});
+        this.testSuites.push({title: title, tests: [], testees: []});
     }
 
     public test(test: TestScenario) {
@@ -55,8 +61,8 @@ export class Framework {
     }
 
     public run(cores: number = 1) {   // todo remove cores
-        this.suites.forEach((suite: Suite) => {
-            this.testees.forEach((testee: Testee) => {
+        this.testSuites.forEach((suite: Suite) => {
+            suite.testees.forEach((testee: Testee) => {
                 const order: TestScenario[] = testee.scheduler.schedule(suite);
                 const first: TestScenario = order[0];
                 before('Initialize testbed', async function () {

src/framework/MochaReporter.ts

@@ -1,6 +1,6 @@
 import {MochaOptions, reporters, Runner, Suite, Test} from 'mocha';
 import {Reporter} from './Reporter';
-import {Framework} from './Framework';
+import {Framework, Suite as LatchSuite} from './Framework';
 import {Archiver} from './Archiver';
 import {Testee} from './Testee';
 import color = reporters.Base.color;
@@ -80,7 +80,7 @@ class MochaReporter extends reporters.Base {
             console.log(color('suite', '%s==================='), this.indent());
 
             const names: string[] = [];
-            Framework.getImplementation().platforms().forEach((platform: Testee) => names.push(platform.name));
+            Framework.getImplementation().suites().forEach((suite: LatchSuite) => suite.testees.forEach((platform: Testee) => names.push(platform.name)));
             names.forEach((name: string) => this.archiver.extend('platforms', name));
             console.log(color('suite', '%sPlatforms  %s'), this.indent(), names.join(', '));
 

src/framework/Testee.ts

@@ -69,12 +69,12 @@ export class Testee { // TODO unified with testbed interface
 
     public testbed?: Testbed;
 
-    constructor(name: string, specification: TestbedSpecification, scheduler: Scheduler, timeout: number = 2000) {
+    constructor(name: string, specification: TestbedSpecification, scheduler: Scheduler, timeout: number, connectionTimeout: number) {
         this.name = name;
         this.specification = specification;
         this.scheduler = scheduler;
         this.timeout = timeout;
-        this.connector = new TestbedFactory();
+        this.connector = new TestbedFactory(connectionTimeout);
         this.mapper = new SourceMapFactory();
         this.framework = Framework.getImplementation();
     }

src/testbeds/TestbedFactory.ts

@@ -14,7 +14,7 @@ export class TestbedFactory {
     private readonly compilerFactory: CompilerFactory;
     private readonly uploaderFactory: UploaderFactory;
 
-    constructor(timeout: number = 5000) {
+    constructor(timeout: number) {
         this.defaultTimeout = timeout;
         this.compilerFactory = new CompilerFactory(WABT);
         this.uploaderFactory = new UploaderFactory(EMULATOR, ARDUINO);

test/test.ts

@@ -1,24 +1,33 @@
-import {ArduinoSpecification, EmulatorSpecification, Expected, Framework, Kind, Message, Step} from '../src';
+import {ArduinoSpecification, EmulatorSpecification, Expected, Framework, Invoker, Kind, Message, Step, WASM} from '../src';
 import dump = Message.dump;
 import stepOver = Message.stepOver;
 
 const framework = Framework.getImplementation();
 
-framework.testee('emulator [:8500]', new EmulatorSpecification(8500));
-framework.testee('emulator [:8520]', new EmulatorSpecification(8520));
-framework.testee('esp wrover', new ArduinoSpecification('/dev/ttyUSB0', 'esp32:esp32:esp32wrover'));
+framework.suite('Test Wasm spec'); // must be called first
 
-framework.suite('Test Latch performance in CI');
+framework.testee('emulator [:8500]', new EmulatorSpecification(8500));
 
 const steps: Step[] = [];
 
+// ✔ ((invoke "8u_good1" (i32.const 0)) (i32.const 97))
+steps.push(new Invoker('8u_good1', [{value: 0, type: WASM.Type.i32}] as WASM.Value[], 97));
+
+// ✔ ((invoke "8u_good3" (i32.const 0)) (i32.const 98))
+steps.push(new Invoker('8u_good3', [{value: 0, type: WASM.Type.i32}] as WASM.Value[], 98));
+
 framework.test({
     title: `Test with address_0.wast`,
     program: 'test/address.wast',
     dependencies: [],
     steps: steps
 });
 
+framework.suite('Test Debugger interface');
+framework.testee('emulator [:8520]', new EmulatorSpecification(8520));
+// framework.testee('esp wrover', new ArduinoSpecification('/dev/ttyUSB0', 'esp32:esp32:esp32wrover'));
+
+
 framework.test({
     title: 'Test STEP OVER',
     program: 'test/call.wast',