Skip to content

Commit 97e3f88

Browse files
committed
fixing external for familie-ba-sak
1 parent b3e0a86 commit 97e3f88

2 files changed

Lines changed: 37 additions & 20 deletions

File tree

jdk_17_maven/cs/rest/familie-ba-sak/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,10 @@
455455
<plugin>
456456
<groupId>org.springframework.boot</groupId>
457457
<artifactId>spring-boot-maven-plugin</artifactId>
458+
<configuration>
459+
<finalName>familie-ba-sak</finalName>
460+
<classifier>sut</classifier>
461+
</configuration>
458462
</plugin>
459463
<plugin>
460464
<groupId>org.jetbrains.kotlin</groupId>

jdk_17_maven/em/external/rest/familie-ba-sak/src/main/java/em/external/familie/ba/sak/ExternalEvoMasterController.java

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
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;
8+
import org.evomaster.client.java.controller.problem.RestProblem;
89
import org.evomaster.client.java.sql.DbCleaner;
910
import org.evomaster.client.java.sql.SqlScriptRunner;
1011
import org.evomaster.client.java.sql.SqlScriptRunnerCached;
1112
import org.evomaster.client.java.sql.DbSpecification;
12-
import org.evomaster.client.java.controller.problem.GraphQlProblem;
1313
import org.evomaster.client.java.controller.problem.ProblemInfo;
1414
import org.testcontainers.containers.GenericContainer;
1515

16-
import java.io.InputStream;
17-
import java.io.InputStreamReader;
16+
1817
import java.sql.Connection;
1918
import java.sql.DriverManager;
2019
import java.sql.SQLException;
@@ -65,11 +64,9 @@ public static void main(String[] args) {
6564
private final int sutPort;
6665
private String jarLocation;
6766
private Connection sqlConnection;
68-
//private String INIT_DB_SCRIPT_PATH = "/populateDB.sql";
6967

7068
private List<DbSpecification> dbSpecification;
7169

72-
private String initSQLScript;
7370

7471
private static final String POSTGRES_VERSION = "13.13";
7572

@@ -112,16 +109,34 @@ public ExternalEvoMasterController(
112109

113110
@Override
114111
public String[] getInputParameters() {
115-
return new String[]{"--server.port=" + sutPort};
112+
return new String[]{
113+
"--server.port=" + sutPort,
114+
"--spring.profiles.active=dev",
115+
"--management.server.port=-1",
116+
"--server.ssl.enabled=false",
117+
"--spring.datasource.url=" + dbUrl(),
118+
"--spring.datasource.username=postgres",
119+
"--spring.datasource.password=" + POSTGRES_PASSWORD,
120+
"--sentry.logging.enabled=false",
121+
"--sentry.environment=local",
122+
//TODO check when dealing with Kafka
123+
"--funksjonsbrytere.kafka.producer.enabled=false",
124+
"--funksjonsbrytere.enabled=false",
125+
"--logging.level.root=OFF",
126+
"--logging.config=classpath:logback-spring.xml",
127+
"--logging.level.org.springframework=INFO",
128+
};
116129
}
117130

118131
public String[] getJVMParameters() {
119132

120133
return new String[]{
121-
"-Dspring.datasource.url=" + dbUrl(),
122-
"-Dspring.cache.type=none",
123-
"-Dspring.profiles.active=postgresql,spring-data-jpa",
124-
"-Dspring.jmx.enabled=false",
134+
"-DAZUREAD_TOKEN_ENDPOINT_URL=http://foo",
135+
"-DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar",
136+
"-DAZURE_APP_CLIENT_ID=bar",
137+
"-DNAIS_APP_NAME=bar",
138+
"-DUNLEASH_SERVER_API_URL=http://bar",
139+
"-DUNLEASH_SERVER_API_TOKEN=bar"
125140
};
126141
}
127142

@@ -130,10 +145,8 @@ private String dbUrl() {
130145
String host = postgres.getContainerIpAddress();
131146
int port = postgres.getMappedPort(5432);
132147

133-
String url = "jdbc";
134-
url += ":postgresql://"+host+":"+port+"/petclinic";
135148

136-
return url;
149+
return "jdbc:postgresql://"+host+":"+port+"/familiebasak";
137150
}
138151

139152
@Override
@@ -148,7 +161,7 @@ public String getPathToExecutableJar() {
148161

149162
@Override
150163
public String getLogMessageOfInitializedServer() {
151-
return "Tomcat started on port";
164+
return "Jetty started on port";
152165
}
153166

154167
@Override
@@ -167,10 +180,7 @@ public void postStart() {
167180

168181
try {
169182
sqlConnection = DriverManager.getConnection(dbUrl(), "postgres", POSTGRES_PASSWORD);
170-
171-
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
172-
.withSchemas("public")
173-
);
183+
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection));
174184
} catch (Exception e) {
175185
throw new RuntimeException(e);
176186
}
@@ -203,12 +213,15 @@ private void closeDataBaseConnection() {
203213

204214
@Override
205215
public String getPackagePrefixesToCover() {
206-
return "org.springframework.samples.petclinic";
216+
return "no.nav.familie.ba.sak.";
207217
}
208218

209219
@Override
210220
public ProblemInfo getProblemInfo() {
211-
return new GraphQlProblem("/graphql");
221+
return new RestProblem(
222+
"http://localhost:" + sutPort + "/v3/api-docs",
223+
null
224+
);
212225
}
213226

214227
@Override

0 commit comments

Comments
 (0)