Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 206 insertions, 0 deletions

diff --git a/package/qa/cppunit/data/a2z.zip b/package/qa/cppunit/data/a2z.zip
new file mode 100644
index 000000000..4a04508b8
--- /dev/null
+++ b/package/qa/cppunit/data/a2z.zip
diff --git a/package/qa/cppunit/data/fail/.gitignore b/package/qa/cppunit/data/fail/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/qa/cppunit/data/fail/.gitignore
diff --git a/package/qa/cppunit/data/fail/EDB-29934-1.zip b/package/qa/cppunit/data/fail/EDB-29934-1.zip
new file mode 100644
index 000000000..510e75eaa
--- /dev/null
+++ b/package/qa/cppunit/data/fail/EDB-29934-1.zip
diff --git a/package/qa/cppunit/data/indeterminate/.gitignore b/package/qa/cppunit/data/indeterminate/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/qa/cppunit/data/indeterminate/.gitignore
diff --git a/package/qa/cppunit/data/pass/.gitignore b/package/qa/cppunit/data/pass/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/qa/cppunit/data/pass/.gitignore
diff --git a/package/qa/cppunit/test_package.cxx b/package/qa/cppunit/test_package.cxx
new file mode 100644
index 000000000..022d8a9ee
--- /dev/null
+++ b/package/qa/cppunit/test_package.cxx
@@ -0,0 +1,206 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <comphelper/processfactory.hxx>
+#include <unotest/filters-test.hxx>
+#include <unotest/bootstrapfixturebase.hxx>
+#include <comphelper/threadpool.hxx>
+#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+
+#include <iterator>
+
+using namespace ::com::sun::star;
+
+namespace
+{
+    class PackageTest
+        : public test::FiltersTest
+        , public test::BootstrapFixtureBase
+    {
+    public:
+        PackageTest() {}
+
+        virtual void setUp() override;
+
+        virtual bool load(const OUString &,
+            const OUString &rURL, const OUString &,
+            SfxFilterFlags, SotClipboardFormatId, unsigned int) override;
+
+        void test();
+        void testThreadedStreams();
+        void testBufferedThreadedStreams();
+
+        CPPUNIT_TEST_SUITE(PackageTest);
+        CPPUNIT_TEST(test);
+        CPPUNIT_TEST(testThreadedStreams);
+        CPPUNIT_TEST(testBufferedThreadedStreams);
+        CPPUNIT_TEST_SUITE_END();
+
+    private:
+        uno::Reference<container::XNameAccess> mxNA;
+        void verifyStreams( std::vector<std::vector<char>> &aBuffers );
+    };
+
+    void PackageTest::setUp()
+    {
+        BootstrapFixtureBase::setUp();
+        OUString aURL = m_directories.getURLFromSrc(u"/package/qa/cppunit/data/a2z.zip");
+
+        uno::Sequence<beans::NamedValue> aNVs{ { "URL", uno::Any(aURL) } };
+        uno::Sequence<uno::Any> aArgs{ uno::Any(aNVs) };
+
+        uno::Reference<uno::XComponentContext> xCxt = comphelper::getProcessComponentContext();
+        uno::Reference<lang::XMultiComponentFactory> xSvcMgr = xCxt->getServiceManager();
+
+        uno::Reference<packages::zip::XZipFileAccess2> xZip(
+            xSvcMgr->createInstanceWithArgumentsAndContext(
+                "com.sun.star.packages.zip.ZipFileAccess", aArgs, xCxt),
+            uno::UNO_QUERY);
+
+        CPPUNIT_ASSERT(xZip.is());
+
+        mxNA = xZip;
+        CPPUNIT_ASSERT(mxNA.is());
+    }
+
+    bool PackageTest::load(const OUString &,
+        const OUString &rURL, const OUString &,
+        SfxFilterFlags, SotClipboardFormatId, unsigned int)
+    {
+        try
+        {
+            uno::Reference<css::packages::zip::XZipFileAccess2> xZip(
+                css::packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), rURL));
+            return xZip.is();
+        }
+        catch(...)
+        {
+            return false;
+        }
+    }
+
+    void PackageTest::test()
+    {
+        testDir(OUString(),
+            m_directories.getURLFromSrc(u"/package/qa/cppunit/data/"));
+    }
+
+    void PackageTest::verifyStreams( std::vector<std::vector<char>> &aBuffers )
+    {
+            CPPUNIT_ASSERT_EQUAL(size_t(26), aBuffers.size());
+            auto itBuf = aBuffers.begin();
+
+            for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
+            {
+                const std::vector<char>& rBuf = *itBuf;
+                CPPUNIT_ASSERT_EQUAL(size_t(1048576), rBuf.size()); // 1 MB each.
+                for (char check : rBuf)
+                    if (c != check)
+                        CPPUNIT_ASSERT_MESSAGE("stream does not contain expected data", false);
+            }
+    }
+
+    // TODO : This test currently doesn't fail even when you set
+    // UseBufferedStream to false. Look into this and replace it with a better
+    // test that actually fails when the aforementioned flag is set to false.
+    void PackageTest::testThreadedStreams()
+    {
+        class Worker : public comphelper::ThreadTask
+        {
+            uno::Reference<io::XInputStream> mxStrm;
+            std::vector<char>& mrBuf;
+
+        public:
+            Worker(
+                const std::shared_ptr<comphelper::ThreadTaskTag>& pTag,
+                const uno::Reference<io::XInputStream>& xStrm,
+                std::vector<char>& rBuf ) :
+                comphelper::ThreadTask(pTag), mxStrm(xStrm), mrBuf(rBuf) {}
+
+            virtual void doWork() override
+            {
+                sal_Int32 nSize = mxStrm->available();
+
+                uno::Sequence<sal_Int8> aBytes;
+                while (nSize > 0)
+                {
+                    sal_Int32 nBytesRead = mxStrm->readBytes(aBytes, 4096);
+                    const sal_Int8* p = aBytes.getArray();
+                    const sal_Int8* pEnd = p + nBytesRead;
+                    std::copy(p, pEnd, std::back_inserter(mrBuf));
+                    nSize -= nBytesRead;
+                }
+            }
+        };
+
+        {
+            comphelper::ThreadPool aPool(4);
+            std::shared_ptr<comphelper::ThreadTaskTag> pTag = comphelper::ThreadPool::createThreadTaskTag();
+
+            std::vector<std::vector<char>> aTestBuffers(26);
+            auto itBuf = aTestBuffers.begin();
+
+            for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
+            {
+                OUString aName = OUStringChar(c) + ".txt";
+
+                uno::Reference<io::XInputStream> xStrm;
+                mxNA->getByName(aName) >>= xStrm;
+
+                CPPUNIT_ASSERT(xStrm.is());
+                aPool.pushTask(std::make_unique<Worker>(pTag, xStrm, *itBuf));
+            }
+
+            aPool.waitUntilDone(pTag);
+            verifyStreams( aTestBuffers );
+        }
+    }
+
+    void PackageTest::testBufferedThreadedStreams()
+    {
+        std::vector<std::vector<char>> aTestBuffers(26);
+        auto itBuf = aTestBuffers.begin();
+        sal_Int32 nReadSize = 0;
+
+        for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
+        {
+            itBuf->reserve(1024*1024);
+            OUString aName = OUStringChar(c) + ".txt";
+
+            uno::Reference<io::XInputStream> xStrm;
+            //Size of each stream is 1mb (>10000) => XBufferedThreadedStream
+            mxNA->getByName(aName) >>= xStrm;
+
+            CPPUNIT_ASSERT(xStrm.is());
+            sal_Int32 nSize = xStrm->available();
+
+            uno::Sequence<sal_Int8> aBytes;
+            //Read chunks of increasing size
+            nReadSize += 1024;
+
+            while (nSize > 0)
+            {
+                sal_Int32 nBytesRead = xStrm->readBytes(aBytes, nReadSize);
+                const sal_Int8* p = aBytes.getArray();
+                const sal_Int8* pEnd = p + nBytesRead;
+                std::copy(p, pEnd, std::back_inserter(*itBuf));
+                nSize -= nBytesRead;
+            }
+        }
+
+        verifyStreams( aTestBuffers );
+    }
+
+    CPPUNIT_TEST_SUITE_REGISTRATION(PackageTest);
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */