svn commit: r1700095 - in /openoffice/trunk/main/desktop/qa/deployment_misc: main.cxx makefile.mk test_dp_version.cxx
Author: damjan
Date: Sun Aug 30 08:41:13 2015
New Revision: 1700095
URL: http://svn.apache.org/r1700095
Log:
#i125003# migrate main/desktop from cppunit to Google Test
Added:
openoffice/trunk/main/desktop/qa/deployment_misc/main.cxx
Modified:
openoffice/trunk/main/desktop/qa/deployment_misc/makefile.mk
openoffice/trunk/main/desktop/qa/deployment_misc/test_dp_version.cxx
Added: openoffice/trunk/main/desktop/qa/deployment_misc/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/qa/deployment_misc/main.cxx?rev=1700095view=auto
==
--- openoffice/trunk/main/desktop/qa/deployment_misc/main.cxx (added)
+++ openoffice/trunk/main/desktop/qa/deployment_misc/main.cxx Sun Aug 30
08:41:13 2015
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include gtest/gtest.h
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(argc, argv);
+return RUN_ALL_TESTS();
+}
Modified: openoffice/trunk/main/desktop/qa/deployment_misc/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/qa/deployment_misc/makefile.mk?rev=1700095r1=1700094r2=1700095view=diff
==
--- openoffice/trunk/main/desktop/qa/deployment_misc/makefile.mk (original)
+++ openoffice/trunk/main/desktop/qa/deployment_misc/makefile.mk Sun Aug 30
08:41:13 2015
@@ -20,18 +20,6 @@
#**
-
-.IF $(WITH_CPPUNIT) != YES || $(GUI) == OS2
-
-@all:
-.IF $(GUI) == OS2
- @echo Skipping, cppunit broken.
-.ELIF $(WITH_CPPUNIT) != YES
- @echo cppunit disabled. nothing do do.
-.END
-
-.ENDIF $(WITH_CPPUNIT) != YES || $(GUI) == OS2
-
PRJ := ..$/..
PRJNAME := desktop
.IF $(GUI) == OS2
@@ -45,7 +33,12 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
# TODO: On Windows, test_dp_version.cxx fails due to BOOL redefinition between
# windef.h and tools/solar.h caused by including precompiled_desktop.hxx;
this
@@ -53,15 +46,12 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
# 112600:
CFLAGSCXX += -DDISABLE_PCH_HACK
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1RPATH = NONE
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_dp_version.obj $(SLO)$/main.obj
+APP1STDLIBS = $(GTESTLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/desktop/qa/deployment_misc/test_dp_version.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/qa/deployment_misc/test_dp_version.cxx?rev=1700095r1=1700094r2=1700095view=diff
==
--- openoffice/trunk/main/desktop/qa/deployment_misc/test_dp_version.cxx
(original)
+++ openoffice/trunk/main/desktop/qa/deployment_misc/test_dp_version.cxx Sun
Aug 30 08:41:13 2015
@@ -28,10 +28,7 @@
#include cstddef
-#include cppunit/TestAssert.h
-#include cppunit/TestFixture.h
-#include cppunit/extensions/HelperMacros.h
-#include cppunit/plugin/TestPlugIn.h
+#include gtest/gtest.h
#include rtl/ustring.h
#include rtl/ustring.hxx
@@ -39,16 +36,11 @@
namespace {
-class Test: public ::CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void test();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(test);
-CPPUNIT_TEST_SUITE_END();
};
-void Test::test() {
+TEST_F(Test, test) {
struct Data {
rtl::OUString version1;
rtl::OUString version2;
@@ -70,20 +62,17 @@ void Test::test() {
::dp_misc::GREATER }
svn commit: r1700094 - /openoffice/trunk/main/cppu/qa/version.map
Author: damjan Date: Sun Aug 30 08:29:07 2015 New Revision: 1700094 URL: http://svn.apache.org/r1700094 Log: Remove unused main/cppu/qa/version.map Removed: openoffice/trunk/main/cppu/qa/version.map
svn commit: r1700093 [3/3] - in /openoffice/trunk/main/cppu: prj/build.lst qa/main.cxx qa/makefile.mk qa/test_any.cxx qa/test_recursion.cxx qa/test_reference.cxx qa/test_unotype.cxx
Modified: openoffice/trunk/main/cppu/qa/test_recursion.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_recursion.cxx?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/qa/test_recursion.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_recursion.cxx Sun Aug 30 08:26:13 2015
@@ -24,30 +24,21 @@
#include precompiled_cppu.hxx
#include sal/config.h
-#include testshl/simpleheader.hxx
#include sal/types.h
#include Rec.hpp
+#include gtest/gtest.h
namespace
{
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void testRecursion();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testRecursion);
-CPPUNIT_TEST_SUITE_END();
};
-void Test::testRecursion() {
-CPPUNIT_ASSERT_EQUAL(static_cast sal_Int32 (0), Rec().x.getLength());
+TEST_F(Test, testRecursion) {
+ASSERT_EQ(static_cast sal_Int32 (0), Rec().x.getLength());
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, tests);
-
}
-
-NOADDITIONAL;
Modified: openoffice/trunk/main/cppu/qa/test_reference.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_reference.cxx?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/qa/test_reference.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_reference.cxx Sun Aug 30 08:26:13 2015
@@ -28,9 +28,9 @@
#include Interface1.hpp
-#include testshl/simpleheader.hxx
#include rtl/ustring.hxx
#include sal/types.h
+#include gtest/gtest.h
namespace
{
@@ -91,18 +91,13 @@ private:
oslInterlockedCount m_refCount;
};
-class Test: public ::CppUnit::TestFixture
+class Test: public ::testing::Test
{
public:
-void testUnoSetThrow();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testUnoSetThrow);
-CPPUNIT_TEST_SUITE_END();
};
-void Test::testUnoSetThrow()
+TEST_F(Test, testUnoSetThrow)
{
Reference Interface1 xNull;
Reference Interface1 xFoo( new Foo );
@@ -110,43 +105,39 @@ void Test::testUnoSetThrow()
// ctor taking Reference interface_type
bool bCaughtException = false;
try { Reference Interface1 x( xNull, UNO_SET_THROW ); (void)x; } catch(
const RuntimeException ) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+ASSERT_EQ( true, bCaughtException );
bCaughtException = false;
try { Reference Interface1 x( xFoo, UNO_SET_THROW ); (void)x; } catch(
const RuntimeException ) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+ASSERT_EQ( false, bCaughtException );
// ctor taking interface_type*
bCaughtException = false;
try { Reference Interface1 x( xNull.get(), UNO_SET_THROW ); (void)x; }
catch( const RuntimeException ) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+ASSERT_EQ( true, bCaughtException );
bCaughtException = false;
try { Reference Interface1 x( xFoo.get(), UNO_SET_THROW ); (void)x; }
catch( const RuntimeException ) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+ASSERT_EQ( false, bCaughtException );
Reference Interface1 x;
// set taking Reference interface_type
bCaughtException = false;
try { x.set( xNull, UNO_SET_THROW ); } catch( const RuntimeException ) {
bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+ASSERT_EQ( true, bCaughtException );
bCaughtException = false;
try { x.set( xFoo, UNO_SET_THROW ); } catch( const RuntimeException ) {
bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+ASSERT_EQ( false, bCaughtException );
// set taking interface_type*
bCaughtException = false;
try { x.set( xNull.get(), UNO_SET_THROW ); } catch( const
RuntimeException ) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( true, bCaughtException );
+ASSERT_EQ( true, bCaughtException );
bCaughtException = false;
try { x.set( xFoo.get(), UNO_SET_THROW ); } catch( const RuntimeException
) { bCaughtException = true; }
-CPPUNIT_ASSERT_EQUAL( false, bCaughtException );
+ASSERT_EQ( false, bCaughtException );
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, alltests);
-
} // namespace
-
-NOADDITIONAL;
Modified: openoffice/trunk/main/cppu/qa/test_unotype.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_unotype.cxx?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/qa/test_unotype.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_unotype.cxx Sun Aug 30 08:26:13 2015
@@ -40,10 +40,10 @@
#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/uno/XInterface.hpp
#include
svn commit: r1700093 [1/3] - in /openoffice/trunk/main/cppu: prj/build.lst qa/main.cxx qa/makefile.mk qa/test_any.cxx qa/test_recursion.cxx qa/test_reference.cxx qa/test_unotype.cxx
Author: damjan
Date: Sun Aug 30 08:26:13 2015
New Revision: 1700093
URL: http://svn.apache.org/r1700093
Log:
#i125003# migrate main/cppu from cppunit to Google Test and run it on every
build.
Added:
openoffice/trunk/main/cppu/qa/main.cxx
Modified:
openoffice/trunk/main/cppu/prj/build.lst
openoffice/trunk/main/cppu/qa/makefile.mk
openoffice/trunk/main/cppu/qa/test_any.cxx
openoffice/trunk/main/cppu/qa/test_recursion.cxx
openoffice/trunk/main/cppu/qa/test_reference.cxx
openoffice/trunk/main/cppu/qa/test_unotype.cxx
Modified: openoffice/trunk/main/cppu/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/prj/build.lst?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/prj/build.lst (original)
+++ openoffice/trunk/main/cppu/prj/build.lst Sun Aug 30 08:26:13 2015
@@ -10,3 +10,4 @@ cucppu\source\UnsafeBridgenmake -
cu cppu\source\AffineBridgenmake - all
cu_AffineBridge cu_inc NULL
cu cppu\source\LogBridge nmake - all cu_LogBridge
cu_inc NULL
cu cppu\util nmake -
all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv
cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
+cu cppu\qa nmake - all cu_qa cu_inc
cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge
cu_AffineBridge cu_LogBridge NULL
Added: openoffice/trunk/main/cppu/qa/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/main.cxx?rev=1700093view=auto
==
--- openoffice/trunk/main/cppu/qa/main.cxx (added)
+++ openoffice/trunk/main/cppu/qa/main.cxx Sun Aug 30 08:26:13 2015
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include gtest/gtest.h
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(argc, argv);
+return RUN_ALL_TESTS();
+}
Modified: openoffice/trunk/main/cppu/qa/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/makefile.mk?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/qa/makefile.mk (original)
+++ openoffice/trunk/main/cppu/qa/makefile.mk Sun Aug 30 08:26:13 2015
@@ -29,47 +29,42 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
-DLLPRE = # no leading lib on .so files
+.ELSE
-INCPRE += $(MISC)$/$(TARGET)$/inc
-SHL1TARGET = $(TARGET)_any
-SHL1OBJS = $(SLO)$/test_any.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SHL2TARGET = $(TARGET)_unotype
-SHL2OBJS = $(SLO)$/test_unotype.obj
-SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL2VERSIONMAP = version.map
-SHL2IMPLIB = i$(SHL2TARGET)
-DEF2NAME = $(SHL2TARGET)
-
-SHL3TARGET = $(TARGET)_reference
-SHL3OBJS = $(SLO)$/test_reference.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL3VERSIONMAP = version.map
-SHL3IMPLIB = i$(SHL3TARGET)
-DEF3NAME = $(SHL3TARGET)
-
-SHL4TARGET = $(TARGET)_recursion
-SHL4OBJS = $(SLO)$/test_recursion.obj
-SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL4VERSIONMAP = version.map
-SHL4IMPLIB = i$(SHL4TARGET)
-DEF4NAME = $(SHL4TARGET)
+INCPRE += $(MISC)$/$(TARGET)$/inc
-SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
+APP1TARGET = $(TARGET)_any
+APP1OBJS = $(SLO)$/test_any.obj $(SLO)$/main.obj
+APP1STDLIBS = $(CPPULIB) $(GTESTLIB) $(TESTSHL2LIB) $(SALLIB)
+APP1RPATH = NONE
+APP1TEST = enabled
+
+APP2TARGET = $(TARGET)_unotype
+APP2OBJS = $(SLO)$/test_unotype.obj $(SLO)$/main.obj
+APP2STDLIBS = $(CPPULIB) $(GTESTLIB) $(TESTSHL2LIB)
svn commit: r1700093 [2/3] - in /openoffice/trunk/main/cppu: prj/build.lst qa/main.cxx qa/makefile.mk qa/test_any.cxx qa/test_recursion.cxx qa/test_reference.cxx qa/test_unotype.cxx
Modified: openoffice/trunk/main/cppu/qa/test_any.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/test_any.cxx?rev=1700093r1=1700092r2=1700093view=diff
==
--- openoffice/trunk/main/cppu/qa/test_any.cxx (original)
+++ openoffice/trunk/main/cppu/qa/test_any.cxx Sun Aug 30 08:26:13 2015
@@ -51,13 +51,13 @@
#include com/sun/star/uno/Sequence.hxx
#include com/sun/star/uno/Type.hxx
#include com/sun/star/uno/XInterface.hpp
-#include testshl/simpleheader.hxx
#include osl/diagnose.h
#include osl/interlck.h
#include rtl/string.h
#include rtl/ustring.h
#include rtl/ustring.hxx
#include sal/types.h
+#include gtest/gtest.h
namespace {
@@ -190,2137 +190,2006 @@ public:
}
};
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void testVoid();
-
-void testBoolean();
-
-void testByte();
-
-void testShort();
-
-void testUnsignedShort();
-
-void testLong();
-
-void testUnsignedLong();
-
-void testHyper();
-
-void testUnsignedHyper();
-
-void testFloat();
-
-void testDouble();
-
-void testChar();
-
-void testString();
-
-void testType();
-
-void testSequence();
-
-void testEnum();
-
-void testStruct();
-
-void testPoly();
-
-void testException();
-
-void testInterface();
-
-void testNull();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testVoid);
-CPPUNIT_TEST(testBoolean);
-CPPUNIT_TEST(testByte);
-CPPUNIT_TEST(testShort);
-CPPUNIT_TEST(testUnsignedShort);
-CPPUNIT_TEST(testLong);
-CPPUNIT_TEST(testUnsignedLong);
-CPPUNIT_TEST(testHyper);
-CPPUNIT_TEST(testUnsignedHyper);
-CPPUNIT_TEST(testFloat);
-CPPUNIT_TEST(testDouble);
-CPPUNIT_TEST(testChar);
-CPPUNIT_TEST(testString);
-CPPUNIT_TEST(testType);
-CPPUNIT_TEST(testSequence);
-CPPUNIT_TEST(testEnum);
-CPPUNIT_TEST(testStruct);
-CPPUNIT_TEST(testPoly);
-CPPUNIT_TEST(testException);
-CPPUNIT_TEST(testInterface);
-CPPUNIT_TEST(testNull);
-CPPUNIT_TEST_SUITE_END();
};
-void Test::testVoid() {
+TEST_F(Test, testVoid) {
css::uno::Any a;
-CPPUNIT_ASSERT(a.getValueType() == getVoidCppuType());
+ASSERT_TRUE(a.getValueType() == getVoidCppuType());
{
bool b = true;
-CPPUNIT_ASSERT_MESSAGE(bool, !(a = b) b);
+ASSERT_TRUE(!(a = b) b) bool;
}
{
sal_Bool b = true;
-CPPUNIT_ASSERT_MESSAGE(sal_Bool, !(a = b) b);
+ASSERT_TRUE(!(a = b) b) sal_Bool;
}
{
sal_Int8 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_Int8, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_Int8;
}
{
sal_uInt8 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_uInt8, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_uInt8;
}
{
sal_Int16 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_Int16, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_Int16;
}
{
sal_uInt16 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_uInt16, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_uInt16;
}
{
sal_Int32 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_Int32, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_Int32;
}
{
sal_uInt32 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_uInt32, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_uInt32;
}
{
sal_Int64 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_Int64, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_Int64;
}
{
sal_uInt64 b = 2;
-CPPUNIT_ASSERT_MESSAGE(sal_uInt64, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) sal_uInt64;
}
{
float b = 2;
-CPPUNIT_ASSERT_MESSAGE(float, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) float;
}
{
double b = 2;
-CPPUNIT_ASSERT_MESSAGE(double, !(a = b) b == 2);
+ASSERT_TRUE(!(a = b) b == 2) double;
}
{
sal_Unicode b = '2';
-CPPUNIT_ASSERT_MESSAGE(sal_Unicode, !(a = b) b == '2');
+ASSERT_TRUE(!(a = b) b == '2') sal_Unicode;
}
{
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM(2));
-CPPUNIT_ASSERT_MESSAGE(
-rtl::OUString,
-!(a = b) b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(2)));
+ASSERT_TRUE(
+!(a = b) b.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(2)))
rtl::OUString;
}
{
css::uno::Type b(getCppuType rtl::OUString ());
-CPPUNIT_ASSERT_MESSAGE(
-css::uno::Type,
-!(a = b) b == getCppuType rtl::OUString ());
+ASSERT_TRUE(
+!(a = b) b == getCppuType rtl::OUString ())
css::uno::Type;
}
{
css::uno::Any b(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(2)));
-
svn commit: r1700099 - in /openoffice/trunk/main/o3tl/qa: export.map main.cxx makefile.mk test-cow_wrapper.cxx test-heap_ptr.cxx test-range.cxx test-vector_pool.cxx
Author: damjan
Date: Sun Aug 30 09:09:06 2015
New Revision: 1700099
URL: http://svn.apache.org/r1700099
Log:
#i125003# migrate main/o3tl from cppunit to Google Test
Added:
openoffice/trunk/main/o3tl/qa/main.cxx
Removed:
openoffice/trunk/main/o3tl/qa/export.map
Modified:
openoffice/trunk/main/o3tl/qa/makefile.mk
openoffice/trunk/main/o3tl/qa/test-cow_wrapper.cxx
openoffice/trunk/main/o3tl/qa/test-heap_ptr.cxx
openoffice/trunk/main/o3tl/qa/test-range.cxx
openoffice/trunk/main/o3tl/qa/test-vector_pool.cxx
Added: openoffice/trunk/main/o3tl/qa/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/qa/main.cxx?rev=1700099view=auto
==
--- openoffice/trunk/main/o3tl/qa/main.cxx (added)
+++ openoffice/trunk/main/o3tl/qa/main.cxx Sun Aug 30 09:09:06 2015
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include gtest/gtest.h
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(argc, argv);
+return RUN_ALL_TESTS();
+}
Modified: openoffice/trunk/main/o3tl/qa/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/qa/makefile.mk?rev=1700099r1=1700098r2=1700099view=diff
==
--- openoffice/trunk/main/o3tl/qa/makefile.mk (original)
+++ openoffice/trunk/main/o3tl/qa/makefile.mk Sun Aug 30 09:09:06 2015
@@ -20,73 +20,48 @@
#**
-
-.IF $(WITH_CPPUNIT) != YES || $(GUI) == OS2
-
-@all:
-.IF $(GUI) == OS2
- @echo Skipping, cppunit broken.
-.ELIF $(WITH_CPPUNIT) != YES
- @echo cppunit disabled. nothing do do.
-.END
-
-.ELSE # $(WITH_CPPUNIT) != YES || $(GUI) == OS2
-
PRJ=..
-
PRJNAME=o3tl
TARGET=tests
ENABLE_EXCEPTIONS=TRUE
+
# --- Settings -
.INCLUDE : settings.mk
-#building with stlport, but cppunit was not built with stlport
-.IF $(USE_SYSTEM_STL)!=YES
-.IF $(SYSTEM_CPPUNIT)==YES
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
.IF $(L10N_framework)==
# --- Common --
# BEGIN
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/cow_wrapper_clients.obj \
+ $(SLO)$/main.obj\
$(SLO)$/test-cow_wrapper.obj\
$(SLO)$/test-vector_pool.obj \
$(SLO)$/test-heap_ptr.obj \
$(SLO)$/test-range.obj
-SHL1TARGET= tests
-SHL1STDLIBS= $(SALLIB)\
- $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-SHL1RPATH = NONE
+APP1TARGET= tests
+APP1STDLIBS= $(SALLIB)\
+ $(GTESTLIB)
-# END --
+APP1RPATH = NONE
+APP1TEST = enabled
-#--- All object files
---
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+# END --
# --- Targets --
.ENDIF # L10N_framework
.INCLUDE : target.mk
-# --- Enable test execution in normal build
-.IF $(L10N_framework)==
-.INCLUDE : _cppunit.mk
-.ENDIF # L10N_framework
-
-.ENDIF # $(WITH_CPPUNIT) != YES || $(GUI) == OS2
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/o3tl/qa/test-cow_wrapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/o3tl/qa/test-cow_wrapper.cxx?rev=1700099r1=1700098r2=1700099view=diff
==
---
svn commit: r1700150 - in /openoffice/trunk/main/sal/qa/osl/thread: makefile.mk test_thread.cxx
Author: damjan
Date: Sun Aug 30 18:00:24 2015
New Revision: 1700150
URL: http://svn.apache.org/r1700150
Log:
Put the main function in the test file instead of a separate missing file.
Modified:
openoffice/trunk/main/sal/qa/osl/thread/makefile.mk
openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx
Modified: openoffice/trunk/main/sal/qa/osl/thread/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/thread/makefile.mk?rev=1700150r1=1700149r2=1700150view=diff
==
--- openoffice/trunk/main/sal/qa/osl/thread/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/osl/thread/makefile.mk Sun Aug 30 18:00:24 2015
@@ -36,7 +36,7 @@ all:
.ELSE
APP1TARGET = $(TARGET)
-APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1OBJS = $(SLO)$/test_thread.obj
APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
APP1RPATH = NONE
APP1TEST = enabled
Modified: openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx?rev=1700150r1=1700149r2=1700150view=diff
==
--- openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx Sun Aug 30 18:00:24
2015
@@ -78,3 +78,9 @@ TEST_F(Test, test) {
}
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(argc, argv);
+return RUN_ALL_TESTS();
+}
+
svn commit: r1700142 - in /openoffice/branches/AOO410/main: ./ extensions.lst
Author: pescetti Date: Sun Aug 30 17:25:36 2015 New Revision: 1700142 URL: http://svn.apache.org/r1700142 Log: #i126454# Update English dictionary to version 2015.08.01 Modified: openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/extensions.lst Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 30 17:25:36 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2/main:1417739-1541842 /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1677190,1687177,1692551 +/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1677190,1687177,1692551,1700135 Modified: openoffice/branches/AOO410/main/extensions.lst URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/extensions.lst?rev=1700142r1=1700141r2=1700142view=diff == --- openoffice/branches/AOO410/main/extensions.lst (original) +++ openoffice/branches/AOO410/main/extensions.lst Sun Aug 30 17:25:36 2015 @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -5ddb509520382d0f2cb897b072904e25 http://sourceforge.net/projects/aoo-extensions/files/17102/14/dict-en.oxt/download dict-en.oxt +65580f36a52c38819db4d9c2a6656526 http://sourceforge.net/projects/aoo-extensions/files/17102/19/dict-en.oxt/download dict-en.oxt # English (USA, en_US) dictionary [ language==nl || language==ru ]
svn commit: r1700153 - in /openoffice/trunk/main/sal/qa/rtl/uuid: makefile.mk rtl_Uuid.cxx
Author: damjan
Date: Sun Aug 30 19:10:42 2015
New Revision: 1700153
URL: http://svn.apache.org/r1700153
Log:
#i125003# migrate main/sal/qa/rtl/uuid from cppunit to Google Test.
Modified:
openoffice/trunk/main/sal/qa/rtl/uuid/makefile.mk
openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx
Modified: openoffice/trunk/main/sal/qa/rtl/uuid/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/uuid/makefile.mk?rev=1700153r1=1700152r2=1700153view=diff
==
--- openoffice/trunk/main/sal/qa/rtl/uuid/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/rtl/uuid/makefile.mk Sun Aug 30 19:10:42 2015
@@ -33,32 +33,30 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN
# auto generated Target:joblist by codegen.pl
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_Uuid.obj
-SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+APP1TARGET= rtl_Uuid
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# END --
-#--- All object files
---
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
# --- Targets --
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx?rev=1700153r1=1700152r2=1700153view=diff
==
--- openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/uuid/rtl_Uuid.cxx Sun Aug 30 19:10:42 2015
@@ -27,7 +27,6 @@
#include math.h
#include stdio.h
-#include testshl/simpleheader.hxx
#include rtl/uuid.h
#include rtl/ustring.h
#include rtl/ustring.hxx
@@ -37,16 +36,18 @@
#include time.h
#endif
+#include gtest/gtest.h
+
using namespace rtl;
/** print a UNI_CODE String. And also print some comments of the string.
*/
inline void printUString( const ::rtl::OUString str, const sal_Char * msg =
)
{
- t_print(#%s #printUString_u# , msg );
+ printf(#%s #printUString_u# , msg );
rtl::OString aString;
aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
- t_print(%s\n, (char *)aString.getStr( ) );
+ printf(%s\n, (char *)aString.getStr( ) );
}
/
@@ -71,76 +72,73 @@ void printUuid( sal_uInt8 *pNode )
namespace rtl_Uuid
{
-class createUuid : public CppUnit::TestFixture
+class createUuid : public ::testing::Test
{
public:
// initialise your test code values here.
-void setUp()
+void SetUp()
{
}
-void tearDown()
+void TearDown()
{
}
+}; // class createUuid
+
#define TEST_UUID 20
-void createUuid_001()
-{
- sal_uInt8 aNode[TEST_UUID][16];
- sal_Int32 i,i2;
- for( i = 0 ; i TEST_UUID ; i ++ )
- {
- rtl_createUuid( aNode[i], 0, sal_False );
- }
- sal_Bool bRes = sal_True;
- for( i = 0 ; i TEST_UUID ; i ++ )
- {
- for( i2 = i+1 ; i2 TEST_UUID ; i2 ++ )
- {
- if ( rtl_compareUuid( aNode[i] , aNode[i2] ) == 0 )
- {
- bRes = sal_False;
- break;
- }
- }
- if ( bRes == sal_False )
- break;
- }
- CPPUNIT_ASSERT_MESSAGE(createUuid: every uuid must be different.,
bRes == sal_True );
+TEST_F(createUuid, createUuid_001)
+{
+sal_uInt8 aNode[TEST_UUID][16];
+sal_Int32 i,i2;
+for( i = 0 ; i TEST_UUID ; i ++ )
+{
+rtl_createUuid( aNode[i], 0, sal_False );
+}
+sal_Bool bRes = sal_True;
+for( i = 0 ; i TEST_UUID ; i ++ )
+{
+for( i2 = i+1 ; i2 TEST_UUID ; i2 ++ )
+{
+if ( rtl_compareUuid( aNode[i] , aNode[i2] ) == 0 )
+{
+bRes = sal_False;
+break;
+}
+}
+if ( bRes == sal_False )
+break;
}
- /*
-void createUuid_002()
-{
- sal_uInt8 pNode[16];
- sal_uInt8 aNode[TEST_UUID][16];
- sal_Int32 i,i2;
-
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/54 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1700141 - /openoffice/branches/AOO410/main/extensions.lst
Author: pescetti Date: Sun Aug 30 17:23:56 2015 New Revision: 1700141 URL: http://svn.apache.org/r1700141 Log: #i126454# Merge previous dictionary updates from trunk. Patch by: Amali Praveena Soban Kumar samaliprave...@yahoo.com.au Patch by: arielch Patch by: pescetti Modified: openoffice/branches/AOO410/main/extensions.lst Modified: openoffice/branches/AOO410/main/extensions.lst URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/extensions.lst?rev=1700141r1=1700140r2=1700141view=diff == --- openoffice/branches/AOO410/main/extensions.lst (original) +++ openoffice/branches/AOO410/main/extensions.lst Sun Aug 30 17:23:56 2015 @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -6e6d2112a43b744fa5dc12c4b150d52a http://sourceforge.net/projects/aoo-extensions/files/17102/5/dict-en.oxt/download dict-en.oxt +5ddb509520382d0f2cb897b072904e25 http://sourceforge.net/projects/aoo-extensions/files/17102/14/dict-en.oxt/download dict-en.oxt # English (USA, en_US) dictionary [ language==nl || language==ru ]
buildbot success in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a passing build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/50 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1700143 - in /openoffice/trunk/main/sal: prj/build.lst qa/osl/thread/makefile.mk qa/osl/thread/test_thread.cxx qa/osl/thread/version.map
Author: damjan
Date: Sun Aug 30 17:35:41 2015
New Revision: 1700143
URL: http://svn.apache.org/r1700143
Log:
#i125003# migrate main/sal/qa/osl/thread from cppunit to Google Test
and run it on every build.
Removed:
openoffice/trunk/main/sal/qa/osl/thread/version.map
Modified:
openoffice/trunk/main/sal/prj/build.lst
openoffice/trunk/main/sal/qa/osl/thread/makefile.mk
openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx
Modified: openoffice/trunk/main/sal/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1700143r1=1700142r2=1700143view=diff
==
--- openoffice/trunk/main/sal/prj/build.lst (original)
+++ openoffice/trunk/main/sal/prj/build.lst Sun Aug 30 17:35:41 2015
@@ -24,4 +24,5 @@ sa sal\qa\OStringBuffer nmake - all sa_q
sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util
NULL
sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname
sa_cppunittester sa_util NULL
+sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_cppunittester sa_util NULL
sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
Modified: openoffice/trunk/main/sal/qa/osl/thread/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/thread/makefile.mk?rev=1700143r1=1700142r2=1700143view=diff
==
--- openoffice/trunk/main/sal/qa/osl/thread/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/osl/thread/makefile.mk Sun Aug 30 17:35:41 2015
@@ -29,20 +29,18 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-DLLPRE = # no leading lib on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-testshl2 $(SHL1TARGETN)
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx?rev=1700143r1=1700142r2=1700143view=diff
==
--- openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/thread/test_thread.cxx Sun Aug 30 17:35:41
2015
@@ -26,11 +26,11 @@
#include sal/config.h
-#include testshl/simpleheader.hxx
#include osl/conditn.hxx
#include osl/thread.hxx
#include osl/time.h
#include sal/types.h
+#include gtest/gtest.h
namespace {
@@ -45,41 +45,36 @@ private:
virtual void SAL_CALL onTerminated() {
m_cond.set();
-CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, global.wait());
+ASSERT_EQ(osl::Condition::result_ok, global.wait());
}
osl::Condition m_cond;
};
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-// Nondeterministic, best effort test that an osl::Thread can be destroyed
-// (and in particular osl_destroyThread---indirectly---be called) before
the
-// corresponding thread has terminated:
-void test() {
-for (int i = 0; i 50; ++i) {
-osl::Condition c;
-Thread t(c);
-CPPUNIT_ASSERT(t.create());
-// Make sure virtual Thread::run/onTerminated are called before
-// Thread::~Thread:
-CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, c.wait());
-}
-// Make sure Thread::~Thread is called before each spawned thread
-// terminates:
-global.set();
-// Give the spawned threads enough time to terminate:
-TimeValue const twentySeconds = { 20, 0 };
-osl::Thread::wait(twentySeconds);
-}
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(test);
-CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, alltests);
+// Nondeterministic, best effort test that an osl::Thread can be destroyed
+// (and in particular osl_destroyThread---indirectly---be called) before the
+// corresponding thread has terminated:
+TEST_F(Test, test) {
+for (int i = 0; i 50; ++i) {
+osl::Condition c;
+Thread t(c);
+ASSERT_TRUE(t.create());
+// Make sure virtual Thread::run/onTerminated are called before
+// Thread::~Thread:
+ASSERT_EQ(osl::Condition::result_ok, c.wait());
+}
+// Make sure
svn commit: r1700140 - /openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
Author: damjan
Date: Sun Aug 30 17:09:38 2015
New Revision: 1700140
URL: http://svn.apache.org/r1700140
Log:
#i125003# generate a non-fatal test failure in the main/sal/qa/osl/condition
destructor
instead of commenting out a fatal test failure.
Modified:
openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
Modified: openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx?rev=1700140r1=1700139r2=1700140view=diff
==
--- openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx Sun Aug 30
17:09:38 2015
@@ -97,8 +97,7 @@ public:
~ConditionThread( )
{
-// LLA: do not throw in DTors!
- // LLA: CPPUNIT_ASSERT_MESSAGE( #ConditionThread does not
shutdown properly.\n, sal_False == this - isRunning( ) );
+ EXPECT_TRUE( sal_False == this - isRunning( ) )
#ConditionThread does not shutdown properly.\n;
}
protected:
::osl::Condition m_MyCon;
svn commit: r1700135 - /openoffice/trunk/main/extensions.lst
Author: pescetti Date: Sun Aug 30 16:33:25 2015 New Revision: 1700135 URL: http://svn.apache.org/r1700135 Log: #i126454# Update English dictionary to version 2015.08.01 Modified: openoffice/trunk/main/extensions.lst Modified: openoffice/trunk/main/extensions.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions.lst?rev=1700135r1=1700134r2=1700135view=diff == --- openoffice/trunk/main/extensions.lst (original) +++ openoffice/trunk/main/extensions.lst Sun Aug 30 16:33:25 2015 @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -5ddb509520382d0f2cb897b072904e25 http://sourceforge.net/projects/aoo-extensions/files/17102/14/dict-en.oxt/download dict-en.oxt +65580f36a52c38819db4d9c2a6656526 http://sourceforge.net/projects/aoo-extensions/files/17102/19/dict-en.oxt/download dict-en.oxt # English (USA, en_US) dictionary [ language==nl || language==ru ]
svn commit: r1700138 - in /openoffice/trunk/main/salhelper: prj/build.lst qa/main.cxx qa/makefile.mk qa/test_api.cxx qa/version.map
Author: damjan
Date: Sun Aug 30 16:41:27 2015
New Revision: 1700138
URL: http://svn.apache.org/r1700138
Log:
#i125003# migrate main/salhelper from cppunit to Google Test
and run it on every build.
Added:
openoffice/trunk/main/salhelper/qa/main.cxx
Removed:
openoffice/trunk/main/salhelper/qa/version.map
Modified:
openoffice/trunk/main/salhelper/prj/build.lst
openoffice/trunk/main/salhelper/qa/makefile.mk
openoffice/trunk/main/salhelper/qa/test_api.cxx
Modified: openoffice/trunk/main/salhelper/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/prj/build.lst?rev=1700138r1=1700137r2=1700138view=diff
==
--- openoffice/trunk/main/salhelper/prj/build.lst (original)
+++ openoffice/trunk/main/salhelper/prj/build.lst Sun Aug 30 16:41:27 2015
@@ -1,3 +1,4 @@
shpsalhelper : sal NULL
shpsalhelper usr1- all shp_mkout NULL
shpsalhelper\sourcenmake - all shp_source NULL
+shpsalhelper\qanmake - all shp_qa shp_source NULL
Added: openoffice/trunk/main/salhelper/qa/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/main.cxx?rev=1700138view=auto
==
--- openoffice/trunk/main/salhelper/qa/main.cxx (added)
+++ openoffice/trunk/main/salhelper/qa/main.cxx Sun Aug 30 16:41:27 2015
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include gtest/gtest.h
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(argc, argv);
+return RUN_ALL_TESTS();
+}
Modified: openoffice/trunk/main/salhelper/qa/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/makefile.mk?rev=1700138r1=1700137r2=1700138view=diff
==
--- openoffice/trunk/main/salhelper/qa/makefile.mk (original)
+++ openoffice/trunk/main/salhelper/qa/makefile.mk Sun Aug 30 16:41:27 2015
@@ -29,20 +29,18 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_api.obj $(SLO)$/main.obj
+APP1STDLIBS = $(GTESTLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-cd $(SHL1TARGETN:d) $(TESTSHL2) $(SHL1TARGETN:f)
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/salhelper/qa/test_api.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/qa/test_api.cxx?rev=1700138r1=1700137r2=1700138view=diff
==
--- openoffice/trunk/main/salhelper/qa/test_api.cxx (original)
+++ openoffice/trunk/main/salhelper/qa/test_api.cxx Sun Aug 30 16:41:27 2015
@@ -52,11 +52,11 @@ std::type_info const getSimpleReferenc
}
-#include testshl/simpleheader.hxx
#include osl/mutex.hxx
#include salhelper/condition.hxx
#include salhelper/dynload.hxx
#include salhelper/simplereferenceobject.hxx
+#include gtest/gtest.h
#include memory
@@ -76,91 +76,62 @@ class DerivedConditionWaiterTimedout:
class DerivedSimpleReferenceObject: public salhelper::SimpleReferenceObject {};
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void testCondition();
-
-void testConditionModifier();
-
-void testConditionWaiter();
-
-void testConditionWaiterTimedout();
-
-void testORealDynamicLoader();
-
-void testSimpleReferenceObject();
-
-void testDerivedCondition();
-
-
svn commit: r1700126 - /openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx
Author: pescetti Date: Sun Aug 30 15:36:27 2015 New Revision: 1700126 URL: http://svn.apache.org/r1700126 Log: #i126447# Fix text deletion when toggling Check grammar in spell checker. Patch by: Stefan Heinemann stefan.heinem...@adfinis-sygroup.ch Modified: openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx Modified: openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx?rev=1700126r1=1700125r2=1700126view=diff == --- openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx (original) +++ openoffice/trunk/main/cui/source/dialogs/SpellDialog.cxx Sun Aug 30 15:36:27 2015 @@ -787,7 +787,7 @@ void SpellDialog::Impl_Restore() //get a new sentence aSentenceED.SetText(rtl::OUString()); aSentenceED.ResetModified(); -SpellContinue_Impl(); +SpellContinue_Impl(true); aIgnorePB.SetText(aIgnoreOnceST); }
svn commit: r1700139 - in /openoffice/trunk/main/sal/qa/ByteSequence: ByteSequence.cxx main.cxx makefile.mk
Author: damjan
Date: Sun Aug 30 16:59:34 2015
New Revision: 1700139
URL: http://svn.apache.org/r1700139
Log:
#i125003# migrate main/sal/qa/ByteSequence from cppunit to Google Test
Added:
openoffice/trunk/main/sal/qa/ByteSequence/main.cxx
Modified:
openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx
openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk
Modified: openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx?rev=1700139r1=1700138r2=1700139view=diff
==
--- openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx (original)
+++ openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx Sun Aug 30
16:59:34 2015
@@ -24,167 +24,146 @@
#include precompiled_sal.hxx
#include sal/config.h
-#include cppunit/TestAssert.h
-#include cppunit/TestFixture.h
-#include cppunit/extensions/HelperMacros.h
-#include cppunit/plugin/TestPlugIn.h
+#include gtest/gtest.h
#include rtl/byteseq.hxx
#include sal/types.h
namespace {
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void test_default() {
-rtl::ByteSequence s;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s.getLength());
-}
+};
-void test_size0() {
-rtl::ByteSequence s(sal_Int32(0));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s.getLength());
-}
+TEST_F(Test, test_default) {
+rtl::ByteSequence s;
+ASSERT_EQ(sal_Int32(0), s.getLength());
+}
-void test_size5() {
-rtl::ByteSequence s(5);
-sal_Int8 const * p = s.getConstArray();
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5), s.getLength());
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[0]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[1]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[2]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[3]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[4]);
-}
+TEST_F(Test, test_size0) {
+rtl::ByteSequence s(sal_Int32(0));
+ASSERT_EQ(sal_Int32(0), s.getLength());
+}
-void test_noinit0() {
-rtl::ByteSequence s(0, rtl::BYTESEQ_NODEFAULT);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s.getLength());
-}
+TEST_F(Test, test_size5) {
+rtl::ByteSequence s(5);
+sal_Int8 const * p = s.getConstArray();
+ASSERT_EQ(sal_Int32(5), s.getLength());
+ASSERT_EQ(sal_Int8(0), p[0]);
+ASSERT_EQ(sal_Int8(0), p[1]);
+ASSERT_EQ(sal_Int8(0), p[2]);
+ASSERT_EQ(sal_Int8(0), p[3]);
+ASSERT_EQ(sal_Int8(0), p[4]);
+}
-void test_noinit5() {
-rtl::ByteSequence s(5, rtl::BYTESEQ_NODEFAULT);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5), s.getLength());
-}
+TEST_F(Test, test_noinit0) {
+rtl::ByteSequence s(0, rtl::BYTESEQ_NODEFAULT);
+ASSERT_EQ(sal_Int32(0), s.getLength());
+}
-void test_elem0() {
-rtl::ByteSequence s(0, 0);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), s.getLength());
-}
+TEST_F(Test, test_noinit5) {
+rtl::ByteSequence s(5, rtl::BYTESEQ_NODEFAULT);
+ASSERT_EQ(sal_Int32(5), s.getLength());
+}
-void test_elem5() {
-sal_Int8 const a[5] = { 0, 1, 2, 3, 4 };
-rtl::ByteSequence s(a, 5);
-sal_Int8 const * p = s.getConstArray();
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5), s.getLength());
-CPPUNIT_ASSERT_EQUAL(sal_Int8(0), p[0]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(1), p[1]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(2), p[2]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(3), p[3]);
-CPPUNIT_ASSERT_EQUAL(sal_Int8(4), p[4]);
-}
+TEST_F(Test, test_elem0) {
+rtl::ByteSequence s(0, 0);
+ASSERT_EQ(sal_Int32(0), s.getLength());
+}
-void test_copy() {
-rtl::ByteSequence s1(5);
-{
-rtl::ByteSequence s2(s1);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5), s2.getLength());
-CPPUNIT_ASSERT_EQUAL(s1.getConstArray(), s2.getConstArray());
-CPPUNIT_ASSERT_EQUAL(s1.getHandle(), s2.getHandle());
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), s1.getHandle()-nRefCount);
-}
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s1.getHandle()-nRefCount);
-}
+TEST_F(Test, test_elem5) {
+sal_Int8 const a[5] = { 0, 1, 2, 3, 4 };
+rtl::ByteSequence s(a, 5);
+sal_Int8 const * p = s.getConstArray();
+ASSERT_EQ(sal_Int32(5), s.getLength());
+ASSERT_EQ(sal_Int8(0), p[0]);
+ASSERT_EQ(sal_Int8(1), p[1]);
+ASSERT_EQ(sal_Int8(2), p[2]);
+ASSERT_EQ(sal_Int8(3), p[3]);
+ASSERT_EQ(sal_Int8(4), p[4]);
+}
-void test_fromC() {
-sal_Sequence c = { 1, 1, { 0 } };
-{
-rtl::ByteSequence s(c);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s.getLength());
-CPPUNIT_ASSERT_EQUAL(
-static_cast void const * (c.elements),
-static_cast void const * (s.getConstArray()));
-CPPUNIT_ASSERT_EQUAL(c, s.getHandle());
-
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a failed build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/70 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed build --all Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on aoo-win7
The Buildbot has detected a failed build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/68 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed svn info build.pl --all Sincerely, -The Buildbot
svn commit: r1700184 - in /openoffice/trunk/main/sal/qa/rtl/uri: makefile.mk rtl_Uri.cxx rtl_testuri.cxx
Author: damjan
Date: Mon Aug 31 02:16:25 2015
New Revision: 1700184
URL: http://svn.apache.org/r1700184
Log:
#i125003# migrate main/sal/qa/rtl/uri from cppunit to Google Test.
Modified:
openoffice/trunk/main/sal/qa/rtl/uri/makefile.mk
openoffice/trunk/main/sal/qa/rtl/uri/rtl_Uri.cxx
openoffice/trunk/main/sal/qa/rtl/uri/rtl_testuri.cxx
Modified: openoffice/trunk/main/sal/qa/rtl/uri/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/uri/makefile.mk?rev=1700184r1=1700183r2=1700184view=diff
==
--- openoffice/trunk/main/sal/qa/rtl/uri/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/rtl/uri/makefile.mk Mon Aug 31 02:16:25 2015
@@ -32,40 +32,37 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
# --- BEGIN
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_Uri.obj
-SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+APP1TARGET= rtl_uri_simple
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
# END --
# --- BEGIN
-SHL2OBJS= \
+APP2OBJS= \
$(SLO)$/rtl_testuri.obj
-SHL2TARGET= rtl_Uri
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME=$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+APP2TARGET= rtl_Uri
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
# END --
-#--- All object files
---
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
# --- Targets --
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # $(ENABLE_UNIT_TESTS) != YES
Modified: openoffice/trunk/main/sal/qa/rtl/uri/rtl_Uri.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/uri/rtl_Uri.cxx?rev=1700184r1=1700183r2=1700184view=diff
==
--- openoffice/trunk/main/sal/qa/rtl/uri/rtl_Uri.cxx (original)
+++ openoffice/trunk/main/sal/qa/rtl/uri/rtl_Uri.cxx Mon Aug 31 02:16:25 2015
@@ -31,7 +31,7 @@
#include osl/thread.h
#include osl/file.hxx
-#include testshl/simpleheader.hxx
+#include gtest/gtest.h
//
-
@@ -71,15 +71,16 @@ namespace Stringtest
//
-
-class Convert : public CppUnit::TestFixture
+class Convert : public ::testing::Test
{
+protected:
rtl::OUString m_aStr;
public:
/*
rtl::OString toUTF8(rtl::OUString const _suStr)
{
rtl::OString sStrAsUTF8 = rtl::OUStringToOString(_suStr,
RTL_TEXTENCODING_UTF8);
-t_print(%s\n, escapeString(sStrAsUTF8).getStr());
+printf(%s\n, escapeString(sStrAsUTF8).getStr());
return sStrAsUTF8;
}
*/
@@ -97,7 +98,7 @@ namespace Stringtest
void showContent(rtl::OUString const _suStr)
{
rtl::OString sStr = convertToOString(_suStr);
-t_print(%s\n, sStr.getStr());
+printf(%s\n, sStr.getStr());
}
void toUTF8_mech(rtl::OUString const _suStr, rtl_UriEncodeMechanism
_eMechanism)
@@ -123,39 +124,15 @@ namespace Stringtest
void toUTF8(rtl::OUString const _suStr)
{
-t_print(rtl_UriEncodeIgnoreEscapes \n);
+printf(rtl_UriEncodeIgnoreEscapes \n);
toUTF8_mech(_suStr, rtl_UriEncodeIgnoreEscapes);
-t_print(\n);
-t_print(# rtl_UriEncodeKeepEscapes\n);
+printf(\n);
+printf(# rtl_UriEncodeKeepEscapes\n);
toUTF8_mech(_suStr, rtl_UriEncodeKeepEscapes);
-t_print(\n);
-t_print(# rtl_UriEncodeCheckEscapes\n);
+printf(\n);
+printf(# rtl_UriEncodeCheckEscapes\n);
toUTF8_mech(_suStr, rtl_UriEncodeCheckEscapes);
-t_print(\n);
-}
-
-void test_FromUTF8_001()
-{
-// string -- ustring
-rtl::OString sStrUTF8(h%C3%A4llo);
-rtl::OUString suStrUTF8 =
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a failed build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/53 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed configure bootstrap Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a failed build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/65 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed build --all Sincerely, -The Buildbot
