libtransport.git Changeset - 20d8dd690e21

Changeset - 20d8dd690e21

Parent rev.

Child rev.

[Not reviewed]

! ! !

Vitaly Takmazov - 10 years ago 2015-10-15 14:41:16
vitalyster@gmail.com

fix tests (TODO filetransfer)

12 files changed with 46 insertions and 173 deletions:

CMakeLists.txt

backends/twitter/libtwitcurl/twitcurl.sln

cmake_modules/SwiftenConfig.cmake

include/Swiften/Network/DummyConnectionServer.cpp

include/Swiften/Network/DummyConnectionServer.h

include/Swiften/Network/DummyNetworkFactories.cpp

include/Swiften/Network/DummyNetworkFactories.h

include/transport/networkplugin.h

src/tests/basictest.cpp

src/tests/basictest.h

src/tests/filetransfermanager.cpp

151

src/tests/settingsadhoccommand.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -253,16 +253,6 @@ if(ENABLE_TESTS) @@
 	endif()
 endif()
 if (APPLE)
         FIND_LIBRARY(IOKIT_FRAMEWORK IOKit)
         FIND_LIBRARY(SECURITY_FRAMEWORK Security)
         FIND_LIBRARY(APPKIT_FRAMEWORK AppKit)
         FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration)
         FIND_LIBRARY(SECURITYINTERFACE_FRAMEWORK SecurityInterface)
         MARK_AS_ADVANCED(IOKIT_FRAMEWORK APPKIT_FRAMEWORK SYSTEMCONFIGURATION_FRAMEWORK SECURITY_FRAMEWORK SECURITYINTERFACE_FRAMEWORK)
         SET (APPLE_FRAMEWORKS ${IOKIT_FRAMEWORK} ${APPKIT_FRAMEWORK} ${SYSTEMCONFIGURATION_FRAMEWORK} ${SECURITY_FRAMEWORK} ${SECURITYINTERFACE_FRAMEWORK})
 endif()
 message("  Supported features")
 message("-----------------------")

backends/twitter/libtwitcurl/twitcurl.sln

➞

Show inline comments

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twitcurl", "twitcurl.vcproj", "{00175D8C-EA44-48AE-AC59-B3B7BE04E65C}"

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

@@ @@ -10,8 +10,15 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) @@
 			OUTPUT_VARIABLE SWIFTEN_LIB)
 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIB ${SWIFTEN_LIB})
 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIB ${SWIFTEN_LIB})
 		string(REGEX REPLACE " " ";" SWIFTEN_LIB ${SWIFTEN_LIB})
 		set(SWIFTEN_LIBRARY "")
 		if (APPLE)
 			string(REGEX MATCHALL "-framework [A-Za-z]+" APPLE_FRAMEWORKS ${SWIFTEN_LIB})
 			foreach(framework ${APPLE_FRAMEWORKS})
 				list(APPEND SWIFTEN_LIBRARY ${framework} )
 			endforeach(framework)
 			string(REGEX REPLACE "-framework [A-Za-z]+" "" SWIFTEN_LIB ${SWIFTEN_LIB})
 		endif(APPLE)
 		string(REGEX REPLACE " " ";" SWIFTEN_LIB ${SWIFTEN_LIB})
 		foreach(f ${SWIFTEN_LIB})
 			STRING(SUBSTRING ${f} 0 2 f_out)
 			STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH)

include/Swiften/Network/DummyConnectionServer.cpp

➞

Show inline comments

