hrev54935 adds 1 changeset to branch 'master'
old head: 522cc4b989ddc6e32e51bbb4c1b835b892ef9cdc
new head: 85a6d6530a30fc14790eeb65c8be8aff263ba348
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=85a6d6530a30+%5E522cc4b989dd
----------------------------------------------------------------------------
85a6d6530a30: libnetservices.a: fix unit test builds after hrev54923
[ Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54935
Commit: 85a6d6530a30fc14790eeb65c8be8aff263ba348
URL: https://git.haiku-os.org/haiku/commit/?id=85a6d6530a30
Author: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Date: Sat Jan 30 09:49:23 2021 UTC
----------------------------------------------------------------------------
13 files changed, 32 insertions(+), 10 deletions(-)
src/tests/apps/haikudepot/Jamfile | 2 +-
src/tests/kits/net/service/CookieTest.cpp | 3 +++
src/tests/kits/net/service/CookieTest.h | 11 ++++++++---
src/tests/kits/net/service/DataTest.cpp | 3 +++
src/tests/kits/net/service/DataTest.h | 4 ++++
src/tests/kits/net/service/FileTest.cpp | 3 +++
.../kits/{shared => net/service}/GeolocationTest.cpp | 2 +-
src/tests/kits/{shared => net/service}/GeolocationTest.h | 0
src/tests/kits/net/service/HttpTest.cpp | 3 +++
src/tests/kits/net/service/Jamfile | 6 ++++--
src/tests/kits/net/service/ServiceKitTestAddon.cpp | 2 ++
src/tests/kits/shared/Jamfile | 1 -
src/tests/kits/shared/SharedTestAddon.cpp | 2 --
----------------------------------------------------------------------------
diff --git a/src/tests/apps/haikudepot/Jamfile
b/src/tests/apps/haikudepot/Jamfile
index 4f695f14eb..ad9a57242a 100644
--- a/src/tests/apps/haikudepot/Jamfile
+++ b/src/tests/apps/haikudepot/Jamfile
@@ -8,7 +8,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot server ]
;
SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot server
dumpexportrepository ] ;
SubDirHdrs [ FDirName $(HAIKU_TOP) src apps haikudepot util ] ;
-UsePrivateHeaders shared interface ;
+UsePrivateHeaders interface netservices shared ;
local sourceDirs =
model
diff --git a/src/tests/kits/net/service/CookieTest.cpp
b/src/tests/kits/net/service/CookieTest.cpp
index 62f548f087..4d2e75a229 100644
--- a/src/tests/kits/net/service/CookieTest.cpp
+++ b/src/tests/kits/net/service/CookieTest.cpp
@@ -17,6 +17,9 @@
#include <cppunit/TestSuite.h>
+using namespace BPrivate::Network;
+
+
CookieTest::CookieTest()
{
}
diff --git a/src/tests/kits/net/service/CookieTest.h
b/src/tests/kits/net/service/CookieTest.h
index 1c2901259b..20421dd401 100644
--- a/src/tests/kits/net/service/CookieTest.h
+++ b/src/tests/kits/net/service/CookieTest.h
@@ -9,9 +9,14 @@
#include <TestCase.h>
#include <TestSuite.h>
-
-class BNetworkCookie;
-class BNetworkCookieJar;
+namespace BPrivate {
+ namespace Network {
+ class BNetworkCookie;
+ class BNetworkCookieJar;
+ }
+}
+using BPrivate::Network::BNetworkCookie;
+using BPrivate::Network::BNetworkCookieJar;
class BUrl;
diff --git a/src/tests/kits/net/service/DataTest.cpp
b/src/tests/kits/net/service/DataTest.cpp
index 5251e041d7..2df9e94fb2 100644
--- a/src/tests/kits/net/service/DataTest.cpp
+++ b/src/tests/kits/net/service/DataTest.cpp
@@ -13,6 +13,9 @@
#include <cppunit/TestCaller.h>
+using namespace BPrivate::Network;
+
+
// http://www-archive.mozilla.org/quality/networking/testing/datatests.html
diff --git a/src/tests/kits/net/service/DataTest.h
b/src/tests/kits/net/service/DataTest.h
index ae68d1eba1..65e53d04c3 100644
--- a/src/tests/kits/net/service/DataTest.h
+++ b/src/tests/kits/net/service/DataTest.h
@@ -17,6 +17,10 @@
#include <cppunit/TestSuite.h>
+using BPrivate::Network::BUrlProtocolListener;
+using BPrivate::Network::BUrlRequest;
+
+
class DataTest: public BTestCase, BUrlProtocolListener {
public:
DataTest();
diff --git a/src/tests/kits/net/service/FileTest.cpp
b/src/tests/kits/net/service/FileTest.cpp
index 71f68cedd4..12ee4d02c0 100644
--- a/src/tests/kits/net/service/FileTest.cpp
+++ b/src/tests/kits/net/service/FileTest.cpp
@@ -19,6 +19,9 @@
#include "TestServer.h"
+using namespace BPrivate::Network;
+
+
class StopTestListener : public BUrlProtocolListener {
public:
StopTestListener() {}
diff --git a/src/tests/kits/shared/GeolocationTest.cpp
b/src/tests/kits/net/service/GeolocationTest.cpp
similarity index 97%
rename from src/tests/kits/shared/GeolocationTest.cpp
rename to src/tests/kits/net/service/GeolocationTest.cpp
index 1f58bce955..d63301caee 100644
--- a/src/tests/kits/shared/GeolocationTest.cpp
+++ b/src/tests/kits/net/service/GeolocationTest.cpp
@@ -12,7 +12,7 @@
#include <cppunit/TestSuite.h>
-using namespace BPrivate;
+using namespace BPrivate::Network;
GeolocationTest::GeolocationTest()
diff --git a/src/tests/kits/shared/GeolocationTest.h
b/src/tests/kits/net/service/GeolocationTest.h
similarity index 100%
rename from src/tests/kits/shared/GeolocationTest.h
rename to src/tests/kits/net/service/GeolocationTest.h
diff --git a/src/tests/kits/net/service/HttpTest.cpp
b/src/tests/kits/net/service/HttpTest.cpp
index 81d2c2eae6..8ab2a73b91 100644
--- a/src/tests/kits/net/service/HttpTest.cpp
+++ b/src/tests/kits/net/service/HttpTest.cpp
@@ -27,6 +27,9 @@
#include "TestServer.h"
+using namespace BPrivate::Network;
+
+
namespace {
typedef std::map<std::string, std::string> HttpHeaderMap;
diff --git a/src/tests/kits/net/service/Jamfile
b/src/tests/kits/net/service/Jamfile
index defd5447a1..86ee3a9140 100644
--- a/src/tests/kits/net/service/Jamfile
+++ b/src/tests/kits/net/service/Jamfile
@@ -1,16 +1,18 @@
SubDir HAIKU_TOP src tests kits net service ;
-UsePrivateHeaders private shared ;
+UsePrivateHeaders netservices private shared ;
UnitTestLib servicekittest.so :
ServiceKitTestAddon.cpp
CookieTest.cpp
DataTest.cpp
+ GeolocationTest.cpp
HttpTest.cpp
UrlTest.cpp
FileTest.cpp
TestServer.cpp
- : be $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) [ TargetLibstdc++ ]
+ : be libnetservices.a shared $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB)
+ [ TargetLibstdc++ ]
;
diff --git a/src/tests/kits/net/service/ServiceKitTestAddon.cpp
b/src/tests/kits/net/service/ServiceKitTestAddon.cpp
index cce251b5ee..299d9bc048 100644
--- a/src/tests/kits/net/service/ServiceKitTestAddon.cpp
+++ b/src/tests/kits/net/service/ServiceKitTestAddon.cpp
@@ -9,6 +9,7 @@
#include "CookieTest.h"
#include "DataTest.h"
+#include "GeolocationTest.h"
#include "HttpTest.h"
#include "UrlTest.h"
#include "FileTest.h"
@@ -24,6 +25,7 @@ getTestSuite()
HttpTest::AddTests(*suite);
DataTest::AddTests(*suite);
FileTest::AddTests(*suite);
+ GeolocationTest::AddTests(*suite);
return suite;
}
diff --git a/src/tests/kits/shared/Jamfile b/src/tests/kits/shared/Jamfile
index 586962b113..e4658577dc 100644
--- a/src/tests/kits/shared/Jamfile
+++ b/src/tests/kits/shared/Jamfile
@@ -13,7 +13,6 @@ UnitTestLib libsharedtest.so :
JsonErrorHandlingTest.cpp
JsonTextWriterTest.cpp
JsonToMessageTest.cpp
- GeolocationTest.cpp
KeymapTest.cpp
LRUCacheTest.cpp
NaturalCompareTest.cpp
diff --git a/src/tests/kits/shared/SharedTestAddon.cpp
b/src/tests/kits/shared/SharedTestAddon.cpp
index b7f892a9cb..2bd70c0be9 100644
--- a/src/tests/kits/shared/SharedTestAddon.cpp
+++ b/src/tests/kits/shared/SharedTestAddon.cpp
@@ -10,7 +10,6 @@
#include "CalendarViewTest.h"
#include "DriverSettingsMessageAdapterTest.h"
-#include "GeolocationTest.h"
#include "NaturalCompareTest.h"
#include "JsonEndToEndTest.h"
#include "JsonErrorHandlingTest.h"
@@ -27,7 +26,6 @@ getTestSuite()
CalendarViewTest::AddTests(*suite);
DriverSettingsMessageAdapterTest::AddTests(*suite);
- GeolocationTest::AddTests(*suite);
NaturalCompareTest::AddTests(*suite);
JsonEndToEndTest::AddTests(*suite);
JsonErrorHandlingTest::AddTests(*suite);
