summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-10 07:22:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-10 07:22:55 (GMT)
commit3ec9ffd2d608b8570a8fd8afebd7aaca5445b013 (patch)
tree1c6d3e074cae96cec788a5e34eddc679a035bf8f
parenta8fd5486e8d98a2998ab3430770d9e9d691ff16f (diff)
downloadswift-contrib-swift-1.0beta7.zip
swift-contrib-swift-1.0beta7.tar.bz2
Added ClientTest to test suite.swift-1.0beta7
-rw-r--r--Swiften/QA/ClientTest/ClientTest.cpp2
-rw-r--r--Swiften/QA/ClientTest/SConscript4
-rw-r--r--Swiften/QA/SConscript2
3 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 872d6f2..7b2c7f4 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -38,7 +38,7 @@ void handleRosterReceived(boost::shared_ptr<Payload>) {
}
void handleConnected() {
- boost::shared_ptr<GetRosterRequest> rosterRequest(new GetRosterRequest(client));
+ GetRosterRequest::ref rosterRequest = GetRosterRequest::create(client->getIQRouter());
rosterRequest->onResponse.connect(boost::bind(&handleRosterReceived, _1));
rosterRequest->send();
}
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index f0c73ff..e85d8c8 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -16,7 +16,9 @@ if env["TEST"] :
myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
- if os.environ.get(i, "") :
+ if ARGUMENTS.get(i.lower(), False) :
+ myenv["ENV"][i] = ARGUMENTS[i.lower()]
+ elif os.environ.get(i, "") :
myenv["ENV"][i] = os.environ[i]
tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index 4a049e4..8fb7c24 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -1,7 +1,7 @@
SConscript(dirs = [
"NetworkTest",
# "ReconnectTest",
-# "ClientTest",
+ "ClientTest",
# "DNSSDTest",
"StorageTest",
])