summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/Disco/UnitTest
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Disco/UnitTest')
-rw-r--r--Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp10
-rw-r--r--Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp4
-rw-r--r--Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp6
-rw-r--r--Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp4
4 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
index aec3a92..d4cb331 100644
--- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
@@ -30,9 +30,9 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
CapsInfoGenerator testling("http://code.google.com/p/exodus");
CapsInfo result = testling.generateCapsInfo(discoInfo);
- CPPUNIT_ASSERT_EQUAL(String("http://code.google.com/p/exodus"), result.getNode());
- CPPUNIT_ASSERT_EQUAL(String("sha-1"), result.getHash());
- CPPUNIT_ASSERT_EQUAL(String("QgayPKawpkPSDYmwT/WM94uAlu0="), result.getVersion());
+ CPPUNIT_ASSERT_EQUAL(std::string("http://code.google.com/p/exodus"), result.getNode());
+ CPPUNIT_ASSERT_EQUAL(std::string("sha-1"), result.getHash());
+ CPPUNIT_ASSERT_EQUAL(std::string("QgayPKawpkPSDYmwT/WM94uAlu0="), result.getVersion());
}
void testGenerate_XEP0115ComplexExample() {
@@ -48,7 +48,7 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
FormField::ref field = HiddenFormField::create("urn:xmpp:dataforms:softwareinfo");
field->setName("FORM_TYPE");
extension->addField(field);
- std::vector<String> ipVersions;
+ std::vector<std::string> ipVersions;
ipVersions.push_back("ipv6");
ipVersions.push_back("ipv4");
field = ListMultiFormField::create(ipVersions);
@@ -77,7 +77,7 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
CapsInfoGenerator testling("http://psi-im.org");
CapsInfo result = testling.generateCapsInfo(discoInfo);
- CPPUNIT_ASSERT_EQUAL(String("q07IKJEyjvHSyhy//CH0CxmKi8w="), result.getVersion());
+ CPPUNIT_ASSERT_EQUAL(std::string("q07IKJEyjvHSyhy//CH0CxmKi8w="), result.getVersion());
}
};
diff --git a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
index 988065f..bccf0d4 100644
--- a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
@@ -45,7 +45,7 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
CPPUNIT_ASSERT(payload);
- CPPUNIT_ASSERT_EQUAL(String(""), payload->getNode());
+ CPPUNIT_ASSERT_EQUAL(std::string(""), payload->getNode());
CPPUNIT_ASSERT(payload->hasFeature("foo"));
testling.stop();
@@ -68,7 +68,7 @@ class DiscoInfoResponderTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
CPPUNIT_ASSERT(payload);
- CPPUNIT_ASSERT_EQUAL(String("bar-node"), payload->getNode());
+ CPPUNIT_ASSERT_EQUAL(std::string("bar-node"), payload->getNode());
CPPUNIT_ASSERT(payload->hasFeature("bar"));
testling.stop();
diff --git a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
index 0a498cf..544bdad 100644
--- a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
@@ -159,15 +159,15 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
private:
struct DummyCapsProvider : public CapsProvider {
- virtual DiscoInfo::ref getCaps(const String& hash) const {
- std::map<String, DiscoInfo::ref>::const_iterator i = caps.find(hash);
+ virtual DiscoInfo::ref getCaps(const std::string& hash) const {
+ std::map<std::string, DiscoInfo::ref>::const_iterator i = caps.find(hash);
if (i != caps.end()) {
return i->second;
}
return DiscoInfo::ref();
}
- std::map<String, DiscoInfo::ref> caps;
+ std::map<std::string, DiscoInfo::ref> caps;
};
private:
diff --git a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
index 03a3ee8..ef61afa 100644
--- a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
@@ -46,7 +46,7 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
CPPUNIT_ASSERT(payload);
- CPPUNIT_ASSERT_EQUAL(String(""), payload->getNode());
+ CPPUNIT_ASSERT_EQUAL(std::string(""), payload->getNode());
CPPUNIT_ASSERT(payload->hasFeature("foo"));
testling.stop();
@@ -69,7 +69,7 @@ class JIDDiscoInfoResponderTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
CPPUNIT_ASSERT(payload);
- CPPUNIT_ASSERT_EQUAL(String("bar-node"), payload->getNode());
+ CPPUNIT_ASSERT_EQUAL(std::string("bar-node"), payload->getNode());
CPPUNIT_ASSERT(payload->hasFeature("bar"));
testling.stop();