zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more tests / back to JUnit 4

Browse source
This commit is contained in:
anhefti 2019-12-03 16:55:14 +01:00
parent 43554b8215
commit c0654b10ad
4 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pom.xml
View file

@ -174,12 +174,13 @@
<goal>report</goal> <goal>report</goal>
</goals> </goals>
<configuration> <configuration>
<excludes>ch/ethz/seb/sebserver/gui/content/**/* <excludes>
<exclude>ch/ethz/seb/sebserver/gui/content/**/*</exclude> ch/ethz/seb/sebserver/gui/content/**/*
<exclude>ch/ethz/seb/sebserver/gui/form/**/*</exclude> <exclude>ch/ethz/seb/sebserver/gui/content/**/*</exclude>
<exclude>ch/ethz/seb/sebserver/gui/table/**/*</exclude> <exclude>ch/ethz/seb/sebserver/gui/form/**/*</exclude>
<exclude>ch/ethz/seb/sebserver/gui/widget/**/*</exclude> <exclude>ch/ethz/seb/sebserver/gui/table/**/*</exclude>
</excludes> <exclude>ch/ethz/seb/sebserver/gui/widget/**/*</exclude>
</excludes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -329,15 +330,21 @@
<!-- Testing --> <!-- Testing -->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>junit</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency> -->
<!-- <groupId>org.junit.jupiter</groupId> -->
<!-- <artifactId>junit-jupiter-api</artifactId> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.junit.vintage</groupId> -->
<!-- <artifactId>junit-vintage-engine</artifactId> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

2
src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java
View file

@ -14,7 +14,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.Test;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

8
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -23,9 +23,9 @@ import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.tomcat.util.buf.StringUtils; import org.apache.tomcat.util.buf.StringUtils;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.Sql;
@ -117,13 +117,13 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.SaveU
public class UseCasesIntegrationTest extends GuiIntegrationTest { public class UseCasesIntegrationTest extends GuiIntegrationTest {
@BeforeAll @Before
@Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" }) @Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" })
public void init() { public void init() {
} }
@AfterAll @After
@Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" }) @Sql(scripts = { "classpath:schema-test.sql", "classpath:data-test.sql" })
public void cleanup() { public void cleanup() {

4
src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/edx/OpenEdxCourseRestrictionDataTest.java
View file

@ -10,7 +10,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.edx;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.junit.jupiter.api.Test; import org.junit.Test;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
@ -26,7 +26,7 @@ public class OpenEdxCourseRestrictionDataTest {
final OpenEdxCourseRestrictionData data = new OpenEdxCourseRestrictionData(null, null, null, null, null, false); final OpenEdxCourseRestrictionData data = new OpenEdxCourseRestrictionData(null, null, null, null, null, false);
final String json = mapper.writeValueAsString(data); final String json = mapper.writeValueAsString(data);
assertEquals( assertEquals(
"{\"CONFIG_KEYS\":[],\"BROWSER_KEYS\":[],\"WHITELIST_PATHS\":[],\"BLACKLIST_CHAPTERS\":[],\"PERMISSION_COMPONENTS\":[\"AlwaysAllowStaff\"],\"USER_BANNING_ENABLED\":false}", "{\"CONFIG_KEYS\":[],\"BROWSER_KEYS\":[],\"WHITELIST_PATHS\":[],\"BLACKLIST_CHAPTERS\":[],\"PERMISSION_COMPONENTS\":[],\"USER_BANNING_ENABLED\":false}",
json); json);
} }