diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-26 16:29:08 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-09 19:00:31 +0100 |
| commit | d84595ec6da2555937874556a22677f41eb39984 (patch) | |
| tree | d29ff8c1833d2d0955c69a51572c6f39b84d809d | |
| parent | f0e6781ff272dc08795a2ab2fe2498ad8d97241d (diff) | |
ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()
Change-Id: Idf1d75817009286cd79a00c0ba154cea70e2ffda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125908
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit b03e070420606d407df2ec5e9dfa7043ecc46177)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125895
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit db8edd163cf453bbb9b85c2a17c78da49df27cdf)
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx index 08a384dee36b..bde7652b9ffa 100644 --- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx +++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx @@ -43,6 +43,22 @@ namespace CPPUNIT_ASSERT_EQUAL( OUString( "user%40anothername" ), aURI.GetUser() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), aURI.GetPort() ); CPPUNIT_ASSERT_EQUAL( OUString( "/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" ), aURI.GetRelativeReference() ); + + CurlUri uri2(aURI.CloneWithRelativeRefPathAbsolute(u"/foo/bar")); + CPPUNIT_ASSERT_EQUAL( OUString("http"), uri2.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri2.GetHost() ); + CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri2.GetUser() ); + CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri2.GetPort() ); + CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() ); + + CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment")); + CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); + CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() ); + CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); + CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"), uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/?query#fragment"), uri3.GetURI() ); } void webdav_local_test::WebdavUriTest2() @@ -54,6 +70,24 @@ namespace CPPUNIT_ASSERT_EQUAL( OUString("bar"), aURI.GetPassword() ); CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), aURI.GetPort() ); CPPUNIT_ASSERT_EQUAL( OUString( "/aService#aaa" ), aURI.GetRelativeReference() ); + + CurlUri uri2(aURI.CloneWithRelativeRefPathAbsolute(u"/foo/bar")); + CPPUNIT_ASSERT_EQUAL( OUString("https"), uri2.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri2.GetHost() ); + CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri2.GetUser() ); + CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri2.GetPassword() ); + CPPUNIT_ASSERT_EQUAL( sal_uInt16( 8040 ), uri2.GetPort() ); + CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() ); + + CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query")); + CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() ); + CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() ); + CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() ); + CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() ); + CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() ); + CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference() ); + CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() ); } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_local_test ); |