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/Elements/UnitTest
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Elements/UnitTest')
-rw-r--r--Swiften/Elements/UnitTest/FormTest.cpp6
-rw-r--r--Swiften/Elements/UnitTest/IQTest.cpp6
-rw-r--r--Swiften/Elements/UnitTest/StanzaTest.cpp10
3 files changed, 11 insertions, 11 deletions
diff --git a/Swiften/Elements/UnitTest/FormTest.cpp b/Swiften/Elements/UnitTest/FormTest.cpp
index 715111b..de92d70 100644
--- a/Swiften/Elements/UnitTest/FormTest.cpp
+++ b/Swiften/Elements/UnitTest/FormTest.cpp
@@ -31,7 +31,7 @@ class FormTest : public CppUnit::TestFixture {
form.addField(FixedFormField::create("Bar"));
- CPPUNIT_ASSERT_EQUAL(String("jabber:bot"), form.getFormType());
+ CPPUNIT_ASSERT_EQUAL(std::string("jabber:bot"), form.getFormType());
}
void testGetFormType_InvalidFormType() {
@@ -41,7 +41,7 @@ class FormTest : public CppUnit::TestFixture {
field->setName("FORM_TYPE");
form.addField(field);
- CPPUNIT_ASSERT_EQUAL(String(""), form.getFormType());
+ CPPUNIT_ASSERT_EQUAL(std::string(""), form.getFormType());
}
void testGetFormType_NoFormType() {
@@ -49,7 +49,7 @@ class FormTest : public CppUnit::TestFixture {
form.addField(FixedFormField::create("Foo"));
- CPPUNIT_ASSERT_EQUAL(String(""), form.getFormType());
+ CPPUNIT_ASSERT_EQUAL(std::string(""), form.getFormType());
}
};
diff --git a/Swiften/Elements/UnitTest/IQTest.cpp b/Swiften/Elements/UnitTest/IQTest.cpp
index 532cec0..c170d61 100644
--- a/Swiften/Elements/UnitTest/IQTest.cpp
+++ b/Swiften/Elements/UnitTest/IQTest.cpp
@@ -29,7 +29,7 @@ class IQTest : public CppUnit::TestFixture
boost::shared_ptr<IQ> iq(IQ::createResult(JID("foo@bar/fum"), "myid", payload));
CPPUNIT_ASSERT_EQUAL(JID("foo@bar/fum"), iq->getTo());
- CPPUNIT_ASSERT_EQUAL(String("myid"), iq->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("myid"), iq->getID());
CPPUNIT_ASSERT(iq->getPayload<SoftwareVersion>());
CPPUNIT_ASSERT(payload == iq->getPayload<SoftwareVersion>());
}
@@ -38,7 +38,7 @@ class IQTest : public CppUnit::TestFixture
boost::shared_ptr<IQ> iq(IQ::createResult(JID("foo@bar/fum"), "myid"));
CPPUNIT_ASSERT_EQUAL(JID("foo@bar/fum"), iq->getTo());
- CPPUNIT_ASSERT_EQUAL(String("myid"), iq->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("myid"), iq->getID());
CPPUNIT_ASSERT(!iq->getPayload<SoftwareVersion>());
}
@@ -46,7 +46,7 @@ class IQTest : public CppUnit::TestFixture
boost::shared_ptr<IQ> iq(IQ::createError(JID("foo@bar/fum"), "myid", ErrorPayload::BadRequest, ErrorPayload::Modify));
CPPUNIT_ASSERT_EQUAL(JID("foo@bar/fum"), iq->getTo());
- CPPUNIT_ASSERT_EQUAL(String("myid"), iq->getID());
+ CPPUNIT_ASSERT_EQUAL(std::string("myid"), iq->getID());
boost::shared_ptr<ErrorPayload> error(iq->getPayload<ErrorPayload>());
CPPUNIT_ASSERT(error);
CPPUNIT_ASSERT_EQUAL(ErrorPayload::BadRequest, error->getCondition());
diff --git a/Swiften/Elements/UnitTest/StanzaTest.cpp b/Swiften/Elements/UnitTest/StanzaTest.cpp
index 27b0f09..4020f8b 100644
--- a/Swiften/Elements/UnitTest/StanzaTest.cpp
+++ b/Swiften/Elements/UnitTest/StanzaTest.cpp
@@ -43,9 +43,9 @@ class StanzaTest : public CppUnit::TestFixture
class MyPayload2 : public Payload {
public:
- MyPayload2(const String& s = "") : text_(s) {}
+ MyPayload2(const std::string& s = "") : text_(s) {}
- String text_;
+ std::string text_;
};
class MyPayload3 : public Payload {
@@ -143,7 +143,7 @@ class StanzaTest : public CppUnit::TestFixture
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), m.getPayloads().size());
boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
- CPPUNIT_ASSERT_EQUAL(String("bar"), p->text_);
+ CPPUNIT_ASSERT_EQUAL(std::string("bar"), p->text_);
}
void testUpdatePayload_NewPayload() {
@@ -155,7 +155,7 @@ class StanzaTest : public CppUnit::TestFixture
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), m.getPayloads().size());
boost::shared_ptr<MyPayload2> p(m.getPayload<MyPayload2>());
- CPPUNIT_ASSERT_EQUAL(String("bar"), p->text_);
+ CPPUNIT_ASSERT_EQUAL(std::string("bar"), p->text_);
}
void testGetPayloadOfSameType() {
@@ -166,7 +166,7 @@ class StanzaTest : public CppUnit::TestFixture
boost::shared_ptr<MyPayload2> payload(boost::dynamic_pointer_cast<MyPayload2>(m.getPayloadOfSameType(boost::shared_ptr<MyPayload2>(new MyPayload2("bar")))));
CPPUNIT_ASSERT(payload);
- CPPUNIT_ASSERT_EQUAL(String("foo"), payload->text_);
+ CPPUNIT_ASSERT_EQUAL(std::string("foo"), payload->text_);
}
void testGetPayloadOfSameType_NoSuchPayload() {