Kaydet (Commit) acf531be authored tarafından Giuseppe Castagno's avatar Giuseppe Castagno

Cosmetic: Namespaces, better make use of the 'using-directive'

Change-Id: If27709a2d8d8f231be9be0231d522f2a71e5fcae
Reviewed-on: https://gerrit.libreoffice.org/30457Reviewed-by: 's avatarGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Tested-by: 's avatarGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>
üst 9e33ac40
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <cppunit/plugin/TestPlugIn.h> #include <cppunit/plugin/TestPlugIn.h>
#include "NeonUri.hxx" #include "NeonUri.hxx"
using namespace webdav_ucp;
namespace namespace
{ {
...@@ -35,7 +36,7 @@ namespace ...@@ -35,7 +36,7 @@ namespace
{ {
//try URL decomposition //try URL decomposition
OUString aURL( "http://user%40anothername@server.biz:8040/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" ); OUString aURL( "http://user%40anothername@server.biz:8040/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" );
webdav_ucp::NeonUri aURI( aURL ); NeonUri aURI( aURL );
CPPUNIT_ASSERT_EQUAL( OUString( "http" ), aURI.GetScheme() ); CPPUNIT_ASSERT_EQUAL( OUString( "http" ), aURI.GetScheme() );
CPPUNIT_ASSERT_EQUAL( OUString( "server.biz" ), aURI.GetHost() ); CPPUNIT_ASSERT_EQUAL( OUString( "server.biz" ), aURI.GetHost() );
CPPUNIT_ASSERT_EQUAL( OUString( "user%40anothername" ), aURI.GetUserInfo() ); CPPUNIT_ASSERT_EQUAL( OUString( "user%40anothername" ), aURI.GetUserInfo() );
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include "DAVException.hxx" #include "DAVException.hxx"
#include "DAVTypes.hxx" #include "DAVTypes.hxx"
using namespace webdav_ucp;
namespace namespace
{ {
...@@ -27,7 +29,7 @@ namespace ...@@ -27,7 +29,7 @@ namespace
void tearDown( ) override; void tearDown( ) override;
void DAVTypesCheckInit( webdav_ucp::DAVOptions const & aDavType ); void DAVTypesCheckInit( DAVOptions const & aDavType );
void DAVTypesTest(); void DAVTypesTest();
void DAVOptsCacheTests(); void DAVOptsCacheTests();
...@@ -51,7 +53,7 @@ namespace ...@@ -51,7 +53,7 @@ namespace
{ {
} }
void webdav_opts_test::DAVTypesCheckInit( webdav_ucp::DAVOptions const & aDavType ) void webdav_opts_test::DAVTypesCheckInit( DAVOptions const & aDavType )
{ {
// check if the class is at reset state // check if the class is at reset state
// using accessors // using accessors
...@@ -73,7 +75,7 @@ namespace ...@@ -73,7 +75,7 @@ namespace
void webdav_opts_test::DAVTypesTest() void webdav_opts_test::DAVTypesTest()
{ {
//our DAVOptions //our DAVOptions
webdav_ucp::DAVOptions aDavOpt; DAVOptions aDavOpt;
DAVTypesCheckInit( aDavOpt ); DAVTypesCheckInit( aDavOpt );
aDavOpt.setClass1(); aDavOpt.setClass1();
...@@ -275,7 +277,7 @@ namespace ...@@ -275,7 +277,7 @@ namespace
aDavOpt.init(); aDavOpt.init();
DAVTypesCheckInit( aDavOpt ); DAVTypesCheckInit( aDavOpt );
// equality check // equality check
webdav_ucp::DAVOptions aDavOptTarget; DAVOptions aDavOptTarget;
CPPUNIT_ASSERT_EQUAL( true , aDavOpt == aDavOptTarget ); CPPUNIT_ASSERT_EQUAL( true , aDavOpt == aDavOptTarget );
aDavOpt.setClass1(); aDavOpt.setClass1();
...@@ -341,11 +343,11 @@ namespace ...@@ -341,11 +343,11 @@ namespace
void webdav_opts_test::DAVOptsCacheTests() void webdav_opts_test::DAVOptsCacheTests()
{ {
// define a local cache to test // define a local cache to test
webdav_ucp::DAVOptionsCache aDAVOptsCache; DAVOptionsCache aDAVOptsCache;
// the value to cache // the value to cache
webdav_ucp::DAVOptions aDavOpt; DAVOptions aDavOpt;
// the returned value to test // the returned value to test
webdav_ucp::DAVOptions aDavOptCached; DAVOptions aDavOptCached;
// init the values // init the values
OUString aAllowedMethods = "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK"; OUString aAllowedMethods = "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK";
OUString aURL = "http://my.server.org/a%20fake%20url/to%20test/another-url"; OUString aURL = "http://my.server.org/a%20fake%20url/to%20test/another-url";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment