[Libreoffice-commits] core.git: io/CppunitTest_io_textinputstream.mk io/Module_io.mk io/qa
Stephan Bergmann
sbergman at redhat.com
Mon Nov 24 13:06:57 PST 2014
io/CppunitTest_io_textinputstream.mk | 27 ++++++
io/Module_io.mk | 4
io/qa/textinputstream.cxx | 148 +++++++++++++++++++++++++++++++++++
3 files changed, 179 insertions(+)
New commits:
commit ed30f63364883ffa7e0f496aa626ebd3e291965a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Nov 24 22:04:35 2014 +0100
Unit test for fdo#79941 (handle short reads)
...done as a subsequentcheck as doing it as a BootstrapFixtureBase (which is the
easiest way) makes it depend on later modules in the dependency chain.
Change-Id: I9588bae409b38aa373ccfa855042f598b6e2bb2b
diff --git a/io/CppunitTest_io_textinputstream.mk b/io/CppunitTest_io_textinputstream.mk
new file mode 100644
index 0000000..a18e643
--- /dev/null
+++ b/io/CppunitTest_io_textinputstream.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,io_textinputstream))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,io_textinputstream, \
+ io/qa/textinputstream \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,io_textinputstream, \
+ cppu \
+ cppuhelper \
+ sal \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_udk_api,io_textinputstream))
+
+$(eval $(call gb_CppunitTest_use_ure,io_textinputstream))
+
+# vim: set noet sw=4 ts=4:
diff --git a/io/Module_io.mk b/io/Module_io.mk
index 29709982..c9751d9 100644
--- a/io/Module_io.mk
+++ b/io/Module_io.mk
@@ -13,4 +13,8 @@ $(eval $(call gb_Module_add_targets,io,\
Library_io \
))
+$(eval $(call gb_Module_add_subsequentcheck_targets,io,\
+ CppunitTest_io_textinputstream \
+))
+
# vim:set noet sw=4 ts=4:
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
new file mode 100644
index 0000000..efba8ac
--- /dev/null
+++ b/io/qa/textinputstream.cxx
@@ -0,0 +1,148 @@
+/* -*- 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 <sal/config.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <exception>
+
+#include "com/sun/star/io/BufferSizeExceededException.hdl"
+#include "com/sun/star/io/IOException.hdl"
+#include "com/sun/star/io/NotConnectedException.hdl"
+#include <com/sun/star/io/TextInputStream.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XTextInputStream2.hpp>
+#include "com/sun/star/uno/Sequence.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include "com/sun/star/uno/RuntimeException.hdl"
+#include <cppuhelper/implbase1.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <unotest/bootstrapfixturebase.hxx>
+
+namespace {
+
+class Input: public cppu::WeakImplHelper1<css::io::XInputStream> {
+public:
+ Input(): open_(true), index_(0) {}
+
+private:
+ virtual ~Input() {}
+
+ sal_Int32 SAL_CALL readBytes(css::uno::Sequence<sal_Int8> &, sal_Int32)
+ throw (
+ css::io::NotConnectedException,
+ css::io::BufferSizeExceededException, css::io::IOException,
+ css::uno::RuntimeException, std::exception)
+ SAL_OVERRIDE
+ { CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead"); }
+
+ sal_Int32 SAL_CALL readSomeBytes(
+ css::uno::Sequence<sal_Int8 > & aData, sal_Int32 nMaxBytesToRead)
+ throw (
+ css::io::NotConnectedException,
+ css::io::BufferSizeExceededException, css::io::IOException,
+ css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE
+ {
+ assert(nMaxBytesToRead >= 0);
+ osl::MutexGuard g(mutex_);
+ checkClosed();
+ assert(index_ >= 0 && index_ <= SIZE);
+ sal_Int32 n = std::min<sal_Int32>(
+ std::min<sal_Int32>(nMaxBytesToRead, 2), SIZE - index_);
+ assert(n >= 0 && n <= SIZE - index_);
+ aData.realloc(n);
+ std::memcpy(aData.getArray(), data + index_, n);
+ index_ += n;
+ assert(index_ >= 0 && index_ <= SIZE);
+ return n;
+ }
+
+ void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
+ throw (
+ css::io::NotConnectedException,
+ css::io::BufferSizeExceededException, css::io::IOException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ assert(nBytesToSkip >= 0);
+ osl::MutexGuard g(mutex_);
+ checkClosed();
+ assert(index_ >= 0 && index_ <= SIZE);
+ index_ += std::min<sal_Int32>(nBytesToSkip, SIZE - index_);
+ assert(index_ >= 0 && index_ <= SIZE);
+ }
+
+ sal_Int32 SAL_CALL available()
+ throw (
+ css::io::NotConnectedException, css::io::IOException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ osl::MutexGuard g(mutex_);
+ checkClosed();
+ assert(index_ >= 0 && index_ <= SIZE);
+ return SIZE - index_;
+ }
+
+ void SAL_CALL closeInput()
+ throw (
+ css::io::NotConnectedException, css::io::IOException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ {
+ osl::MutexGuard g(mutex_);
+ checkClosed();
+ open_ = true;
+ }
+
+ void checkClosed() {
+ if (!open_) {
+ throw css::io::NotConnectedException(
+ "test input stream already closed");
+ }
+ }
+
+ static sal_Int32 const SIZE = 9;
+ static char const data[SIZE];
+
+ osl::Mutex mutex_;
+ bool open_;
+ sal_Int32 index_;
+};
+
+char const Input::data[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+
+class Test: public test::BootstrapFixtureBase {
+private:
+ CPPUNIT_TEST_SUITE(Test);
+ CPPUNIT_TEST(testReadLine);
+ CPPUNIT_TEST_SUITE_END();
+
+ void testReadLine();
+};
+
+void Test::testReadLine() {
+ css::uno::Reference<css::io::XTextInputStream2> s(
+ css::io::TextInputStream::create(getComponentContext()));
+ s->setInputStream(new Input);
+ rtl::OUString l(s->readLine());
+ CPPUNIT_ASSERT_EQUAL(rtl::OUString("123456789"), l);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list