cleanup

Author: skadefro

test/Audit.test.ts

@@ -6,22 +6,20 @@ import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');
 import { Logger } from '../OpenFlow/src/Logger';
-import { NoderedUtil, TokenUser, User } from '@openiap/openflow-api';
+import { TokenUser, User } from '@openiap/openflow-api';
 import { Audit } from '../OpenFlow/src/Audit';
 import { Crypt } from '../OpenFlow/src/Crypt';
 import { DBHelper } from '../OpenFlow/src/DBHelper';
 
 @suite class OpenFlowConfigTests {
     private rootToken: string;
     private testUser: User;
-    private userToken: string;
     async before() {
         Logger.configure(true, false);
         Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db);
         await Config.db.connect(null);
         this.rootToken = Crypt.rootToken();
         this.testUser = await DBHelper.FindByUsername("testuser", this.rootToken, null)
-        this.userToken = Crypt.createToken(this.testUser, Config.shorttoken_expires_in);
     }
     async after() {
         await Config.db.shutdown();

test/Auth.test.ts

@@ -6,10 +6,8 @@ import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');
 import { Logger } from '../OpenFlow/src/Logger';
-import { NoderedUtil } from '@openiap/openflow-api';
 import { Auth } from '../OpenFlow/src/Auth';
 
-
 @suite class OpenFlowConfigTests {
     async before() {
         Logger.configure(true, true);

test/Crypt.test.ts

@@ -6,7 +6,7 @@ import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');
 import { Logger } from '../OpenFlow/src/Logger';
-import { NoderedUtil, User } from '@openiap/openflow-api';
+import { User } from '@openiap/openflow-api';
 import { Auth } from '../OpenFlow/src/Auth';
 import { Crypt } from '../OpenFlow/src/Crypt';
 import { DBHelper } from '../OpenFlow/src/DBHelper';

test/DBHelper.test.ts

@@ -10,6 +10,7 @@ import { NoderedUtil, TokenUser, User, WellknownIds } from '@openiap/openflow-ap
 import { Auth } from '../OpenFlow/src/Auth';
 import { Crypt } from '../OpenFlow/src/Crypt';
 import { DBHelper } from '../OpenFlow/src/DBHelper';
+
 @suite class OpenFlowConfigTests {
     private rootToken: string;
     private testUser: User;

test/DatabaseConnection.test.ts

@@ -11,7 +11,6 @@ import { Auth } from '../OpenFlow/src/Auth';
 import { DBHelper } from '../OpenFlow/src/DBHelper';
 import { Crypt } from '../OpenFlow/src/Crypt';
 
-
 @suite class OpenFlowDatabaseConnectionTests {
     private rootToken: string;
     private testUser: User;

test/KubeUtil.test.ts

@@ -1,14 +1,11 @@
 const path = require("path");
 const env = path.join(process.cwd(), 'config', '.env');
 require("dotenv").config({ path: env }); // , debug: false 
-import { suite, test } from '@testdeck/mocha';
-import { Message } from "../OpenFlow/src/Messages/Message";
+import { suite, test, timeout } from '@testdeck/mocha';
 import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');
 import { Logger } from '../OpenFlow/src/Logger';
-import { NoderedUtil } from '@openiap/openflow-api';
-import { license_data } from '../OpenFlow/src/otelspec';
 import { KubeUtil } from '../OpenFlow/src/KubeUtil';
 
 @suite class OpenFlowKubeUtilTests {
@@ -34,6 +31,7 @@ import { KubeUtil } from '../OpenFlow/src/KubeUtil';
         assert.notStrictEqual(dep, null);
         assert.strictEqual(dep.metadata.name, "useringress");
     }
+    @timeout(60000)
     @test async 'listNamespacedPod'() {
         const list = await KubeUtil.instance().CoreV1Api.listNamespacedPod(Config.namespace);
         assert.notStrictEqual(list, null);

test/Logger.test.ts

@@ -2,7 +2,6 @@ const path = require("path");
 const env = path.join(process.cwd(), 'config', '.env');
 require("dotenv").config({ path: env }); // , debug: false 
 import { suite, test } from '@testdeck/mocha';
-import { Message } from "../OpenFlow/src/Messages/Message";
 import { Config } from "../OpenFlow/src/Config";
 import { DatabaseConnection } from '../OpenFlow/src/DatabaseConnection';
 import assert = require('assert');

test/Message.test.ts

@@ -63,12 +63,12 @@ import { DBHelper } from '../OpenFlow/src/DBHelper';
         q = JSON.parse(msg.data);
         assert.ok(q && !q.error, q.error);
     }
-    // @test async 'signin with username and password'() {
-    //     var q = new SigninMessage(); q.username = "testuser"; q.password = "testuser"
-    //     var msg = new Message();
-    //     await msg.Signin(null, null);
-    //     q = JSON.parse(msg.data);
-    //     assert.ok(q && !q.error, q.error);
-    // }
+    @test async 'signin with username and password'() {
+        var q = new SigninMessage(); q.username = "testuser"; q.password = "testuser"
+        var msg = new Message();
+        await msg.Signin(null, null);
+        q = JSON.parse(msg.data);
+        assert.ok(q && !q.error, q.error);
+    }
 }
 // cls | ./node_modules/.bin/_mocha 'test/**/Message.test.ts'

test/amqp.test.ts

@@ -14,15 +14,13 @@ import { amqpwrapper } from '../OpenFlow/src/amqpwrapper';
 @suite class OpenFlowConfigTests {
     private rootToken: string;
     private testUser: User;
-    private userToken: string;
     private amqp: amqpwrapper;
     async before() {
         Logger.configure(true, false);
         Config.db = new DatabaseConnection(Config.mongodb_url, Config.mongodb_db);
         await Config.db.connect(null);
         this.rootToken = Crypt.rootToken();
         this.testUser = await DBHelper.FindByUsername("testuser", this.rootToken, null)
-        this.userToken = Crypt.createToken(this.testUser, Config.shorttoken_expires_in);
         this.amqp = new amqpwrapper(Config.amqp_url);
         amqpwrapper.SetInstance(this.amqp);
         Config.log_amqp = false;