2 files changed, 24 insertions, 9 deletions
diff --git a/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp b/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
index fd8f6fc..280e46e 100644
--- a/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentHandshakeGeneratorTest.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -9,4 +9,6 @@
 
 #include <Swiften/Component/ComponentHandshakeGenerator.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
@@ -19,14 +21,20 @@ class ComponentHandshakeGeneratorTest : public CppUnit::TestFixture {
 
 	public:
+		void setUp() {
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
+		}
+
 		void testGetHandshake() {
-			std::string result = ComponentHandshakeGenerator::getHandshake("myid", "mysecret");
+			std::string result = ComponentHandshakeGenerator::getHandshake("myid", "mysecret", crypto.get());
 			CPPUNIT_ASSERT_EQUAL(std::string("4011cd31f9b99ac089a0cd7ce297da7323fa2525"), result);
 		}
 
 		void testGetHandshake_SpecialChars() {
-			std::string result = ComponentHandshakeGenerator::getHandshake("&<", ">'\"");
+			std::string result = ComponentHandshakeGenerator::getHandshake("&<", ">'\"", crypto.get());
 			CPPUNIT_ASSERT_EQUAL(std::string("33631b3e0aaeb2a11c4994c917919324028873fe"), result);
 		}
 
+	private:
+		boost::shared_ptr<CryptoProvider> crypto;
 };
 
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index da9ca7d..79d9ab3 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -15,4 +15,6 @@
 #include <Swiften/Elements/ComponentHandshake.h>
 #include <Swiften/Elements/AuthFailure.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
 
 using namespace Swift;
@@ -29,4 +31,5 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 			server = boost::make_shared<MockSessionStream>();
 			sessionFinishedReceived = false;
+			crypto = boost::shared_ptr<CryptoProvider>(PlatformCryptoProvider::create());
 		}
 
@@ -71,5 +74,5 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 	private:
 		boost::shared_ptr<ComponentSession> createSession() {
-			boost::shared_ptr<ComponentSession> session = ComponentSession::create(JID("service.foo.com"), "servicesecret", server);
+			boost::shared_ptr<ComponentSession> session = ComponentSession::create(JID("service.foo.com"), "servicesecret", server, crypto.get());
 			session->onFinished.connect(boost::bind(&ComponentSessionTest::handleSessionFinished, this, _1));
 			return session;
@@ -84,9 +87,9 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 			public:
 				struct Event {
-					Event(boost::shared_ptr<Element> element) : element(element), footer(false) {}
+					Event(boost::shared_ptr<ToplevelElement> element) : element(element), footer(false) {}
 					Event(const ProtocolHeader& header) : header(header), footer(false) {}
 					Event() : footer(true) {}
 					
-					boost::shared_ptr<Element> element;
+					boost::shared_ptr<ToplevelElement> element;
 					boost::optional<ProtocolHeader> header;
 					bool footer;
@@ -112,5 +115,5 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 				}
 
-				virtual void writeElement(boost::shared_ptr<Element> element) {
+				virtual void writeElement(boost::shared_ptr<ToplevelElement> element) {
 					receivedEvents.push_back(Event(element));
 				}
@@ -139,4 +142,8 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 				}
 
+				virtual std::vector<Certificate::ref> getPeerCertificateChain() const {
+					 return std::vector<Certificate::ref>();
+				}
+
 				virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const {
 					return boost::shared_ptr<CertificateVerificationError>();
@@ -207,6 +214,6 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 		boost::shared_ptr<MockSessionStream> server;
 		bool sessionFinishedReceived;
-		bool needCredentials;
 		boost::shared_ptr<Error> sessionFinishedError;
+		boost::shared_ptr<CryptoProvider> crypto;
 };