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

adapt to new jenkins reporting

Browse source
This commit is contained in:
anhefti 2024-03-05 14:20:44 +01:00
parent d6b3ac43c6
commit 816528de87
6 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pom.xml
View file

@ -189,6 +189,13 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.4.0-b180830.0438</version> <!--$NO-MVN-MAN-VER$ --> <!-- TODO move to stable version when available -->
</dependency>
</dependencies>
</profile>
</profiles>

4
src/test/java/ch/ethz/seb/sebserver/gbl/client/ProxyDataTest.java
View file

@ -16,9 +16,9 @@ public class ProxyDataTest {
@Test
public void testCreation() {
final ProxyData proxyData = new ProxyData("proxyName", 8080, new ClientCredentials("user1", "password"));
final ProxyData proxyData = new ProxyData("proxyName", 8888, new ClientCredentials("user1", "password"));
assertEquals(
"ProxyData [proxyName=proxyName, proxyPort=8080, clientCredentials=ClientCredentials [clientId=user1]]",
"ProxyData [proxyName=proxyName, proxyPort=8888, clientCredentials=ClientCredentials [clientId=user1]]",
proxyData.toString());
}

2
src/test/java/ch/ethz/seb/sebserver/gui/integration/GuiIntegrationTest.java
View file

@ -80,7 +80,7 @@ public abstract class GuiIntegrationTest {
final HttpSession sessionMock = Mockito.mock(HttpSession.class);
final WebserviceURIService webserviceURIService = new WebserviceURIService(
"http", "localhost", "8080", "/", this.endpoint);
"http", "localhost", "8888", "/", this.endpoint);
final ClientHttpRequestFactoryService clientHttpRequestFactoryService = Mockito
.mock(ClientHttpRequestFactoryService.class);

2
src/test/java/ch/ethz/seb/sebserver/gui/integration/SEBClientBot.java
View file

@ -79,7 +79,7 @@ public class SEBClientBot {
private final ObjectMapper jsonMapper = new ObjectMapper();
private final Random random = new Random();
String webserviceAddress = "http://localhost:8080";
String webserviceAddress = "http://localhost:8888";
String accessTokenEndpoint = "/oauth/token";
String clientId = "test";
String sessionId = null;

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

@ -2922,7 +2922,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.getBuilder(NewLmsSetup.class)
.withFormParam(Domain.LMS_SETUP.ATTR_NAME, "Test Open edx")
.withFormParam(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.OPEN_EDX.name())
.withFormParam(Domain.LMS_SETUP.ATTR_LMS_URL, "http://localhost:8080/openedxtest")
.withFormParam(Domain.LMS_SETUP.ATTR_LMS_URL, "http://localhost:8888/openedxtest")
.withFormParam(Domain.LMS_SETUP.ATTR_LMS_CLIENTNAME, "test")
.withFormParam(Domain.LMS_SETUP.ATTR_LMS_CLIENTSECRET, "test")
.call();

2
src/test/resources/application-test.properties
View file

@ -6,7 +6,7 @@ spring.http.encoding.charset=UTF-8
spring.http.encoding.enabled=true
server.address=localhost
server.port=8080
server.port=8888
server.servlet.context-path=/
spring.main.allow-bean-definition-overriding=true