diff options
Diffstat (limited to 'cppuhelper/qa/unourl/cppu_unourl.cxx')
| -rw-r--r-- | cppuhelper/qa/unourl/cppu_unourl.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index 5d39de84f..f80388d5d 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "cppuhelper/unourl.hxx" #include "rtl/malformeduriexception.hxx" @@ -144,7 +144,7 @@ namespace cppu_unourl {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to parse URI correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to parse URI correctly", aDescriptor.equalsAscii( aTests[i].pDescriptor)); } @@ -191,11 +191,11 @@ namespace cppu_unourl {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to parse URI correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to parse URI correctly", aName.equalsAscii(aTests[i].pName)); } - } - + } + void testDescriptorKey(void) { struct Test @@ -237,7 +237,7 @@ namespace cppu_unourl {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to detect parameter correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to detect parameter correctly", bPresent == aTests[i].bPresent); } } @@ -306,7 +306,7 @@ namespace cppu_unourl catch (rtl::MalformedUriException &) {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to get param correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to get param correctly", aValue.equalsAscii(aTests[i].pValue)); } } @@ -386,7 +386,7 @@ namespace cppu_unourl catch (rtl::MalformedUriException &) {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to get param correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to get param correctly", aConnection.equalsAscii( aTests[i].pConnection)); } @@ -420,12 +420,12 @@ namespace cppu_unourl catch (rtl::MalformedUriException &) {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to get protocol correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to get protocol correctly", aProtocol.equalsAscii( aTests[i].pProtocol)); } } - + void testUrlObjectName() { struct Test @@ -456,7 +456,7 @@ namespace cppu_unourl catch (rtl::MalformedUriException &) {} CPPUNIT_ASSERT_MESSAGE("Failed to parse URI", bValid); - CPPUNIT_ASSERT_MESSAGE("Failed to get protocol correctly", + CPPUNIT_ASSERT_MESSAGE("Failed to get protocol correctly", aObjectName.equalsAscii( aTests[i].pObjectName)); } |