From 17dc25294a3dc48ef7613c05b75541c26e9fdd59 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Sat, 9 Jun 2018 07:31:12 +0200
Subject: [PATCH] OO-3295: fix issues with old library loaded by falsy maven
artefact in nexus
---
pom.xml | 2 +-
src/test/java/org/olat/restapi/CourseGroupMgmtTest.java | 3 +--
.../org/olat/restapi/CurriculumElementsWebServiceTest.java | 3 +--
src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java | 3 +--
src/test/java/org/olat/restapi/SharedFolderTest.java | 3 +--
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index d5bbba7af32..476a5dee020 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1790,7 +1790,7 @@
<dependency>
<groupId>org.openolat</groupId>
<artifactId>openmeetingws</artifactId>
- <version>3.0.7</version>
+ <version>3.0.8</version>
</dependency>
<dependency>
<groupId>org.openolat</groupId>
diff --git a/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java b/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
index c5c92799de7..624c87c1c6b 100644
--- a/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
+++ b/src/test/java/org/olat/restapi/CourseGroupMgmtTest.java
@@ -51,7 +51,6 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.util.EntityUtils;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.olat.basesecurity.GroupRoles;
import org.olat.core.commons.persistence.DB;
@@ -169,7 +168,7 @@ public class CourseGroupMgmtTest extends OlatJerseyTestCase {
assertTrue(voKeys.contains(g4.getKey()));
}
- @Test @Ignore //TODO apache cxf
+ @Test
public void testGetCourseGroups_unkownId() throws IOException, URISyntaxException {
assertTrue(conn.login("administrator", "openolat"));
diff --git a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
index 5e6ca421794..88737beb3a1 100644
--- a/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumElementsWebServiceTest.java
@@ -39,7 +39,6 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.util.EntityUtils;
import org.hamcrest.Matchers;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.olat.basesecurity.OrganisationService;
import org.olat.core.commons.persistence.DB;
@@ -329,7 +328,7 @@ public class CurriculumElementsWebServiceTest extends OlatJerseyTestCase {
Assert.assertEquals(curriculum, savedElement.getCurriculum());
}
- @Test @Ignore //TODO Apchae CXF
+ @Test
public void updateCurriculumElement_notAuthorized()
throws IOException, URISyntaxException {
RestConnection conn = new RestConnection();
diff --git a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
index 336873f0d3b..52513bbdee9 100644
--- a/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
+++ b/src/test/java/org/olat/restapi/CurriculumsWebServiceTest.java
@@ -38,7 +38,6 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.util.EntityUtils;
import org.hamcrest.Matchers;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.olat.basesecurity.OrganisationRoles;
import org.olat.basesecurity.OrganisationService;
@@ -253,7 +252,7 @@ public class CurriculumsWebServiceTest extends OlatJerseyTestCase {
EntityUtils.consume(response.getEntity());
}
- @Test @Ignore //TODO Apache CXF
+ @Test
public void updateCurriculum_authorizedOrNot()
throws IOException, URISyntaxException {
Identity curriculumManager = JunitTestHelper.createAndPersistIdentityAsRndUser("rest-curriculum");
diff --git a/src/test/java/org/olat/restapi/SharedFolderTest.java b/src/test/java/org/olat/restapi/SharedFolderTest.java
index 00021638eb3..bed6d471c40 100644
--- a/src/test/java/org/olat/restapi/SharedFolderTest.java
+++ b/src/test/java/org/olat/restapi/SharedFolderTest.java
@@ -38,7 +38,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.util.EntityUtils;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.olat.basesecurity.GroupRoles;
import org.olat.basesecurity.OrganisationService;
@@ -113,7 +112,7 @@ public class SharedFolderTest extends OlatJerseyTestCase {
* @throws IOException
* @throws URISyntaxException
*/
- @Test @Ignore //TODO Apache CXF
+ @Test
public void putDirectories_owner() throws IOException, URISyntaxException {
Identity owner = JunitTestHelper.createAndPersistIdentityAsRndUser("shared-owner-");
Organisation defOrganisation = organisationService.getDefaultOrganisation();
--
GitLab