[Libreoffice-commits] online.git: 2 commits - test/data wsd/LOOLWSD.cpp

[Samuel Mehrbrodt]

 test/data/hello-world.odp |binary
 test/data/hello-world.ods |binary
 wsd/LOOLWSD.cpp           |   15 ++++++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 224660a0ba8d91b6c143223e2b0cad86d73540b3
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Feb 22 16:13:20 2018 +0100

    Add launch URIs for Calc and Impress too (for debug builds)
    
    Change-Id: I66ea097c7f8d0ea72a74ecb62abbdf63e50f3058
    Reviewed-on: https://gerrit.libreoffice.org/50190
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5ea443ab..c25241a9 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -21,7 +21,9 @@
 #define LOOLWSD_TEST_LOLEAFLET_UI "/loleaflet/" LOOLWSD_VERSION_HASH "/loleaflet.html"
 
 /* Default document used in the start test URI */
-#define LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH "test/data/hello-world.odt"
+#define LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_WRITER  "test/data/hello-world.odt"
+#define LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_CALC    "test/data/hello-world.ods"
+#define LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_IMPRESS "test/data/hello-world.odp"
 
 // This is the main source for the loolwsd program. LOOL uses several loolwsd processes: one main
 // parent process that listens on the TCP port and accepts connections from LOOL clients, and a
@@ -525,7 +527,7 @@ inline std::string getLaunchBase(const std::string &credentials)
     return oss.str();
 }
 
-inline std::string getLaunchURI()
+inline std::string getLaunchURI(const std::string &document)
 {
     const std::string aAbsTopSrcDir = Poco::Path(Application::instance().commandPath()).parent().toString();
 
@@ -535,7 +537,7 @@ inline std::string getLaunchURI()
     oss << LOOLWSD_TEST_LOLEAFLET_UI;
     oss << "?file_path=file://";
     oss << Poco::Path(aAbsTopSrcDir).absolute().toString();
-    oss << LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH;
+    oss << document;
 
     return oss.str();
 }
@@ -944,8 +946,11 @@ void LOOLWSD::initialize(Application& self)
     Admin::instance().setDefDocProcSettings(docProcSettings, false);
 
 #if ENABLE_DEBUG
-    std::cerr << "\nLaunch this in your browser:\n\n"
-              << getLaunchURI() << '\n' << std::endl;
+    std::cerr << "\nLaunch one of these in your browser:\n\n"
+              << "    Writer:  " << getLaunchURI(LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_WRITER) << '\n'
+              << "    Calc:    " << getLaunchURI(LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_CALC) << '\n'
+              << "    Impress: " << getLaunchURI(LOOLWSD_TEST_DOCUMENT_RELATIVE_PATH_IMPRESS) << '\n'
+              << std::endl;
 
     const std::string adminURI = getAdminURI(config());
     if (!adminURI.empty())
commit 543cec654696db04e1bc93597000cb29a62b605b
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Feb 22 15:52:04 2018 +0100

    Add example documents for Impress and Calc
    
    Change-Id: I54980b7224f2fab6883720c58c6aa377b0ec9339
    Reviewed-on: https://gerrit.libreoffice.org/50189
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/test/data/hello-world.odp b/test/data/hello-world.odp
new file mode 100644
index 00000000..9918755e
Binary files /dev/null and b/test/data/hello-world.odp differ
diff --git a/test/data/hello-world.ods b/test/data/hello-world.ods
new file mode 100644
index 00000000..3a44a7ba
Binary files /dev/null and b/test/data/hello-world.ods differ