From 2a0906109cfd82fdfe97ac36aec17003e19b20ec Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 14 Jun 2019 08:55:37 +0200
Subject: [PATCH] OO-4007: update undertow to version 2.0.21
---
pom.xml | 4 ++--
src/test/java/org/olat/commons/info/InfoManagerTest.java | 2 +-
src/test/java/org/olat/restapi/AuthenticationTest.java | 4 ++--
src/test/java/org/olat/restapi/CalendarTest.java | 4 ++--
src/test/java/org/olat/restapi/CatalogTest.java | 4 ++--
src/test/java/org/olat/restapi/CertificationTest.java | 4 ++--
src/test/java/org/olat/restapi/ChangePasswordTest.java | 4 ++--
src/test/java/org/olat/restapi/ContactsTest.java | 4 ++--
src/test/java/org/olat/restapi/CourseCalendarTest.java | 4 ++--
src/test/java/org/olat/restapi/CourseDBTest.java | 4 ++--
src/test/java/org/olat/restapi/CourseGroupMgmtTest.java | 6 +++---
src/test/java/org/olat/restapi/CoursePublishTest.java | 4 ++--
src/test/java/org/olat/restapi/CourseSecurityTest.java | 4 ++--
src/test/java/org/olat/restapi/CourseTest.java | 4 ++--
.../java/org/olat/restapi/CoursesContactElementTest.java | 4 ++--
src/test/java/org/olat/restapi/CoursesElementsTest.java | 4 ++--
src/test/java/org/olat/restapi/CoursesFoldersTest.java | 4 ++--
src/test/java/org/olat/restapi/CoursesForumsTest.java | 4 ++--
src/test/java/org/olat/restapi/CoursesInfosTest.java | 4 ++--
.../org/olat/restapi/CoursesResourcesFoldersTest.java | 4 ++--
src/test/java/org/olat/restapi/CoursesTest.java | 4 ++--
.../restapi/CurriculumElementTypesWebServiceTest.java | 4 ++--
.../olat/restapi/CurriculumElementsWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/CurriculumsWebServiceTest.java | 4 ++--
.../olat/restapi/DocumentPoolModuleWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/EfficiencyStatementTest.java | 4 ++--
src/test/java/org/olat/restapi/ForumTest.java | 4 ++--
src/test/java/org/olat/restapi/GroupFoldersTest.java | 8 ++++----
src/test/java/org/olat/restapi/GroupMgmtTest.java | 4 ++--
src/test/java/org/olat/restapi/I18nTest.java | 4 ++--
.../IdentityToIdentityRelationsWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/LecturesBlockRollCallTest.java | 4 ++--
.../java/org/olat/restapi/LecturesBlocksRootTest.java | 4 ++--
src/test/java/org/olat/restapi/LecturesBlocksTest.java | 4 ++--
src/test/java/org/olat/restapi/MyForumsTest.java | 4 ++--
.../org/olat/restapi/NotificationsSubscribersTest.java | 4 ++--
src/test/java/org/olat/restapi/NotificationsTest.java | 4 ++--
.../org/olat/restapi/OrganisationTypesWebServiceTest.java | 4 ++--
.../org/olat/restapi/OrganisationsWebServiceTest.java | 4 ++--
src/test/java/org/olat/restapi/QuestionPoolTest.java | 4 ++--
src/test/java/org/olat/restapi/RegistrationTest.java | 4 ++--
.../org/olat/restapi/RelationRolesWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/RemindersWebServiceTest.java | 4 ++--
src/test/java/org/olat/restapi/RepositoryEntriesTest.java | 4 ++--
.../org/olat/restapi/RepositoryEntryLifecycleTest.java | 4 ++--
.../org/olat/restapi/RepositoryEntryWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/RestApiLoginFilterTest.java | 8 ++++----
src/test/java/org/olat/restapi/SharedFolderTest.java | 4 ++--
src/test/java/org/olat/restapi/SystemTest.java | 4 ++--
.../java/org/olat/restapi/TaxonomyWebServiceTest.java | 4 ++--
.../java/org/olat/restapi/UserAuthenticationMgmtTest.java | 4 ++--
src/test/java/org/olat/restapi/UserCoursesTest.java | 4 ++--
src/test/java/org/olat/restapi/UserFoldersTest.java | 4 ++--
src/test/java/org/olat/restapi/UserMgmtTest.java | 4 ++--
.../{OlatJerseyTestCase.java => OlatRestTestCase.java} | 8 ++++----
55 files changed, 116 insertions(+), 116 deletions(-)
rename src/test/java/org/olat/test/{OlatJerseyTestCase.java => OlatRestTestCase.java} (95%)
diff --git a/pom.xml b/pom.xml
index 1a69f130bae..6468216274c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2537,13 +2537,13 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
- <version>1.4.26.Final</version>
+ <version>2.0.21.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
- <version>1.4.26.Final</version>
+ <version>2.0.21.Final</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/olat/commons/info/InfoManagerTest.java b/src/test/java/org/olat/commons/info/InfoManagerTest.java
index 63d1f08e63a..ff3fe30938c 100644
--- a/src/test/java/org/olat/commons/info/InfoManagerTest.java
+++ b/src/test/java/org/olat/commons/info/InfoManagerTest.java
@@ -68,7 +68,7 @@ public class InfoManagerTest extends OlatTestCase {
/**
* Set up a course with learn group and group area
- * @see org.olat.test.OlatJerseyTestCase#setUp()
+ * @see org.olat.test.OlatRestTestCase#setUp()
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/org/olat/restapi/AuthenticationTest.java b/src/test/java/org/olat/restapi/AuthenticationTest.java
index f94e4425ac3..3c6622a2d12 100644
--- a/src/test/java/org/olat/restapi/AuthenticationTest.java
+++ b/src/test/java/org/olat/restapi/AuthenticationTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
import org.olat.core.logging.Tracing;
import org.olat.core.util.StringHelper;
import org.olat.restapi.security.RestSecurityHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
*
@@ -63,7 +63,7 @@ import org.olat.test.OlatJerseyTestCase;
* Initial Date: 14 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class AuthenticationTest extends OlatJerseyTestCase {
+public class AuthenticationTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(AuthenticationTest.class);
diff --git a/src/test/java/org/olat/restapi/CalendarTest.java b/src/test/java/org/olat/restapi/CalendarTest.java
index b51ef0cb4c2..d4c016bf6d2 100644
--- a/src/test/java/org/olat/restapi/CalendarTest.java
+++ b/src/test/java/org/olat/restapi/CalendarTest.java
@@ -69,7 +69,7 @@ import org.olat.repository.RepositoryManager;
import org.olat.repository.RepositoryService;
import org.olat.restapi.support.vo.CourseConfigVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class CalendarTest extends OlatJerseyTestCase {
+public class CalendarTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CalendarTest.class);
diff --git a/src/test/java/org/olat/restapi/CatalogTest.java b/src/test/java/org/olat/restapi/CatalogTest.java
index 8972cc2ccc9..d3757891d53 100644
--- a/src/test/java/org/olat/restapi/CatalogTest.java
+++ b/src/test/java/org/olat/restapi/CatalogTest.java
@@ -70,7 +70,7 @@ import org.olat.resource.OLATResourceManager;
import org.olat.restapi.support.vo.CatalogEntryVO;
import org.olat.restapi.support.vo.CatalogEntryVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +86,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 6 mai 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class CatalogTest extends OlatJerseyTestCase {
+public class CatalogTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CatalogTest.class);
diff --git a/src/test/java/org/olat/restapi/CertificationTest.java b/src/test/java/org/olat/restapi/CertificationTest.java
index 87bf68303eb..d4d410b9b83 100644
--- a/src/test/java/org/olat/restapi/CertificationTest.java
+++ b/src/test/java/org/olat/restapi/CertificationTest.java
@@ -54,7 +54,7 @@ import org.olat.course.certificate.model.CertificateInfos;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.ObjectFactory;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -63,7 +63,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CertificationTest extends OlatJerseyTestCase {
+public class CertificationTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/ChangePasswordTest.java b/src/test/java/org/olat/restapi/ChangePasswordTest.java
index 13026bd3b1f..7f1eb9091a2 100644
--- a/src/test/java/org/olat/restapi/ChangePasswordTest.java
+++ b/src/test/java/org/olat/restapi/ChangePasswordTest.java
@@ -39,7 +39,7 @@ import org.olat.core.id.UserConstants;
import org.olat.registration.RegistrationManager;
import org.olat.registration.restapi.TemporaryKeyVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -48,7 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class ChangePasswordTest extends OlatJerseyTestCase {
+public class ChangePasswordTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/ContactsTest.java b/src/test/java/org/olat/restapi/ContactsTest.java
index 15e7b4f88be..a45336949f1 100644
--- a/src/test/java/org/olat/restapi/ContactsTest.java
+++ b/src/test/java/org/olat/restapi/ContactsTest.java
@@ -52,11 +52,11 @@ import org.olat.repository.RepositoryService;
import org.olat.resource.OLATResource;
import org.olat.resource.OLATResourceManager;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.ContactVOes;
import org.springframework.beans.factory.annotation.Autowired;
-public class ContactsTest extends OlatJerseyTestCase {
+public class ContactsTest extends OlatRestTestCase {
private static boolean initialized = false;
diff --git a/src/test/java/org/olat/restapi/CourseCalendarTest.java b/src/test/java/org/olat/restapi/CourseCalendarTest.java
index 724d6aab907..b354c88b5df 100644
--- a/src/test/java/org/olat/restapi/CourseCalendarTest.java
+++ b/src/test/java/org/olat/restapi/CourseCalendarTest.java
@@ -68,7 +68,7 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.restapi.support.vo.CourseConfigVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -80,7 +80,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CourseCalendarTest extends OlatJerseyTestCase {
+public class CourseCalendarTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CourseCalendarTest.class);
diff --git a/src/test/java/org/olat/restapi/CourseDBTest.java b/src/test/java/org/olat/restapi/CourseDBTest.java
index b9ddd7a5e75..85c7f212d74 100644
--- a/src/test/java/org/olat/restapi/CourseDBTest.java
+++ b/src/test/java/org/olat/restapi/CourseDBTest.java
@@ -50,7 +50,7 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager;
import org.olat.restapi.support.vo.KeyValuePair;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -59,7 +59,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CourseDBTest extends OlatJerseyTestCase {
+public class CourseDBTest extends OlatRestTestCase {
private Identity auth;
private ICourse course;
diff --git a/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java b/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
index 49e79fe732a..d310646813b 100644
--- a/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
+++ b/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
@@ -63,7 +63,7 @@ import org.olat.group.manager.BusinessGroupRelationDAO;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.vo.GroupVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 6 mai 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class CourseGroupMgmtTest extends OlatJerseyTestCase {
+public class CourseGroupMgmtTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CourseGroupMgmtTest.class);
@@ -100,7 +100,7 @@ public class CourseGroupMgmtTest extends OlatJerseyTestCase {
/**
* Set up a course with learn group and group area
- * @see org.olat.test.OlatJerseyTestCase#setUp()
+ * @see org.olat.test.OlatRestTestCase#setUp()
*/
@Before
public void setUp() throws Exception {
diff --git a/src/test/java/org/olat/restapi/CoursePublishTest.java b/src/test/java/org/olat/restapi/CoursePublishTest.java
index 7af79434cfb..5f1b49b32f6 100644
--- a/src/test/java/org/olat/restapi/CoursePublishTest.java
+++ b/src/test/java/org/olat/restapi/CoursePublishTest.java
@@ -46,7 +46,7 @@ import org.olat.course.nodes.CourseNode;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.vo.CourseVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -56,7 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CoursePublishTest extends OlatJerseyTestCase {
+public class CoursePublishTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/CourseSecurityTest.java b/src/test/java/org/olat/restapi/CourseSecurityTest.java
index 87c00522b7d..57c1f5c4099 100644
--- a/src/test/java/org/olat/restapi/CourseSecurityTest.java
+++ b/src/test/java/org/olat/restapi/CourseSecurityTest.java
@@ -54,7 +54,7 @@ import org.olat.course.ICourse;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -66,7 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* Initial Date: 6 mai 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class CourseSecurityTest extends OlatJerseyTestCase {
+public class CourseSecurityTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CourseTest.class);
diff --git a/src/test/java/org/olat/restapi/CourseTest.java b/src/test/java/org/olat/restapi/CourseTest.java
index e1c0a9c9f9c..8b8d16e3253 100644
--- a/src/test/java/org/olat/restapi/CourseTest.java
+++ b/src/test/java/org/olat/restapi/CourseTest.java
@@ -78,7 +78,7 @@ import org.olat.restapi.support.vo.CourseVO;
import org.olat.restapi.support.vo.RepositoryEntryAccessVO;
import org.olat.restapi.support.vo.RepositoryEntryVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.olat.user.restapi.UserVOFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +86,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-public class CourseTest extends OlatJerseyTestCase {
+public class CourseTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CourseTest.class);
diff --git a/src/test/java/org/olat/restapi/CoursesContactElementTest.java b/src/test/java/org/olat/restapi/CoursesContactElementTest.java
index b2454cb0f60..ecc34ca5e9b 100644
--- a/src/test/java/org/olat/restapi/CoursesContactElementTest.java
+++ b/src/test/java/org/olat/restapi/CoursesContactElementTest.java
@@ -60,7 +60,7 @@ import org.olat.modules.ModuleConfiguration;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.vo.CourseNodeVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -72,7 +72,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* Initial Date: 6 mai 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class CoursesContactElementTest extends OlatJerseyTestCase {
+public class CoursesContactElementTest extends OlatRestTestCase {
private Identity admin;
private ICourse course1;
diff --git a/src/test/java/org/olat/restapi/CoursesElementsTest.java b/src/test/java/org/olat/restapi/CoursesElementsTest.java
index e19bdedbb27..a9302337592 100644
--- a/src/test/java/org/olat/restapi/CoursesElementsTest.java
+++ b/src/test/java/org/olat/restapi/CoursesElementsTest.java
@@ -83,9 +83,9 @@ import org.olat.restapi.support.vo.RepositoryEntryVO;
import org.olat.restapi.support.vo.elements.SurveyConfigVO;
import org.olat.restapi.support.vo.elements.TaskConfigVO;
import org.olat.restapi.support.vo.elements.TestConfigVO;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
-public class CoursesElementsTest extends OlatJerseyTestCase {
+public class CoursesElementsTest extends OlatRestTestCase {
private RestConnection conn;
diff --git a/src/test/java/org/olat/restapi/CoursesFoldersTest.java b/src/test/java/org/olat/restapi/CoursesFoldersTest.java
index 7c902fa86b2..f4de64c2727 100644
--- a/src/test/java/org/olat/restapi/CoursesFoldersTest.java
+++ b/src/test/java/org/olat/restapi/CoursesFoldersTest.java
@@ -65,10 +65,10 @@ import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.restapi.support.vo.FolderVO;
import org.olat.restapi.support.vo.FolderVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
-public class CoursesFoldersTest extends OlatJerseyTestCase {
+public class CoursesFoldersTest extends OlatRestTestCase {
private RestConnection conn;
diff --git a/src/test/java/org/olat/restapi/CoursesForumsTest.java b/src/test/java/org/olat/restapi/CoursesForumsTest.java
index 25108d94c63..dcbc8f038d4 100644
--- a/src/test/java/org/olat/restapi/CoursesForumsTest.java
+++ b/src/test/java/org/olat/restapi/CoursesForumsTest.java
@@ -50,7 +50,7 @@ import org.olat.modules.fo.restapi.MessageVOes;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -62,7 +62,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class CoursesForumsTest extends OlatJerseyTestCase {
+public class CoursesForumsTest extends OlatRestTestCase {
private static ICourse course1;
private static CourseNode forumNode;
diff --git a/src/test/java/org/olat/restapi/CoursesInfosTest.java b/src/test/java/org/olat/restapi/CoursesInfosTest.java
index f0dd639b9c9..c8fc4889ccb 100644
--- a/src/test/java/org/olat/restapi/CoursesInfosTest.java
+++ b/src/test/java/org/olat/restapi/CoursesInfosTest.java
@@ -47,7 +47,7 @@ import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.restapi.support.vo.CourseInfoVO;
import org.olat.restapi.support.vo.CourseInfoVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -56,7 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CoursesInfosTest extends OlatJerseyTestCase {
+public class CoursesInfosTest extends OlatRestTestCase {
@Autowired
private BaseSecurity securityManager;
diff --git a/src/test/java/org/olat/restapi/CoursesResourcesFoldersTest.java b/src/test/java/org/olat/restapi/CoursesResourcesFoldersTest.java
index 250d34b5f7b..e99302c5ca7 100644
--- a/src/test/java/org/olat/restapi/CoursesResourcesFoldersTest.java
+++ b/src/test/java/org/olat/restapi/CoursesResourcesFoldersTest.java
@@ -62,10 +62,10 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.restapi.support.vo.LinkVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
-public class CoursesResourcesFoldersTest extends OlatJerseyTestCase {
+public class CoursesResourcesFoldersTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CoursesResourcesFoldersTest.class);
diff --git a/src/test/java/org/olat/restapi/CoursesTest.java b/src/test/java/org/olat/restapi/CoursesTest.java
index bbdfc418ba5..63939d4fc4d 100644
--- a/src/test/java/org/olat/restapi/CoursesTest.java
+++ b/src/test/java/org/olat/restapi/CoursesTest.java
@@ -76,13 +76,13 @@ import org.olat.repository.model.RepositoryEntryLifecycle;
import org.olat.restapi.support.vo.CourseVO;
import org.olat.restapi.support.vo.CourseVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-public class CoursesTest extends OlatJerseyTestCase {
+public class CoursesTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CoursesTest.class);
diff --git a/src/test/java/org/olat/restapi/CurriculumElementTypesWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumElementTypesWebServiceTest.java
index a8e8b8016f9..f68a3295de7 100644
--- a/src/test/java/org/olat/restapi/CurriculumElementTypesWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumElementTypesWebServiceTest.java
@@ -50,7 +50,7 @@ import org.olat.modules.curriculum.CurriculumElementTypeToType;
import org.olat.modules.curriculum.CurriculumService;
import org.olat.modules.curriculum.model.CurriculumElementTypeRefImpl;
import org.olat.modules.curriculum.restapi.CurriculumElementTypeVO;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -62,7 +62,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CurriculumElementTypesWebServiceTest extends OlatJerseyTestCase {
+public class CurriculumElementTypesWebServiceTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
index 9a8cb0a4453..28e1e685fd3 100644
--- a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
@@ -75,7 +75,7 @@ import org.olat.modules.taxonomy.restapi.TaxonomyLevelVO;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.vo.RepositoryEntryVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.olat.user.restapi.UserVOFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -89,7 +89,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
+public class CurriculumElementsWebServiceTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
index f6c120bd61a..0337bdf09a9 100644
--- a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
@@ -60,7 +60,7 @@ import org.olat.modules.curriculum.model.CurriculumRefImpl;
import org.olat.modules.curriculum.restapi.CurriculumElementVO;
import org.olat.modules.curriculum.restapi.CurriculumVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +73,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class CurriculumsWebServiceTest extends OlatJerseyTestCase {
+public class CurriculumsWebServiceTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(CurriculumsWebServiceTest.class);
diff --git a/src/test/java/org/olat/restapi/DocumentPoolModuleWebServiceTest.java b/src/test/java/org/olat/restapi/DocumentPoolModuleWebServiceTest.java
index 0738b5f0c0b..448fefd8cbc 100644
--- a/src/test/java/org/olat/restapi/DocumentPoolModuleWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/DocumentPoolModuleWebServiceTest.java
@@ -31,7 +31,7 @@ import org.apache.http.client.methods.HttpGet;
import org.junit.Assert;
import org.junit.Test;
import org.olat.modules.docpool.restapi.DocumentPoolModuleConfigurationVO;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
*
@@ -39,7 +39,7 @@ import org.olat.test.OlatJerseyTestCase;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class DocumentPoolModuleWebServiceTest extends OlatJerseyTestCase {
+public class DocumentPoolModuleWebServiceTest extends OlatRestTestCase {
@Test
public void documentPoolModuleConfiguration()
diff --git a/src/test/java/org/olat/restapi/EfficiencyStatementTest.java b/src/test/java/org/olat/restapi/EfficiencyStatementTest.java
index 4638a4f204d..06fd942e4de 100644
--- a/src/test/java/org/olat/restapi/EfficiencyStatementTest.java
+++ b/src/test/java/org/olat/restapi/EfficiencyStatementTest.java
@@ -47,7 +47,7 @@ import org.olat.course.assessment.model.EfficiencyStatementVO;
import org.olat.repository.RepositoryEntry;
import org.olat.resource.OLATResource;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -56,7 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class EfficiencyStatementTest extends OlatJerseyTestCase {
+public class EfficiencyStatementTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/ForumTest.java b/src/test/java/org/olat/restapi/ForumTest.java
index fe8c4bf174e..c1c901dce1e 100644
--- a/src/test/java/org/olat/restapi/ForumTest.java
+++ b/src/test/java/org/olat/restapi/ForumTest.java
@@ -77,14 +77,14 @@ import org.olat.modules.fo.restapi.ReplyVO;
import org.olat.restapi.support.vo.File64VO;
import org.olat.restapi.support.vo.FileVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ForumTest extends OlatJerseyTestCase {
+public class ForumTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(ForumTest.class);
diff --git a/src/test/java/org/olat/restapi/GroupFoldersTest.java b/src/test/java/org/olat/restapi/GroupFoldersTest.java
index fe1c6b6b25a..a1463a51925 100644
--- a/src/test/java/org/olat/restapi/GroupFoldersTest.java
+++ b/src/test/java/org/olat/restapi/GroupFoldersTest.java
@@ -78,7 +78,7 @@ import org.olat.resource.OLATResourceManager;
import org.olat.restapi.support.vo.FileMetadataVO;
import org.olat.restapi.support.vo.FileVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -90,7 +90,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class GroupFoldersTest extends OlatJerseyTestCase {
+public class GroupFoldersTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(GroupFoldersTest.class);
@@ -111,7 +111,7 @@ public class GroupFoldersTest extends OlatJerseyTestCase {
/**
* Set up a course with learn group and group area
* EXACTLY THE SAME AS GroupMgmTest
- * @see org.olat.test.OlatJerseyTestCase#setUp()
+ * @see org.olat.test.OlatRestTestCase#setUp()
*/
@Before
public void setUp() throws Exception {
@@ -331,7 +331,7 @@ public class GroupFoldersTest extends OlatJerseyTestCase {
EntityUtils.consume(response.getEntity());
}
- //@Test not working -> Jersey ignore the request and return 200 (why?)
+ @Test
public void testCreateFoldersWithSpecialCharacter() throws IOException, URISyntaxException {
assertTrue(conn.login("rest-one", "A6B7C8"));
URI request = UriBuilder.fromUri(getContextURI()).path("/groups/" + g1.getKey() + "/folder/New_folder_1/New_folder_1_1/New_folder_1 1 2").build();
diff --git a/src/test/java/org/olat/restapi/GroupMgmtTest.java b/src/test/java/org/olat/restapi/GroupMgmtTest.java
index 471eed5746a..b40bf372727 100644
--- a/src/test/java/org/olat/restapi/GroupMgmtTest.java
+++ b/src/test/java/org/olat/restapi/GroupMgmtTest.java
@@ -87,7 +87,7 @@ import org.olat.restapi.support.vo.GroupConfigurationVO;
import org.olat.restapi.support.vo.GroupInfoVO;
import org.olat.restapi.support.vo.GroupVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +103,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 7 mai 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class GroupMgmtTest extends OlatJerseyTestCase {
+public class GroupMgmtTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(GroupMgmtTest.class);
diff --git a/src/test/java/org/olat/restapi/I18nTest.java b/src/test/java/org/olat/restapi/I18nTest.java
index a60079bebc4..70fcab44b40 100644
--- a/src/test/java/org/olat/restapi/I18nTest.java
+++ b/src/test/java/org/olat/restapi/I18nTest.java
@@ -39,7 +39,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
* Description:<br>
@@ -49,7 +49,7 @@ import org.olat.test.OlatJerseyTestCase;
* Initial Date: 14 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class I18nTest extends OlatJerseyTestCase {
+public class I18nTest extends OlatRestTestCase {
@Test
public void testExecuteService() throws IOException, URISyntaxException {
diff --git a/src/test/java/org/olat/restapi/IdentityToIdentityRelationsWebServiceTest.java b/src/test/java/org/olat/restapi/IdentityToIdentityRelationsWebServiceTest.java
index cbb0028633e..6fd345f9fe2 100644
--- a/src/test/java/org/olat/restapi/IdentityToIdentityRelationsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/IdentityToIdentityRelationsWebServiceTest.java
@@ -46,7 +46,7 @@ import org.olat.basesecurity.RelationRole;
import org.olat.core.commons.persistence.DB;
import org.olat.core.id.Identity;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.IdentityToIdentityRelationVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class IdentityToIdentityRelationsWebServiceTest extends OlatJerseyTestCase {
+public class IdentityToIdentityRelationsWebServiceTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/LecturesBlockRollCallTest.java b/src/test/java/org/olat/restapi/LecturesBlockRollCallTest.java
index b40d94cd502..585aaa6844f 100644
--- a/src/test/java/org/olat/restapi/LecturesBlockRollCallTest.java
+++ b/src/test/java/org/olat/restapi/LecturesBlockRollCallTest.java
@@ -49,7 +49,7 @@ import org.olat.modules.lecture.manager.LectureBlockRollCallDAO;
import org.olat.modules.lecture.restapi.LectureBlockRollCallVO;
import org.olat.repository.RepositoryEntry;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -61,7 +61,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class LecturesBlockRollCallTest extends OlatJerseyTestCase {
+public class LecturesBlockRollCallTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/LecturesBlocksRootTest.java b/src/test/java/org/olat/restapi/LecturesBlocksRootTest.java
index 88d3bcecd32..fac0c123765 100644
--- a/src/test/java/org/olat/restapi/LecturesBlocksRootTest.java
+++ b/src/test/java/org/olat/restapi/LecturesBlocksRootTest.java
@@ -43,7 +43,7 @@ import org.olat.modules.lecture.RepositoryEntryLectureConfiguration;
import org.olat.modules.lecture.restapi.LectureBlockVO;
import org.olat.repository.RepositoryEntry;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -55,7 +55,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class LecturesBlocksRootTest extends OlatJerseyTestCase {
+public class LecturesBlocksRootTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/LecturesBlocksTest.java b/src/test/java/org/olat/restapi/LecturesBlocksTest.java
index 04620bd34de..741ac642716 100644
--- a/src/test/java/org/olat/restapi/LecturesBlocksTest.java
+++ b/src/test/java/org/olat/restapi/LecturesBlocksTest.java
@@ -75,7 +75,7 @@ import org.olat.modules.taxonomy.restapi.TaxonomyLevelVO;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryService;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -88,7 +88,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class LecturesBlocksTest extends OlatJerseyTestCase {
+public class LecturesBlocksTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(LecturesBlocksTest.class);
diff --git a/src/test/java/org/olat/restapi/MyForumsTest.java b/src/test/java/org/olat/restapi/MyForumsTest.java
index ba473efa8cb..574840821e9 100644
--- a/src/test/java/org/olat/restapi/MyForumsTest.java
+++ b/src/test/java/org/olat/restapi/MyForumsTest.java
@@ -61,7 +61,7 @@ import org.olat.modules.fo.Forum;
import org.olat.modules.fo.restapi.ForumVOes;
import org.olat.repository.RepositoryEntry;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -69,7 +69,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class MyForumsTest extends OlatJerseyTestCase {
+public class MyForumsTest extends OlatRestTestCase {
@Autowired
diff --git a/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java b/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java
index 995a93b5619..a4343aaf29b 100644
--- a/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java
+++ b/src/test/java/org/olat/restapi/NotificationsSubscribersTest.java
@@ -57,7 +57,7 @@ import org.olat.course.run.userview.VisibleTreeFilter;
import org.olat.modules.fo.Forum;
import org.olat.repository.RepositoryEntry;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVOFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +70,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class NotificationsSubscribersTest extends OlatJerseyTestCase {
+public class NotificationsSubscribersTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/NotificationsTest.java b/src/test/java/org/olat/restapi/NotificationsTest.java
index 5165e58f94f..5de6e182489 100644
--- a/src/test/java/org/olat/restapi/NotificationsTest.java
+++ b/src/test/java/org/olat/restapi/NotificationsTest.java
@@ -85,7 +85,7 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryStatusEnum;
import org.olat.repository.RepositoryManager;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.notification.UsersSubscriptionManager;
import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +100,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 26 aug. 2010 <br>
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class NotificationsTest extends OlatJerseyTestCase {
+public class NotificationsTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(NotificationsTest.class);
diff --git a/src/test/java/org/olat/restapi/OrganisationTypesWebServiceTest.java b/src/test/java/org/olat/restapi/OrganisationTypesWebServiceTest.java
index fa21224ec56..26a9a587bfe 100644
--- a/src/test/java/org/olat/restapi/OrganisationTypesWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/OrganisationTypesWebServiceTest.java
@@ -48,7 +48,7 @@ import org.olat.basesecurity.OrganisationTypeManagedFlag;
import org.olat.basesecurity.OrganisationTypeToType;
import org.olat.basesecurity.model.OrganisationTypeRefImpl;
import org.olat.core.commons.persistence.DB;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.OrganisationTypeVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class OrganisationTypesWebServiceTest extends OlatJerseyTestCase {
+public class OrganisationTypesWebServiceTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/OrganisationsWebServiceTest.java b/src/test/java/org/olat/restapi/OrganisationsWebServiceTest.java
index 1ae42828dd7..1eea487b01f 100644
--- a/src/test/java/org/olat/restapi/OrganisationsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/OrganisationsWebServiceTest.java
@@ -55,7 +55,7 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryService;
import org.olat.restapi.support.vo.RepositoryEntryVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.OrganisationVO;
import org.olat.user.restapi.UserVO;
import org.olat.user.restapi.UserVOFactory;
@@ -70,7 +70,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class OrganisationsWebServiceTest extends OlatJerseyTestCase {
+public class OrganisationsWebServiceTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(OrganisationsWebServiceTest.class);
diff --git a/src/test/java/org/olat/restapi/QuestionPoolTest.java b/src/test/java/org/olat/restapi/QuestionPoolTest.java
index f8021460ca3..578d5bc2b43 100644
--- a/src/test/java/org/olat/restapi/QuestionPoolTest.java
+++ b/src/test/java/org/olat/restapi/QuestionPoolTest.java
@@ -58,7 +58,7 @@ import org.olat.modules.qpool.model.QItemType;
import org.olat.modules.qpool.restapi.QuestionItemVO;
import org.olat.modules.qpool.restapi.QuestionItemVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class QuestionPoolTest extends OlatJerseyTestCase {
+public class QuestionPoolTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/RegistrationTest.java b/src/test/java/org/olat/restapi/RegistrationTest.java
index 2cd476c3629..9e45655fe90 100644
--- a/src/test/java/org/olat/restapi/RegistrationTest.java
+++ b/src/test/java/org/olat/restapi/RegistrationTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.olat.core.id.Identity;
import org.olat.core.id.UserConstants;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
*
@@ -47,7 +47,7 @@ import org.olat.test.OlatJerseyTestCase;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class RegistrationTest extends OlatJerseyTestCase {
+public class RegistrationTest extends OlatRestTestCase {
@Test
public void testRegistration() throws IOException, URISyntaxException {
diff --git a/src/test/java/org/olat/restapi/RelationRolesWebServiceTest.java b/src/test/java/org/olat/restapi/RelationRolesWebServiceTest.java
index f9d39571a6e..4348cae0623 100644
--- a/src/test/java/org/olat/restapi/RelationRolesWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/RelationRolesWebServiceTest.java
@@ -50,7 +50,7 @@ import org.olat.basesecurity.RelationRoleManagedFlag;
import org.olat.basesecurity.RelationRoleToRight;
import org.olat.core.commons.persistence.DB;
import org.olat.course.groupsandrights.CourseRightsEnum;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.RelationRoleVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,7 +63,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class RelationRolesWebServiceTest extends OlatJerseyTestCase {
+public class RelationRolesWebServiceTest extends OlatRestTestCase {
@Autowired
private DB dbInstance;
diff --git a/src/test/java/org/olat/restapi/RemindersWebServiceTest.java b/src/test/java/org/olat/restapi/RemindersWebServiceTest.java
index 7e7c7cb9b95..9b2e040a169 100644
--- a/src/test/java/org/olat/restapi/RemindersWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/RemindersWebServiceTest.java
@@ -56,7 +56,7 @@ import org.olat.modules.reminder.restapi.ReminderVO;
import org.olat.modules.reminder.rule.DateRuleSPI;
import org.olat.repository.RepositoryEntry;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -68,7 +68,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class RemindersWebServiceTest extends OlatJerseyTestCase {
+public class RemindersWebServiceTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(RemindersWebServiceTest.class);
diff --git a/src/test/java/org/olat/restapi/RepositoryEntriesTest.java b/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
index 1e57e327aed..8641c6f1f86 100644
--- a/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
+++ b/src/test/java/org/olat/restapi/RepositoryEntriesTest.java
@@ -68,7 +68,7 @@ import org.olat.restapi.support.vo.RepositoryEntryLifecycleVO;
import org.olat.restapi.support.vo.RepositoryEntryVO;
import org.olat.restapi.support.vo.RepositoryEntryVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -78,7 +78,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class RepositoryEntriesTest extends OlatJerseyTestCase {
+public class RepositoryEntriesTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(RepositoryEntriesTest.class);
diff --git a/src/test/java/org/olat/restapi/RepositoryEntryLifecycleTest.java b/src/test/java/org/olat/restapi/RepositoryEntryLifecycleTest.java
index bda28c040d8..fc75e3fcc2b 100644
--- a/src/test/java/org/olat/restapi/RepositoryEntryLifecycleTest.java
+++ b/src/test/java/org/olat/restapi/RepositoryEntryLifecycleTest.java
@@ -45,7 +45,7 @@ import org.olat.core.logging.Tracing;
import org.olat.repository.manager.RepositoryEntryLifecycleDAO;
import org.olat.repository.model.RepositoryEntryLifecycle;
import org.olat.restapi.support.vo.RepositoryEntryLifecycleVO;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -57,7 +57,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class RepositoryEntryLifecycleTest extends OlatJerseyTestCase {
+public class RepositoryEntryLifecycleTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(RepositoryEntryLifecycleTest.class);
diff --git a/src/test/java/org/olat/restapi/RepositoryEntryWebServiceTest.java b/src/test/java/org/olat/restapi/RepositoryEntryWebServiceTest.java
index 4ca4d8efa39..1b833fac6e9 100644
--- a/src/test/java/org/olat/restapi/RepositoryEntryWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/RepositoryEntryWebServiceTest.java
@@ -73,7 +73,7 @@ import org.olat.repository.handlers.RepositoryHandlerFactory;
import org.olat.repository.manager.RepositoryEntryToTaxonomyLevelDAO;
import org.olat.restapi.support.vo.RepositoryEntryAccessVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.restapi.UserVO;
import org.olat.user.restapi.UserVOFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,7 +87,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class RepositoryEntryWebServiceTest extends OlatJerseyTestCase {
+public class RepositoryEntryWebServiceTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(RepositoryEntryWebServiceTest.class);
diff --git a/src/test/java/org/olat/restapi/RestApiLoginFilterTest.java b/src/test/java/org/olat/restapi/RestApiLoginFilterTest.java
index fea1e25eec9..60f9ce695fe 100644
--- a/src/test/java/org/olat/restapi/RestApiLoginFilterTest.java
+++ b/src/test/java/org/olat/restapi/RestApiLoginFilterTest.java
@@ -49,7 +49,7 @@ import org.olat.core.util.StringHelper;
import org.olat.restapi.security.RestSecurityBean;
import org.olat.restapi.security.RestSecurityBeanImpl;
import org.olat.restapi.security.RestSecurityHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
* Description:<br>
@@ -59,7 +59,7 @@ import org.olat.test.OlatJerseyTestCase;
* Initial Date: 14 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class RestApiLoginFilterTest extends OlatJerseyTestCase {
+public class RestApiLoginFilterTest extends OlatRestTestCase {
@@ -124,7 +124,7 @@ public class RestApiLoginFilterTest extends OlatJerseyTestCase {
//path is protected
RestConnection c2 = new RestConnection();
URI uri2 = UriBuilder.fromUri(getContextURI()).path("/repo/entries").build();
- HttpGet method2 = c2.createGet(uri2, MediaType.TEXT_HTML, false);
+ HttpGet method2 = c2.createGet(uri2, MediaType.APPLICATION_JSON, false);
method2.setHeader(RestSecurityHelper.SEC_TOKEN, securityToken);
HttpResponse r2 = c2.execute(method2);
securityToken = c2.getSecurityToken(r2);
@@ -146,7 +146,7 @@ public class RestApiLoginFilterTest extends OlatJerseyTestCase {
//path is protected
RestConnection c4 = new RestConnection();
URI uri4 = UriBuilder.fromUri(getContextURI()).path("/repo/entries").build();
- HttpGet method4 = c4.createGet(uri4, MediaType.TEXT_HTML, false);
+ HttpGet method4 = c4.createGet(uri4, MediaType.APPLICATION_XML, false);
method4.setHeader(RestSecurityHelper.SEC_TOKEN, securityToken);
HttpResponse r4 = c4.execute(method4);
securityToken = c4.getSecurityToken(r4);
diff --git a/src/test/java/org/olat/restapi/SharedFolderTest.java b/src/test/java/org/olat/restapi/SharedFolderTest.java
index 044f9e6ab13..10a70aceab6 100644
--- a/src/test/java/org/olat/restapi/SharedFolderTest.java
+++ b/src/test/java/org/olat/restapi/SharedFolderTest.java
@@ -56,7 +56,7 @@ import org.olat.repository.manager.RepositoryEntryRelationDAO;
import org.olat.restapi.support.vo.FileVO;
import org.olat.restapi.support.vo.LinkVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -65,7 +65,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class SharedFolderTest extends OlatJerseyTestCase {
+public class SharedFolderTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(SharedFolderTest.class);
diff --git a/src/test/java/org/olat/restapi/SystemTest.java b/src/test/java/org/olat/restapi/SystemTest.java
index 26c0c3a403e..60007f5f849 100644
--- a/src/test/java/org/olat/restapi/SystemTest.java
+++ b/src/test/java/org/olat/restapi/SystemTest.java
@@ -47,7 +47,7 @@ import org.olat.restapi.system.vo.ThreadVO;
import org.olat.restapi.system.vo.ThreadVOes;
import org.olat.restapi.system.vo.ThreadsVO;
import org.olat.restapi.system.vo.UserStatisticsVO;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
/**
*
@@ -58,7 +58,7 @@ import org.olat.test.OlatJerseyTestCase;
*
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*/
-public class SystemTest extends OlatJerseyTestCase {
+public class SystemTest extends OlatRestTestCase {
@Test
public void testMonitoringStatus() throws IOException, URISyntaxException {
diff --git a/src/test/java/org/olat/restapi/TaxonomyWebServiceTest.java b/src/test/java/org/olat/restapi/TaxonomyWebServiceTest.java
index 51a91db29e4..1f08db57a78 100644
--- a/src/test/java/org/olat/restapi/TaxonomyWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/TaxonomyWebServiceTest.java
@@ -56,7 +56,7 @@ import org.olat.modules.taxonomy.restapi.TaxonomyLevelTypeVO;
import org.olat.modules.taxonomy.restapi.TaxonomyLevelVO;
import org.olat.modules.taxonomy.restapi.TaxonomyVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -68,7 +68,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class TaxonomyWebServiceTest extends OlatJerseyTestCase {
+public class TaxonomyWebServiceTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(TaxonomyWebServiceTest.class);
diff --git a/src/test/java/org/olat/restapi/UserAuthenticationMgmtTest.java b/src/test/java/org/olat/restapi/UserAuthenticationMgmtTest.java
index d2ea7cc352c..9e7e763d411 100644
--- a/src/test/java/org/olat/restapi/UserAuthenticationMgmtTest.java
+++ b/src/test/java/org/olat/restapi/UserAuthenticationMgmtTest.java
@@ -63,7 +63,7 @@ import org.olat.login.auth.OLATAuthManager;
import org.olat.restapi.support.vo.AuthenticationVO;
import org.olat.restapi.support.vo.ErrorVO;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -78,7 +78,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 15 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class UserAuthenticationMgmtTest extends OlatJerseyTestCase {
+public class UserAuthenticationMgmtTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(UserAuthenticationMgmtTest.class);
diff --git a/src/test/java/org/olat/restapi/UserCoursesTest.java b/src/test/java/org/olat/restapi/UserCoursesTest.java
index 46f34a581f7..695b5a87942 100644
--- a/src/test/java/org/olat/restapi/UserCoursesTest.java
+++ b/src/test/java/org/olat/restapi/UserCoursesTest.java
@@ -47,7 +47,7 @@ import org.olat.repository.RepositoryService;
import org.olat.restapi.support.vo.CourseVO;
import org.olat.restapi.support.vo.CourseVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -58,7 +58,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class UserCoursesTest extends OlatJerseyTestCase {
+public class UserCoursesTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(UserCoursesTest.class);
diff --git a/src/test/java/org/olat/restapi/UserFoldersTest.java b/src/test/java/org/olat/restapi/UserFoldersTest.java
index 127ed45971c..d88ce0c74eb 100644
--- a/src/test/java/org/olat/restapi/UserFoldersTest.java
+++ b/src/test/java/org/olat/restapi/UserFoldersTest.java
@@ -60,7 +60,7 @@ import org.olat.course.run.userview.VisibleTreeFilter;
import org.olat.repository.RepositoryEntry;
import org.olat.restapi.support.vo.FolderVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -68,7 +68,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class UserFoldersTest extends OlatJerseyTestCase {
+public class UserFoldersTest extends OlatRestTestCase {
private static boolean setup;
private static ICourse myCourse;
diff --git a/src/test/java/org/olat/restapi/UserMgmtTest.java b/src/test/java/org/olat/restapi/UserMgmtTest.java
index afdf0673269..cc19f101a53 100644
--- a/src/test/java/org/olat/restapi/UserMgmtTest.java
+++ b/src/test/java/org/olat/restapi/UserMgmtTest.java
@@ -113,7 +113,7 @@ import org.olat.restapi.support.vo.GroupInfoVOes;
import org.olat.restapi.support.vo.GroupVO;
import org.olat.restapi.support.vo.GroupVOes;
import org.olat.test.JunitTestHelper;
-import org.olat.test.OlatJerseyTestCase;
+import org.olat.test.OlatRestTestCase;
import org.olat.user.DisplayPortraitManager;
import org.olat.user.UserManager;
import org.olat.user.restapi.ManagedUserVO;
@@ -135,7 +135,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* Initial Date: 15 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public class UserMgmtTest extends OlatJerseyTestCase {
+public class UserMgmtTest extends OlatRestTestCase {
private static final Logger log = Tracing.createLoggerFor(UserMgmtTest.class);
diff --git a/src/test/java/org/olat/test/OlatJerseyTestCase.java b/src/test/java/org/olat/test/OlatRestTestCase.java
similarity index 95%
rename from src/test/java/org/olat/test/OlatJerseyTestCase.java
rename to src/test/java/org/olat/test/OlatRestTestCase.java
index 704e6b8f1e2..33d97af3a92 100644
--- a/src/test/java/org/olat/test/OlatJerseyTestCase.java
+++ b/src/test/java/org/olat/test/OlatRestTestCase.java
@@ -69,9 +69,9 @@ import io.undertow.servlet.api.DeploymentManager;
* Initial Date: 14 apr. 2010 <br>
* @author srosse, stephane.rosse@frentix.com
*/
-public abstract class OlatJerseyTestCase extends OlatTestCase {
+public abstract class OlatRestTestCase extends OlatTestCase {
- private static final Logger log = Tracing.createLoggerFor(OlatJerseyTestCase.class);
+ private static final Logger log = Tracing.createLoggerFor(OlatRestTestCase.class);
protected static final JsonFactory jsonFactory = new JsonFactory();
@@ -88,7 +88,7 @@ public abstract class OlatJerseyTestCase extends OlatTestCase {
@Autowired
private RestModule restModule;
- public OlatJerseyTestCase() {
+ public OlatRestTestCase() {
super();
}
@@ -100,7 +100,7 @@ public abstract class OlatJerseyTestCase extends OlatTestCase {
if(webServer == null) {
try {
DeploymentInfo servletBuilder = deployment()
- .setClassLoader(OlatJerseyTestCase.class.getClassLoader())
+ .setClassLoader(OlatRestTestCase.class.getClassLoader())
.setContextPath("/" + CONTEXT_PATH)
.setDeploymentName("rest.war")
--
GitLab