From 174f6a212d3622cf86b6699c22a2a7d657e11d42 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Thu, 8 Aug 2019 14:59:02 +0200
Subject: [PATCH] OO-4172: Fix broken unit tests
---
.../doceditor/DocEditorSecurityCallbackBuilder.java | 4 ++--
.../olat/repository/handlers/DocumentEditorDelegate.java | 2 +-
.../org/olat/repository/ui/WebDocumentRunController.java | 2 +-
.../services/doceditor/wopi/manager/WopiServiceTest.java | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/DocEditorSecurityCallbackBuilder.java b/src/main/java/org/olat/core/commons/services/doceditor/DocEditorSecurityCallbackBuilder.java
index c26b37f6fd4..53301e70a96 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/DocEditorSecurityCallbackBuilder.java
+++ b/src/main/java/org/olat/core/commons/services/doceditor/DocEditorSecurityCallbackBuilder.java
@@ -73,7 +73,7 @@ public class DocEditorSecurityCallbackBuilder {
* @param canClose
* @return
*/
- public DocEditorSecurityCallbackBuilder canClose(boolean canClose) {
+ public DocEditorSecurityCallbackBuilder withCanClose(boolean canClose) {
this.canClose = canClose;
return this;
}
@@ -96,7 +96,7 @@ public class DocEditorSecurityCallbackBuilder {
.withMode(secCallback.getMode())
.withHasMeta(secCallback.hasMeta())
.withVersionControlled(secCallback.isVersionControlled())
- .canClose(secCallback.canClose());
+ .withCanClose(secCallback.canClose());
}
private DocEditorSecurityCallbackBuilder() {
diff --git a/src/main/java/org/olat/repository/handlers/DocumentEditorDelegate.java b/src/main/java/org/olat/repository/handlers/DocumentEditorDelegate.java
index 2589220d496..d9954c069b5 100644
--- a/src/main/java/org/olat/repository/handlers/DocumentEditorDelegate.java
+++ b/src/main/java/org/olat/repository/handlers/DocumentEditorDelegate.java
@@ -124,7 +124,7 @@ public class DocumentEditorDelegate implements WebDocumentCreateDelegate, WebDoc
DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder()
.withMode(Mode.EDIT)
- .canClose(false)
+ .withCanClose(false)
.build();
return new DocEditorController(ureq, wControl, document, secCallback, none(), "o_web_document_edit");
}
diff --git a/src/main/java/org/olat/repository/ui/WebDocumentRunController.java b/src/main/java/org/olat/repository/ui/WebDocumentRunController.java
index 516853bfea3..ae385ccfe1c 100644
--- a/src/main/java/org/olat/repository/ui/WebDocumentRunController.java
+++ b/src/main/java/org/olat/repository/ui/WebDocumentRunController.java
@@ -103,7 +103,7 @@ public class WebDocumentRunController extends BasicController {
} else if (docEditorService.hasEditor(getIdentity(), ureq.getUserSession().getRoles(), extension, Mode.VIEW, true)) {
DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder()
.withMode(Mode.VIEW)
- .canClose(false)
+ .withCanClose(false)
.build();
Controller editCtrl = new DocEditorController(ureq, wControl, document, secCallback, none(), "o_web_document");
listenTo(editCtrl);
diff --git a/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiServiceTest.java b/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiServiceTest.java
index 998c7d8da95..c6273f846ef 100644
--- a/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiServiceTest.java
+++ b/src/test/java/org/olat/core/commons/services/doceditor/wopi/manager/WopiServiceTest.java
@@ -111,11 +111,11 @@ public class WopiServiceTest extends OlatTestCase {
public void shouldNotReuseAccessIfCanCloseChanged() {
VFSMetadata metadata = randomMetadata();
Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("wopi");
- DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder().canClose(true).build();
+ DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder().withCanClose(true).build();
Access access = sut.getOrCreateAccess(metadata, identity, secCallback, "App1", null);
dbInstance.commitAndCloseSession();
- DocEditorSecurityCallback secCallbackChanged = DocEditorSecurityCallbackBuilder.builder().canClose(false).build();
+ DocEditorSecurityCallback secCallbackChanged = DocEditorSecurityCallbackBuilder.builder().withCanClose(false).build();
Access accessChanged = sut.getOrCreateAccess(metadata, identity, secCallbackChanged, "App1", null);
dbInstance.commitAndCloseSession();
@@ -156,9 +156,9 @@ public class WopiServiceTest extends OlatTestCase {
public void shouldDeleteAccessIfChanged() {
VFSMetadata metadata = randomMetadata();
Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("wopi");
- DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder().withMode(Mode.EDIT).build();
+ DocEditorSecurityCallback secCallback = DocEditorSecurityCallbackBuilder.builder().withCanClose(true).build();
Access access = sut.getOrCreateAccess(metadata, identity, secCallback, "App1", null);
- DocEditorSecurityCallback secCallbackChanged = DocEditorSecurityCallbackBuilder.builder().withMode(Mode.VIEW).build();
+ DocEditorSecurityCallback secCallbackChanged = DocEditorSecurityCallbackBuilder.builder().withCanClose(false).build();
sut.getOrCreateAccess(metadata, identity, secCallbackChanged, "App1", null);
dbInstance.commitAndCloseSession();
--
GitLab