Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:40:14 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:40:43 (GMT) |
| commit | b61486fefe602e0d18fa5279021006f87b965307 (patch) | |
| tree | 437585cbef1179e1ec31f79789591d5610200c29 /Swiften/Disco | |
| parent | dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8 (diff) | |
| download | swift-b61486fefe602e0d18fa5279021006f87b965307.zip swift-b61486fefe602e0d18fa5279021006f87b965307.tar.bz2 | |
Moved Swiften to a separate module.
Diffstat (limited to 'Swiften/Disco')
| m--------- | Swiften | 0 | ||||
| -rw-r--r-- | Swiften/Disco/CapsInfoGenerator.cpp | 34 | ||||
| -rw-r--r-- | Swiften/Disco/CapsInfoGenerator.h | 21 | ||||
| -rw-r--r-- | Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp | 35 |
4 files changed, 0 insertions, 90 deletions
diff --git a/Swiften b/Swiften new file mode 160000 +Subproject 8213ba16d0043d2461f4b031c881d61dda5a38c diff --git a/Swiften/Disco/CapsInfoGenerator.cpp b/Swiften/Disco/CapsInfoGenerator.cpp deleted file mode 100644 index 8d9e407..0000000 --- a/Swiften/Disco/CapsInfoGenerator.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "Swiften/Disco/CapsInfoGenerator.h" - -#include <algorithm> - -#include "Swiften/Base/foreach.h" -#include "Swiften/Elements/DiscoInfo.h" -#include "Swiften/StringCodecs/SHA1.h" -#include "Swiften/StringCodecs/Base64.h" - -namespace Swift { - -CapsInfoGenerator::CapsInfoGenerator(const String& node) : node_(node) { -} - -CapsInfo CapsInfoGenerator::generateCapsInfo(const DiscoInfo& discoInfo) const { - String serializedCaps; - - std::vector<DiscoInfo::Identity> identities(discoInfo.getIdentities()); - std::sort(identities.begin(), identities.end()); - foreach (const DiscoInfo::Identity& identity, identities) { - serializedCaps += identity.getCategory() + "/" + identity.getType() + "/" + identity.getLanguage() + "/" + identity.getName() + "<"; - } - - std::vector<String> features(discoInfo.getFeatures()); - std::sort(features.begin(), features.end()); - foreach (const String& feature, features) { - serializedCaps += feature + "<"; - } - - String version(Base64::encode(SHA1::getHash(serializedCaps))); - return CapsInfo(node_, version, "sha-1"); -} - -} diff --git a/Swiften/Disco/CapsInfoGenerator.h b/Swiften/Disco/CapsInfoGenerator.h deleted file mode 100644 index 66949ab..0000000 --- a/Swiften/Disco/CapsInfoGenerator.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef SWIFTEN_CapsInfoGenerator_H -#define SWIFTEN_CapsInfoGenerator_H - -#include "Swiften/Base/String.h" -#include "Swiften/Elements/CapsInfo.h" - -namespace Swift { - class DiscoInfo; - - class CapsInfoGenerator { - public: - CapsInfoGenerator(const String& node); - - CapsInfo generateCapsInfo(const DiscoInfo& discoInfo) const; - - private: - String node_; - }; -} - -#endif diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp deleted file mode 100644 index 94b9913..0000000 --- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/extensions/TestFactoryRegistry.h> - -#include "Swiften/Elements/DiscoInfo.h" -#include "Swiften/Disco/CapsInfoGenerator.h" - -using namespace Swift; - -class CapsInfoGeneratorTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(CapsInfoGeneratorTest); - CPPUNIT_TEST(testGenerate_XEP0115SimpleExample); - CPPUNIT_TEST_SUITE_END(); - - public: - CapsInfoGeneratorTest() {} - - void testGenerate_XEP0115SimpleExample() { - DiscoInfo discoInfo; - discoInfo.addIdentity(DiscoInfo::Identity("Exodus 0.9.1", "client", "pc")); - discoInfo.addFeature("http://jabber.org/protocol/disco#items"); - discoInfo.addFeature("http://jabber.org/protocol/caps"); - discoInfo.addFeature("http://jabber.org/protocol/disco#info"); - discoInfo.addFeature("http://jabber.org/protocol/muc"); - - 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_TEST_SUITE_REGISTRATION(CapsInfoGeneratorTest); |