Skip to content

Commit fecee3c

Browse files
committed
driver
1 parent 901ef76 commit fecee3c

4 files changed

Lines changed: 38 additions & 29 deletions

File tree

jdk_17_maven/cs/web/spring-petclinic/pom.xml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,25 @@
55
<artifactId>spring-petclinic</artifactId>
66
<version>3.1.0-SNAPSHOT</version>
77

8-
<parent>
9-
<groupId>org.springframework.boot</groupId>
10-
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>3.1.0</version>
12-
</parent>
8+
<!-- <parent>-->
9+
<!-- <groupId>org.springframework.boot</groupId>-->
10+
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
11+
<!-- <version>3.1.0</version>-->
12+
<!-- </parent>-->
13+
14+
<dependencyManagement>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-parent</artifactId>
19+
<version>3.1.0</version>
20+
<scope>import</scope>
21+
<type>pom</type>
22+
</dependency>
23+
</dependencies>
24+
</dependencyManagement>
25+
26+
1327
<name>petclinic</name>
1428

1529
<properties>

jdk_17_maven/em/embedded/web/spring-petclinic/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515

1616

1717
<dependencies>
18-
18+
<dependency>
19+
<groupId>org.springframework.samples</groupId>
20+
<artifactId>spring-petclinic</artifactId>
21+
<version>3.1.0-SNAPSHOT</version>
22+
</dependency>
1923
</dependencies>
2024

2125

jdk_17_maven/em/embedded/web/spring-petclinic/src/main/java/em/embedded/petclinic/EmbeddedEvoMasterController.java

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
1-
package em.embedded.market;
1+
package em.embedded.petclinic;
22

33

4-
import org.evomaster.client.java.controller.AuthUtils;
54
import org.evomaster.client.java.controller.EmbeddedSutController;
65
import org.evomaster.client.java.controller.InstrumentedSutStarter;
76
import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
87
import org.evomaster.client.java.controller.api.dto.SutInfoDto;
98
import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
10-
import org.evomaster.client.java.controller.db.DbCleaner;
11-
import org.evomaster.client.java.controller.db.SqlScriptRunner;
12-
import org.evomaster.client.java.controller.db.SqlScriptRunnerCached;
139
import org.evomaster.client.java.controller.internal.db.DbSpecification;
1410
import org.evomaster.client.java.controller.problem.ProblemInfo;
1511
import org.evomaster.client.java.controller.problem.RestProblem;
12+
import org.evomaster.client.java.controller.problem.WebProblem;
1613
import org.springframework.boot.SpringApplication;
1714
import org.springframework.context.ConfigurableApplicationContext;
1815
import org.springframework.jdbc.core.JdbcTemplate;
16+
import org.springframework.samples.petclinic.PetClinicApplication;
1917

2018
import java.sql.Connection;
2119
import java.sql.SQLException;
2220
import java.util.Arrays;
2321
import java.util.List;
2422
import java.util.Map;
25-
import java.util.Scanner;
2623

2724
/**
2825
* Class used to start/stop the SUT. This will be controller by the EvoMaster process
2926
*/
3027
public class EmbeddedEvoMasterController extends EmbeddedSutController {
3128

32-
FIXME
3329
public static void main(String[] args) {
3430

3531
int port = 40100;
@@ -60,9 +56,10 @@ public EmbeddedEvoMasterController(int port) {
6056
@Override
6157
public String startSut() {
6258

63-
ctx = SpringApplication.run(market.RestApplication.class, new String[]{
59+
ctx = SpringApplication.run(PetClinicApplication.class, new String[]{
6460
"--server.port=0",
65-
"--spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;"
61+
"--spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;",
62+
"--spring.sql.init.data-locations="
6663
});
6764

6865
if (sqlConnection != null) {
@@ -80,7 +77,8 @@ public String startSut() {
8077

8178
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection)
8279
//.withInitSqlOnResourcePath("/data.sql"));
83-
.withDisabledSmartClean());
80+
//.withDisabledSmartClean()
81+
);
8482

8583
return "http://localhost:" + getSutPort();
8684
}
@@ -104,23 +102,19 @@ public void stopSut() {
104102

105103
@Override
106104
public String getPackagePrefixesToCover() {
107-
return "market.";
105+
return "org.springframework.samples.petclinic";
108106
}
109107

110108
@Override
111109
public void resetStateOfSUT() {
112-
DbCleaner.clearDatabase_H2(sqlConnection, null);
113-
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/data.sql");
110+
// DbCleaner.clearDatabase_H2(sqlConnection, null);
111+
// SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/data.sql");
114112
}
115113

116114
@Override
117115
public ProblemInfo getProblemInfo() {
118116

119-
return new RestProblem(
120-
"http://localhost:" + getSutPort() + "/v2/api-docs",
121-
null,
122-
null
123-
);
117+
return new WebProblem("http://localhost:"+getSutPort()+"/");
124118
}
125119

126120
@Override
@@ -130,10 +124,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
130124

131125
@Override
132126
public List<AuthenticationDto> getInfoForAuthentication() {
133-
return Arrays.asList(
134-
AuthUtils.getForBasic("admin","admin","password"),
135-
AuthUtils.getForBasic("user", "ivan.petrov@yandex.ru", "petrov")
136-
);
127+
return null;
137128
}
138129

139130

jdk_17_maven/em/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packaging>pom</packaging>
1313

1414
<modules>
15-
<module>external</module>
15+
<!-- <module>external</module>-->
1616
<module>embedded</module>
1717
</modules>
1818

0 commit comments

Comments
 (0)