Merge pull request #29 from EMResearch/naivecoin-js

js sut

Author: arcuri82

.gitignore

@@ -152,6 +152,8 @@ hs_err_pid*
 /jdk_11_gradle/em/external/graphql/patio-api/build
 
 
+/jdk_8_maven/em/external/rest/restcountries/target/
+/jdk_8_maven/em/embedded/rest/restcountries/target/
 
 ### JavaScript
 /venv/
@@ -172,7 +174,12 @@ hs_err_pid*
 /js_npm/rest/disease-sh-api/build/
 /js_npm/rest/disease-sh-api/EvoMasterTest.js
 /js_npm/rest/disease-sh-api/redis/
-
+/js_npm/rest/nestjs-realworld-example-app/node_modules/
+/js_npm/rest/nestjs-realworld-example-app/build/
+/js_npm/rest/naivecoin/build/
+/js_npm/rest/naivecoin/node_modules/
+/js_npm/rest/spaceX/node_modules/
+/js_npm/rest/spaceX/build/
 
 
 #DotNet
@@ -185,3 +192,6 @@ dotnet_3/em/embedded/rest/SampleProjectDriver/logs/
 .vs/
 *.launchSettings.json
 *.sln.DotSettings.user
+
+
+

README.md

@@ -58,6 +58,10 @@ projects, each one with its own license, as clarified in more details beneath.
 
 * SCS (not-known license, artificial string examples coming from different sources)
 
+* SpaceX-API (Apache-2.0 License), from [https://github.com/r-spacex/SpaceX-API](https://github.com/r-spacex/SpaceX-API)
+
+* nestjs-realworld-example-app (ISC), from [https://github.com/lujakob/nestjs-realworld-example-app](https://github.com/lujakob/nestjs-realworld-example-app)
+
 ### REST: .Net/C# 
 
 * Menu.API (not-known license), from [https://github.com/chayxana/Restaurant-App](https://github.com/chayxana/Restaurant-App)

js_npm/rest/cyclotron/em/app-driver.js

@@ -1,6 +1,5 @@
 const dbHandler = require("./db-handler");
 
-
 const http  = require("http");
 const {AddressInfo}  = require("net");
 const mongoose = require('mongoose');
@@ -27,7 +26,7 @@ class AppController  extends em.SutController {
 
     getProblemInfo() {
         const dto = new em.dto.RestProblemDto();
-        dto.swaggerJsonUrl = "http://localhost:" + this.port + "/swagger.json";
+        dto.openApiUrl = "http://localhost:" + this.port + "/swagger.json";
 
         return dto;
     }

js_npm/rest/cyclotron/em/driver-Test.js

@@ -71,10 +71,15 @@
   },
   "jest": {
     "testEnvironment": "node",
-    "testRegex": "(em|tests|bbtests)/.*Test\\.(js|jsx|ts|tsx)$",
+    "testRegex": "em/.*Test\\.(js|jsx|ts|tsx)$",
     "collectCoverageFrom": [
       "src/**/*.(js|jsx|ts|tsx)"
     ],
+    "coverageReporters": [
+      "json",
+      "html",
+      "json-summary"
+    ],
     "transformIgnorePatterns": [
       "<rootDir>/node_modules/",
       "<rootDir>/bbtests/",

js_npm/rest/cyclotron/em/sample-Test.js

@@ -6,7 +6,7 @@ const {AddressInfo}  = require("net");
 const em = require("evomaster-client-js");
 
 
-class AppController  extends em.SutController {
+class AppController extends em.SutController {
 
 
     setupForGeneratedTest(){
@@ -27,7 +27,7 @@ class AppController  extends em.SutController {
 
     getProblemInfo() {
         const dto = new em.dto.RestProblemDto();
-        dto.swaggerJsonUrl = "http://localhost:" + this.port + "/apidocs/swagger_v3.json";
+        dto.openApiUrl = "http://localhost:" + this.port + "/apidocs/swagger_v3.json";
 
         return dto;
     }
@@ -54,10 +54,11 @@ class AppController  extends em.SutController {
     }
 
     stopSut() {
-        return new Promise( (resolve) =>
-            {
-                this.server.close( () => resolve());
-            }
+        return new Promise( (resolve) => {
+                this.server.close( () => {
+                    dbHandler.stopDb();
+                    resolve();
+                });}
         );
     }
 

js_npm/rest/cyclotron/package.json

@@ -7,17 +7,22 @@ let test_container = null;
 
 module.exports ={
     startDb: async () =>{
-        console.log("start db")
-        dbPort = process.env.DB_PORT || 50000;
-
-        const environment = await new DockerComposeEnvironment(__dirname, "test-redis-db.yml")
-        .withWaitStrategy("redis_1", Wait.forLogMessage("Ready to accept connections"))
-        .up();
-        test_container = await environment.getContainer("redis_1");
-        exposedDbPort = test_container.getMappedPort(dbPort);
-        process.env.REDIS_PORT = exposedDbPort;
-
-        console.log("connecting redis-server with "+exposedDbPort);
+        if(process.env.DOCKER_DBC && process.env.DOCKER_DBC === '0'){
+            console.log("use local redis on port:" + process.env.REDIS_PORT)
+        }else{
+            console.log("start docker db")
+            dbPort = process.env.DB_PORT || 50000;
+
+            // solve ioredis connection problem https://github.com/luin/ioredis/issues/763
+            const environment = await new DockerComposeEnvironment(__dirname, "test-redis-db.yml")
+                .withWaitStrategy("redis_1", Wait.forLogMessage("Ready to accept connections"))
+                .up();
+            test_container = await environment.getContainer("redis_1");
+            exposedDbPort = test_container.getMappedPort(dbPort);
+            process.env.REDIS_PORT = exposedDbPort;
+
+            console.log("connecting redis-server with " + exposedDbPort+ " " + test_container.getHost());
+        }
         return test_container;
     },
 

js_npm/rest/disease-sh-api/em/app-driver.js

@@ -2,7 +2,8 @@ version: "3.8"
 
 services:
   redis:
-    image: redis:latest
+    image: redis:6.2.5
+    command: ["redis-server", "--bind", "redis", "--port", "50000"]
     ports:
       - 50000
     volumes: