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/StreamManagement
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/StreamManagement')
-rw-r--r--Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp28
-rw-r--r--Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp2
2 files changed, 15 insertions, 15 deletions
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
index e53b8c6..1028ae7 100644
--- a/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
+++ b/Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp
@@ -63,7 +63,7 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
testling->handleAckReceived(1);
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(ackedStanzas.size()));
- CPPUNIT_ASSERT_EQUAL(String("m1"), ackedStanzas[0]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m1"), ackedStanzas[0]->getID());
}
void testHandleAckReceived_AcksMultipleMessages() {
@@ -74,8 +74,8 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
testling->handleAckReceived(2);
CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(ackedStanzas.size()));
- CPPUNIT_ASSERT_EQUAL(String("m1"), ackedStanzas[0]->getID());
- CPPUNIT_ASSERT_EQUAL(String("m2"), ackedStanzas[1]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m1"), ackedStanzas[0]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m2"), ackedStanzas[1]->getID());
}
void testHandleAckReceived_AcksMultipleStanzas() {
@@ -87,9 +87,9 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
testling->handleAckReceived(3);
CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(ackedStanzas.size()));
- CPPUNIT_ASSERT_EQUAL(String("iq1"), ackedStanzas[0]->getID());
- CPPUNIT_ASSERT_EQUAL(String("p1"), ackedStanzas[1]->getID());
- CPPUNIT_ASSERT_EQUAL(String("m1"), ackedStanzas[2]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("iq1"), ackedStanzas[0]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("p1"), ackedStanzas[1]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m1"), ackedStanzas[2]->getID());
}
void testHandleAckReceived_MultipleAcks() {
@@ -102,9 +102,9 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
testling->handleAckReceived(3);
CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(ackedStanzas.size()));
- CPPUNIT_ASSERT_EQUAL(String("m1"), ackedStanzas[0]->getID());
- CPPUNIT_ASSERT_EQUAL(String("m2"), ackedStanzas[1]->getID());
- CPPUNIT_ASSERT_EQUAL(String("m3"), ackedStanzas[2]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m1"), ackedStanzas[0]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m2"), ackedStanzas[1]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m3"), ackedStanzas[2]->getID());
}
// Handle stanza ack count wrapping, as per the XEP
@@ -117,24 +117,24 @@ class StanzaAckRequesterTest : public CppUnit::TestFixture {
testling->handleAckReceived(1);
CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(ackedStanzas.size()));
- CPPUNIT_ASSERT_EQUAL(String("m1"), ackedStanzas[0]->getID());
- CPPUNIT_ASSERT_EQUAL(String("m2"), ackedStanzas[1]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m1"), ackedStanzas[0]->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("m2"), ackedStanzas[1]->getID());
}
private:
- Message::ref createMessage(const String& id) {
+ Message::ref createMessage(const std::string& id) {
Message::ref result(new Message());
result->setID(id);
return result;
}
- IQ::ref createIQ(const String& id) {
+ IQ::ref createIQ(const std::string& id) {
IQ::ref result(new IQ());
result->setID(id);
return result;
}
- Presence::ref createPresence(const String& id) {
+ Presence::ref createPresence(const std::string& id) {
Presence::ref result(new Presence());
result->setID(id);
return result;
diff --git a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
index fa2b782..b24335f 100644
--- a/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
+++ b/Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp
@@ -73,7 +73,7 @@ class StanzaAckResponderTest : public CppUnit::TestFixture {
}
private:
- Message::ref createMessage(const String& id) {
+ Message::ref createMessage(const std::string& id) {
Message::ref result(new Message());
result->setID(id);
return result;