@@ @@ -25,7 +25,7 @@ void DummyConnectionServer::stop() { @@
+}
 void DummyConnectionServer::acceptConnection(boost::shared_ptr<Connection> connection) {
+void DummyConnectionServer::acceptConnection(boost::shared_ptr<Swift::Connection> connection) {
 		eventLoop->postEvent(
 				boost::bind(boost::ref(onNewConnection), connection),
 				shared_from_this());

include/Swiften/Network/DummyConnectionServer.h

➞

Show inline comments

@@ @@ -30,7 +30,11 @@ namespace Swift { @@
 				return ref(new DummyConnectionServer(eventLoop));
+			}
 			void acceptConnection(boost::shared_ptr<Connection> connection);
 			void acceptConnection(boost::shared_ptr<Swift::Connection> connection);
 			virtual boost::optional<Swift::ConnectionServer::Error> tryStart() {
 				return boost::optional<Swift::ConnectionServer::Error>();
+			}
 			virtual void start();
 			virtual void stop();

include/Swiften/Network/DummyNetworkFactories.cpp

➞

Show inline comments

@@ @@ -9,6 +9,12 @@ @@
 #include <Swiften/Network/DummyConnectionFactory.h>
 #include <Swiften/Network/PlatformDomainNameResolver.h>
 #include <Swiften/Network/DummyConnectionServerFactory.h>
 #if HAVE_SWIFTEN_3
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/Network/NetworkEnvironment.h>
 #include <Swiften/Network/PlatformNetworkEnvironment.h>
 #endif
 namespace Swift {
 #if HAVE_SWIFTEN_3
 	idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
 	domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
 	cryptoProvider = PlatformCryptoProvider::create();
 	networkEnvironment = new PlatformNetworkEnvironment();
 #else
 	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
 #endif

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -36,6 +36,13 @@ namespace Swift { @@
 			IDNConverter* getIDNConverter() const {
 				return idnConverter.get();
+			}
 			Swift::CryptoProvider* getCryptoProvider() const {
 		        	return cryptoProvider;
+			}
 			Swift::NetworkEnvironment* getNetworkEnvironment() const {
 				return networkEnvironment;
+			}
 #endif
 			DomainNameResolver* getDomainNameResolver() const {
@@ @@ -65,13 +72,14 @@ namespace Swift { @@
             Swift::ProxyProvider* getProxyProvider() const {
                 return 0;
+            }
 		private:
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 #if HAVE_SWIFTEN_3
 			boost::shared_ptr<IDNConverter> idnConverter;
 			CryptoProvider* cryptoProvider;
 			NetworkEnvironment* networkEnvironment;
 #endif
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -21,6 +21,7 @@ @@
 #pragma once
 #include <time.h>
 #undef TYPE_BOOL
 #include "transport/protocol.pb.h"
 // #include "conversation.h"
 #include <iostream>

src/tests/basictest.cpp

➞

Show inline comments

@@ @@ -150,8 +150,11 @@ void BasicTest::dumpReceived() { @@
 	std::cout << "Stream2:\n";
 	std::cout << receivedData2 << "\n";
+}
 #if HAVE_SWIFTEN_3
 void BasicTest::handleElement(boost::shared_ptr<Swift::ToplevelElement> element) {
 #else
 void BasicTest::handleElement(boost::shared_ptr<Swift::Element> element) {
 #endif
 	if (stream1_active) {
 		received.push_back(element);
+	}

src/tests/basictest.h

➞

Show inline comments

@@ @@ -45,6 +45,7 @@ @@
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
 using namespace Transport;
@@ @@ -217,9 +218,11 @@ class BasicTest : public Swift::XMPPParserClient { @@
 	void handleDataReceived2(const Swift::SafeByteArray &data);
 	void handleStreamStart(const Swift::ProtocolHeader&);
 #if HAVE_SWIFTEN_3
 	void handleElement(boost::shared_ptr<Swift::ToplevelElement> element);
 #else
 	void handleElement(boost::shared_ptr<Swift::Element> element);
+#endif
 	void handleStreamEnd();
 	void injectPresence(boost::shared_ptr<Swift::Presence> &response);

src/tests/filetransfermanager.cpp

➞

Show inline comments

deleted file

src/tests/settingsadhoccommand.cpp

➞

Show inline comments

 			// set enabled_transport = 0
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("enable_transport");
-			boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->setValue(false);
+			f->setBoolValue(false);
 			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
 			// set enabled_transport = 0
 			f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("enable_transport");
-			CPPUNIT_ASSERT_EQUAL(false, boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->getValue());
+			CPPUNIT_ASSERT_EQUAL(false, f->getBoolValue());
+		}
 		void executeTwoCommands() {
 			// set enabled_transport = 0
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("send_headlines");
-			boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->setValue(true);
+			f->setBoolValue(true);
 			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm()->getField("send_headlines"));
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("send_headlines");
-			CPPUNIT_ASSERT_EQUAL(true, boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->getValue());
+			CPPUNIT_ASSERT_EQUAL(true, f->getBoolValue());
+		}
 };

0 comments (0 inline, 0 general)