Skip to content

Commit a55844c

Browse files
man-zhangman-zhang
committed
update based on smart clean
1 parent 862d0f8 commit a55844c

39 files changed

Lines changed: 386 additions & 70 deletions

File tree

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
88
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
99
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
10+
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
1011
import org.evomaster.client.java.controller.db.DbCleaner;
1112
import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
1213
import org.evomaster.client.java.controller.internal.SutController;
14+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1315
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1416
import org.evomaster.client.java.controller.problem.ProblemInfo;
1517
import org.testcontainers.containers.GenericContainer;
@@ -38,6 +40,7 @@ public static void main(String[] args){
3840

3941
private ApplicationContext ctx;
4042
private Connection connection;
43+
private DbSpecification dbSpecification;
4144

4245
private final int portApp = 8080; //Hardcoded. will need fixing
4346
// TODO maybe report at https://github.com/micronaut-projects/micronaut-core/issues
@@ -90,6 +93,11 @@ public String startSut() {
9093
throw new RuntimeException(e);
9194
}
9295

96+
dbSpecification = new DbSpecification(){{
97+
dbType = DatabaseType.POSTGRES;
98+
schemaName = "public";
99+
initSqlOnResourcePath = "/initDb.sql";
100+
}};
93101

94102
return "http://localhost:" + getSutPort();
95103
}
@@ -121,8 +129,8 @@ public String getPackagePrefixesToCover() {
121129

122130
@Override
123131
public void resetStateOfSUT() {
124-
DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
125-
SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
132+
// DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
133+
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
126134
}
127135

128136
@Override
@@ -160,4 +168,9 @@ public Connection getConnection() {
160168
public String getDatabaseDriverName() {
161169
return "org.postgresql.Driver";
162170
}
171+
172+
public DbSpecification getDbSpecification() {
173+
return dbSpecification;
174+
}
175+
163176
}

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto;
77
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
8+
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
89
import org.evomaster.client.java.controller.db.DbCleaner;
910
import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
11+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1012
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1113
import org.evomaster.client.java.controller.problem.ProblemInfo;
1214
import org.testcontainers.containers.GenericContainer;
@@ -60,6 +62,7 @@ public static void main(String[] args) {
6062
private final int sutPort;
6163
private String jarLocation;
6264
private Connection connection;
65+
private DbSpecification dbSpecification;
6366

6467
private static final GenericContainer postgres = new GenericContainer("postgres:9")
6568
.withEnv("POSTGRES_HOST_AUTH_METHOD","trust")
@@ -149,15 +152,20 @@ public void postStart() {
149152
try {
150153
Class.forName(getDatabaseDriverName());
151154
connection = DriverManager.getConnection(dbUrl(), "patio", "patio");
155+
dbSpecification = new DbSpecification(){{
156+
dbType = DatabaseType.POSTGRES;
157+
schemaName = "public";
158+
initSqlOnResourcePath = "/initDb.sql";
159+
}};
152160
} catch (Exception e) {
153161
throw new RuntimeException(e);
154162
}
155163
}
156164

157165
@Override
158166
public void resetStateOfSUT() {
159-
DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
160-
SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
167+
// DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
168+
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
161169
}
162170

163171
@Override
@@ -221,4 +229,9 @@ public List<AuthenticationDto> getInfoForAuthentication() {
221229

222230
return List.of(dto);
223231
}
232+
233+
@Override
234+
public DbSpecification getDbSpecification() {
235+
return dbSpecification;
236+
}
224237
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.evomaster.client.java.controller.InstrumentedSutStarter;
88
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
99
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
10+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1011
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1112
import org.evomaster.client.java.controller.problem.ProblemInfo;
1213
import org.testcontainers.containers.GenericContainer;
@@ -152,6 +153,11 @@ public void resetStateOfSUT() {
152153
}
153154
}
154155

156+
@Override
157+
public DbSpecification getDbSpecification() {
158+
return null;
159+
}
160+
155161
@Override
156162
public ProblemInfo getProblemInfo() {
157163
return new GraphQlProblem("/v5/graphql");

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import org.evomaster.client.java.controller.InstrumentedSutStarter;
77
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
88
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
9+
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
910
import org.evomaster.client.java.controller.db.DbCleaner;
11+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1012
import org.evomaster.client.java.controller.problem.ProblemInfo;
1113
import org.evomaster.client.java.controller.problem.RestProblem;
1214
import org.springframework.boot.SpringApplication;
@@ -15,6 +17,7 @@
1517

1618
import java.sql.Connection;
1719
import java.sql.SQLException;
20+
import java.util.Arrays;
1821
import java.util.List;
1922
import java.util.Map;
2023
import java.util.Scanner;
@@ -40,6 +43,7 @@ public static void main(String[] args) {
4043

4144
private ConfigurableApplicationContext ctx;
4245
private Connection connection;
46+
private DbSpecification dbSpecification;
4347

4448

4549
public EmbeddedEvoMasterController() {
@@ -76,6 +80,12 @@ public String startSut() {
7680
throw new RuntimeException(e);
7781
}
7882

83+
// need to check tablesToSkip with DATABASECHANGELOG
84+
dbSpecification = new DbSpecification(){{
85+
dbType = DatabaseType.H2;
86+
connections = Arrays.asList(connection);
87+
}};
88+
7989
return "http://localhost:" + getSutPort();
8090
}
8191

@@ -103,7 +113,7 @@ public String getPackagePrefixesToCover() {
103113

104114
@Override
105115
public void resetStateOfSUT() {
106-
DbCleaner.clearDatabase_H2(connection, List.of("DATABASECHANGELOG"));
116+
// DbCleaner.clearDatabase_H2(connection, List.of("DATABASECHANGELOG"));
107117
}
108118

109119
@Override
@@ -133,5 +143,8 @@ public Connection getConnection() {
133143
}
134144

135145

136-
146+
@Override
147+
public DbSpecification getDbSpecification() {
148+
return dbSpecification;
149+
}
137150
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.evomaster.client.java.controller.InstrumentedSutStarter;
66
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
77
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
8+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
89
import org.evomaster.client.java.controller.problem.GraphQlProblem;
910
import org.evomaster.client.java.controller.problem.ProblemInfo;
1011
import org.testcontainers.containers.GenericContainer;
@@ -227,5 +228,8 @@ public Connection getConnection() {
227228
return null;
228229
}
229230

230-
231+
@Override
232+
public DbSpecification getDbSpecification() {
233+
return null;
234+
}
231235
}

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
import org.evomaster.client.java.controller.InstrumentedSutStarter;
55
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
7+
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
78
import org.evomaster.client.java.controller.db.DbCleaner;
9+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
810
import org.evomaster.client.java.controller.problem.ProblemInfo;
911
import org.evomaster.client.java.controller.problem.RestProblem;
1012
import org.h2.tools.Server;
1113

1214
import java.sql.Connection;
1315
import java.sql.DriverManager;
1416
import java.sql.SQLException;
17+
import java.util.Arrays;
1518
import java.util.List;
1619
import java.util.Scanner;
1720

@@ -57,6 +60,7 @@ public static void main(String[] args) {
5760
private final int dbPort;
5861
private String jarLocation;
5962
private Connection connection;
63+
private DbSpecification dbSpecification;
6064
private Server h2;
6165

6266
public ExternalEvoMasterController() {
@@ -143,14 +147,18 @@ public void postStart() {
143147
try {
144148
Class.forName("org.h2.Driver");
145149
connection = DriverManager.getConnection(dbUrl(), "sa", "");
150+
dbSpecification = new DbSpecification(){{
151+
dbType = DatabaseType.H2;
152+
connections = Arrays.asList(connection);
153+
}};
146154
} catch (Exception e) {
147155
throw new RuntimeException(e);
148156
}
149157
}
150158

151159
@Override
152160
public void resetStateOfSUT() {
153-
DbCleaner.clearDatabase_H2(connection);
161+
// DbCleaner.clearDatabase_H2(connection);
154162
}
155163

156164
@Override
@@ -209,4 +217,8 @@ public Connection getConnection() {
209217
return connection;
210218
}
211219

220+
@Override
221+
public DbSpecification getDbSpecification() {
222+
return dbSpecification;
223+
}
212224
}

‎jdk_8_maven/em/embedded/graphql/graphql-ncs/src/main/java/em/embedded/org/graphqlncs/EmbeddedEvoMasterController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
77
import org.evomaster.client.java.controller.internal.SutController;
8+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
89
import org.evomaster.client.java.controller.problem.GraphQlProblem;
910
import org.evomaster.client.java.controller.problem.ProblemInfo;
1011

@@ -103,4 +104,9 @@ public Connection getConnection() {
103104
public String getDatabaseDriverName() {
104105
return null;
105106
}
107+
108+
@Override
109+
public DbSpecification getDbSpecification() {
110+
return null;
111+
}
106112
}

‎jdk_8_maven/em/embedded/graphql/graphql-scs/src/main/java/em/embedded/org/graphqlscs/EmbeddedEvoMasterController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
77
import org.evomaster.client.java.controller.internal.SutController;
8+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
89
import org.evomaster.client.java.controller.problem.GraphQlProblem;
910
import org.evomaster.client.java.controller.problem.ProblemInfo;
1011
import org.springframework.boot.SpringApplication;
@@ -101,4 +102,9 @@ public Connection getConnection() {
101102
public String getDatabaseDriverName() {
102103
return null;
103104
}
105+
106+
@Override
107+
public DbSpecification getDbSpecification() {
108+
return null;
109+
}
104110
}

‎jdk_8_maven/em/embedded/graphql/spring-petclinic-graphql/src/main/java/em/embedded/org/springframework/samples/petclinic/EmbeddedEvoMasterController.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import org.evomaster.client.java.controller.InstrumentedSutStarter;
55
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
66
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
7+
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
78
import org.evomaster.client.java.controller.db.DbCleaner;
89
import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
910
import org.evomaster.client.java.controller.internal.SutController;
11+
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1012
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1113
import org.evomaster.client.java.controller.problem.ProblemInfo;
1214
import org.springframework.boot.SpringApplication;
@@ -17,6 +19,7 @@
1719

1820
import java.sql.Connection;
1921
import java.sql.SQLException;
22+
import java.util.Arrays;
2023
import java.util.Collections;
2124
import java.util.List;
2225
import java.util.Map;
@@ -38,6 +41,7 @@ public static void main(String[] args){
3841

3942
private ConfigurableApplicationContext ctx;
4043
private Connection connection;
44+
private DbSpecification dbSpecification;
4145

4246
private static final GenericContainer postgres = new GenericContainer("postgres:9")
4347
.withExposedPorts(5432)
@@ -87,7 +91,14 @@ public String startSut() {
8791
throw new RuntimeException(e);
8892
}
8993

90-
SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/db/postgresql/initDB.sql");
94+
dbSpecification = new DbSpecification(){{
95+
dbType = DatabaseType.POSTGRES;
96+
connections = Arrays.asList(connection);
97+
schemaName = "public";
98+
initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
99+
}};
100+
101+
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/db/postgresql/initDB.sql");
91102

92103
return "http://localhost:" + getSutPort();
93104
}
@@ -117,8 +128,8 @@ public String getPackagePrefixesToCover() {
117128

118129
@Override
119130
public void resetStateOfSUT() {
120-
DbCleaner.clearDatabase_Postgres(connection,"public", null);
121-
SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/db/postgresql/populateDB.sql");
131+
// DbCleaner.clearDatabase_Postgres(connection,"public", null);
132+
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/db/postgresql/populateDB.sql");
122133
}
123134

124135
@Override
@@ -145,4 +156,9 @@ public Connection getConnection() {
145156
public String getDatabaseDriverName() {
146157
return "org.postgresql.Driver";
147158
}
159+
160+
@Override
161+
public DbSpecification getDbSpecification() {
162+
return dbSpecification;
163+
}
148164
}

0 commit comments

Comments
 (0)