Skip to content

Commit cacc7d9

Browse files
committed
more on external driver
1 parent 4a1218e commit cacc7d9

1 file changed

Lines changed: 9 additions & 28 deletions

File tree

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

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package em.external.reservationsapi;
22

3+
import com.mongodb.client.MongoClient;
4+
import com.mongodb.client.MongoClients;
35
import org.evomaster.client.java.controller.ExternalSutController;
46
import org.evomaster.client.java.controller.InstrumentedSutStarter;
57
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -107,26 +109,15 @@ public ExternalEvoMasterController(
107109
@Override
108110
public String[] getInputParameters() {
109111
return new String[]{
110-
"-micronaut.server.port="+sutPort,
111-
"-datasources.default.url=" + dbUrl()
112+
"--server.port=" + sutPort,
113+
"--spring.data.mongodb.uri="+mongoDbUrl
112114
};
113115
}
114116

115117
public String[] getJVMParameters() {
116118
return new String[]{};
117119
}
118120

119-
private String dbUrl() {
120-
121-
String host = postgres.getContainerIpAddress();
122-
int port = postgres.getMappedPort(5432);
123-
124-
String url = "jdbc";
125-
url += ":postgresql://"+host+":"+port+"/patio";
126-
127-
return url;
128-
}
129-
130121
@Override
131122
public String getBaseURL() {
132123
return "http://localhost:" + sutPort;
@@ -149,22 +140,13 @@ public long getMaxAwaitForInitializationInSeconds() {
149140

150141
@Override
151142
public void preStart() {
152-
postgres.start();
143+
mongodbContainer.start();
144+
mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME;
145+
mongoClient = MongoClients.create(mongoDbUrl);
153146
}
154147

155148
@Override
156149
public void postStart() {
157-
closeDataBaseConnection();
158-
159-
try {
160-
sqlConnection = DriverManager.getConnection(dbUrl(), "patio", "patio");
161-
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
162-
.withSchemas("public").withDisabledSmartClean());
163-
// initSqlOnResourcePath = "/initDb.sql";
164-
165-
} catch (Exception e) {
166-
throw new RuntimeException(e);
167-
}
168150
}
169151

170152
@Override
@@ -174,12 +156,11 @@ public void resetStateOfSUT() {
174156

175157
@Override
176158
public void preStop() {
177-
closeDataBaseConnection();
178159
}
179160

180161
@Override
181162
public void postStop() {
182-
postgres.stop();
163+
mongodbContainer.stop();
183164
}
184165

185166

@@ -192,7 +173,7 @@ public String getPackagePrefixesToCover() {
192173
@Override
193174
public ProblemInfo getProblemInfo() {
194175
return new RestProblem(
195-
"http://localhost:" + getSutPort() + "/v3/api-docs",
176+
"http://localhost:" + sutPort + "/v3/api-docs",
196177
null
197178
);
198179
}

0 commit comments

Comments
 (0)