[Libreoffice-commits] online.git: test/UnitWOPIDocumentConflict.cpp

[Libreoffice Gerrit user]

 test/UnitWOPIDocumentConflict.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f38ac3d8ba4df715462352a667fe48643663f304
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Dec 14 09:07:05 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Dec 14 09:07:22 2018 +0100

    UnitWOPIDocumentConflict: no c_str() when it'll be converted back to std::string
    
    Change-Id: Ia87598c35f5c8423b22cab0fe8e39fbd1e0818ff

diff --git a/test/UnitWOPIDocumentConflict.cpp b/test/UnitWOPIDocumentConflict.cpp
index 11bd42b5b..b1aed94bc 100644
--- a/test/UnitWOPIDocumentConflict.cpp
+++ b/test/UnitWOPIDocumentConflict.cpp
@@ -68,7 +68,7 @@ public:
         {
 	    // we don't want to save current changes because doing so would
 	    // overwrite the document which was changed underneath us
-	    helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "closedocument", _testName.c_str());
+	    helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "closedocument", _testName);
 	    _phase = Phase::LoadNewDocument;
         }
 
@@ -84,7 +84,7 @@ public:
                 initWebsocket("/wopi/files/0?access_token=anything");
 		_docLoaded = DocLoaded::Doc1;
 
-                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), _testName.c_str());
+                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "load url=" + getWopiSrc(), _testName);
 
                 _phase = Phase::ModifyAndChangeStorageDoc;
                 break;
@@ -92,8 +92,8 @@ public:
             case Phase::ModifyAndChangeStorageDoc:
             {
 		// modify the currently opened document; type 'a'
-                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", _testName.c_str());
-                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", _testName.c_str());
+                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=input char=97 key=0", _testName);
+                helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "key type=up char=0 key=512", _testName);
                 SocketPoll::wakeupWorld();
 
 		// ModifiedStatus=true is a bit slow; let's sleep and hope that
@@ -106,7 +106,7 @@ public:
 		// save the document; wsd should detect now that document has
 		// been changed underneath it and send us:
 		// "error: cmd=storage kind=documentconflict"
-		helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "save", _testName.c_str());
+		helpers::sendTextFrame(*getWs()->getLOOLWebSocket(), "save", _testName);
 
                 _phase = Phase::Polling;