Skip to content

Commit 253ab38

Browse files
arcuri82arcuri82
committed
Merge branch 'develop' of https://github.com/EMResearch/EMB into suts-for-wm
2 parents 7ff2bcb + 645d784 commit 253ab38

56 files changed

Lines changed: 120 additions & 66 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import io.micronaut.runtime.Micronaut;
55
import org.evomaster.client.java.controller.EmbeddedSutController;
66
import org.evomaster.client.java.controller.InstrumentedSutStarter;
7-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
8-
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
7+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
8+
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
99
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1010
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1111
import org.evomaster.client.java.sql.DbCleaner;

‎jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.bson.types.ObjectId;
1010
import org.evomaster.client.java.controller.EmbeddedSutController;
1111
import org.evomaster.client.java.controller.InstrumentedSutStarter;
12-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
13-
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
12+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
13+
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
1414
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1515
import org.evomaster.client.java.sql.DbSpecification;
1616
import org.evomaster.client.java.controller.problem.ProblemInfo;
@@ -96,9 +96,38 @@ public String startSut() {
9696
"--app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789"
9797
});
9898

99+
try {
100+
Thread.sleep(3_000);
101+
} catch (InterruptedException e) {
102+
// do nothing
103+
}
104+
105+
while (!isMongoClientReady()) {
106+
try {
107+
Thread.sleep(1_000);
108+
} catch (InterruptedException e) {
109+
// do nothing
110+
}
111+
}
112+
99113
return "http://localhost:" + getSutPort();
100114
}
101115

116+
/**
117+
* Checks if the mongo database is ready to receive commands using a ping command
118+
* @return
119+
*/
120+
private boolean isMongoClientReady() {
121+
try {
122+
MongoDatabase db = mongoClient.getDatabase(MONGODB_DATABASE_NAME);
123+
Document pingResult = db.runCommand(new Document("ping", 1));
124+
return pingResult.getDouble("ok") == 1.0;
125+
} catch (Exception ex) {
126+
// Connection error
127+
return false;
128+
}
129+
}
130+
102131
protected int getSutPort() {
103132
return (Integer) ((Map) ctx.getEnvironment()
104133
.getPropertySources().get("server.ports").getSource())

‎jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.evomaster.client.java.controller.ExternalSutController;
44
import org.evomaster.client.java.controller.InstrumentedSutStarter;
5-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
6-
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
5+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
6+
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
77
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
88
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
99
import org.evomaster.client.java.sql.DbCleaner;

‎jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.bson.types.ObjectId;
1010
import org.evomaster.client.java.controller.ExternalSutController;
1111
import org.evomaster.client.java.controller.InstrumentedSutStarter;
12-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
13-
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
12+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
13+
import org.evomaster.client.java.controller.api.dto.auth.JsonTokenPostLoginDto;
1414
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1515
import org.evomaster.client.java.sql.DbSpecification;
1616
import org.evomaster.client.java.controller.problem.ProblemInfo;
@@ -153,6 +153,34 @@ public void preStart() {
153153

154154
@Override
155155
public void postStart() {
156+
try {
157+
Thread.sleep(3_000);
158+
} catch (InterruptedException e) {
159+
// do nothing
160+
}
161+
162+
while (!isMongoClientReady()) {
163+
try {
164+
Thread.sleep(1_000);
165+
} catch (InterruptedException e) {
166+
// do nothing
167+
}
168+
}
169+
}
170+
171+
/**
172+
* Checks if the mongo database is ready to receive commands using a ping command
173+
* @return
174+
*/
175+
private boolean isMongoClientReady() {
176+
try {
177+
MongoDatabase db = mongoClient.getDatabase(MONGODB_DATABASE_NAME);
178+
Document pingResult = db.runCommand(new Document("ping", 1));
179+
return pingResult.getDouble("ok") == 1.0;
180+
} catch (Exception ex) {
181+
// Connection error
182+
return false;
183+
}
156184
}
157185

158186
@Override
@@ -270,4 +298,6 @@ public List<DbSpecification> getDbSpecifications() {
270298
public Object getMongoConnection() {
271299
return mongoClient;
272300
}
301+
302+
273303
}

‎jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.evomaster.client.java.controller.AuthUtils;
99
import org.evomaster.client.java.controller.EmbeddedSutController;
1010
import org.evomaster.client.java.controller.InstrumentedSutStarter;
11-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
11+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
1212
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
1313
import org.evomaster.client.java.sql.DbSpecification;
1414
import org.evomaster.client.java.controller.problem.GraphQlProblem;

‎jdk_11_maven/em/embedded/rest/cwa-verification/src/main/java/em/embedded/app/coronawarn/verification/EmbeddedEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import app.coronawarn.verification.VerificationApplication;
55
import org.evomaster.client.java.controller.EmbeddedSutController;
66
import org.evomaster.client.java.controller.InstrumentedSutStarter;
7-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
7+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
88
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
99
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1010
import org.evomaster.client.java.sql.DbCleaner;

‎jdk_11_maven/em/embedded/rest/market/src/main/java/em/embedded/market/EmbeddedEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.evomaster.client.java.controller.AuthUtils;
55
import org.evomaster.client.java.controller.EmbeddedSutController;
66
import org.evomaster.client.java.controller.InstrumentedSutStarter;
7-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
7+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
88
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
99
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1010
import org.evomaster.client.java.sql.DbCleaner;

‎jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.evomaster.client.java.controller.AuthUtils;
44
import org.evomaster.client.java.controller.ExternalSutController;
55
import org.evomaster.client.java.controller.InstrumentedSutStarter;
6-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
6+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
77
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
88
import org.evomaster.client.java.sql.DbSpecification;
99
import org.evomaster.client.java.controller.problem.GraphQlProblem;

‎jdk_11_maven/em/external/rest/cwa-verification/src/main/java/em/external/app/coronawarn/verification/ExternalEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.evomaster.client.java.controller.ExternalSutController;
44
import org.evomaster.client.java.controller.InstrumentedSutStarter;
5-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
5+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
77
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
88
import org.evomaster.client.java.sql.DbCleaner;

‎jdk_11_maven/em/external/rest/ind1/src/main/java/em/external/org/ind1/ExternalEvoMasterController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.evomaster.client.java.controller.ExternalSutController;
44
import org.evomaster.client.java.controller.InstrumentedSutStarter;
5-
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
5+
import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
77
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
88
import org.evomaster.client.java.sql.DbCleaner;

0 commit comments

Comments
 (0)