libtransport.git Changeset - 7b118794ceaf

Changeset - 7b118794ceaf

Parent rev.

Child rev.

[Not reviewed]

0 4 1

Jan Kaluza - 13 years ago 2012-08-28 09:36:13
hanzz.k@gmail.com

Changelog, fixed compilation with boost 1.50 and filetransfer tests

5 files changed with 230 insertions and 2 deletions:

CMakeLists.txt

ChangeLog

backends/frotz/main.cpp

include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp

src/tests/filetransfermanager.cpp

202

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ find_package(Doxygen) @@
 INCLUDE(FindQt4)
 FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
 # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
 ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
 ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
+# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
 message("  Supported features")
 message("-----------------------")
 if (SPECTRUM_VERSION)
 	ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")

ChangeLog

➞

Show inline comments

@@ @@ -15,17 +15,34 @@ Version 2.0.0-beta3 (2012-XX-XX): @@
 	* Fixed allowed_servers option.
 	* Show error in server-mode when server port is already used.
 	* Fixed bug when backend could freeze on exit.
 	* Options from config file can now be set also using command line like
 	  --service.jid=domain.tld .
 	* Do not send password in IQ-get registration response.
 	* Added support for AdHoc commands.
 	* Do not store buddies with empty name in database.
 	* Improved MySQL storage backend performance.
 	* Do not handle error messages as normal ones.
 	* Added Munin script for Spectrum 2.
 	* Use utf-8 encoding as default for MySQL.
 	* Added a way to disable xhtml-im.
 	* Fix crash caused by two XMPP users using single PurpleAccount instance.
 	* Support for [registration] allowed_usernames.
 	* Fixed compilation with boost-1.50.
 	Spectrum2_manager:
 	* Rewritten to provide more features. Check the documentation.
 	Libpurple:
 	* prpl-gg: Fetch the contact list properly (#252).
 	* Added support for prpl-novell as it was in spectrum1.
 	Twitter:
 	* Added Twitter support using Twitter backend. Thanks to Sarang and
 	  Google Summer of Code.
 	Skype:
 	* Log more errors.
 	Libyahoo2:
 	* Added new Yahoo backend based on libyahoo2.

backends/frotz/main.cpp

➞

Show inline comments

@@ @@ -232,13 +232,17 @@ class FrotzNetworkPlugin : public NetworkPlugin { @@
 		std::vector<std::string> getGames() {
 			std::vector<std::string> games;
 			path p(".");
 			directory_iterator end_itr;
 			for (directory_iterator itr(p); itr != end_itr; ++itr) {
 				if (extension(itr->path()) == ".z5") {
 #if BOOST_FILESYSTEM_VERSION == 2
 					games.push_back(itr->path().leaf());
 #else
 					games.push_back(itr->path().filename().string());
 #endif
+				}
+			}
 			return games;
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") {

include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp

➞

Show inline comments

 void MyOutgoingSIFileTransfer::finish(boost::optional<FileTransferError> error) {
 	if (ibbSession) {
 		ibbSession->onFinished.disconnect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
 		ibbSession.reset();
+	}
 	socksServer->removeReadBytestream(id, from, to);
 	onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
 	if(error) {
 		onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
+	}
 	else {
 		onStateChange(FileTransfer::State(FileTransfer::State::Finished));
+	}
 	onFinished(error);
+}
 void MyOutgoingSIFileTransfer::handleIBBSessionFinished(boost::optional<FileTransferError> error) {
 	finish(error);
+}

src/tests/filetransfermanager.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include "transport/userregistry.h"
 #include "transport/userregistration.h"
 #include "transport/config.h"
 #include "transport/storagebackend.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/conversation.h"
 #include "transport/usermanager.h"
 #include "transport/localbuddy.h"
 #include "transport/settingsadhoccommand.h"
 #include "transport/filetransfermanager.h"
 #include "transport/adhocmanager.h"
 #include "transport/memoryreadbytestream.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "basictest.h"
 using namespace Transport;
 class FileTransferManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(FileTransferManagerTest);
 	CPPUNIT_TEST(sendFileNoMethod);
 	CPPUNIT_TEST(sendFileSIIBB);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		FileTransferManager *manager;
 		std::string data;
 		FileTransferManager::Transfer transfer;
 		bool dataNeeded;
 		Swift::FileTransfer::State::FTState ftState;
 		boost::shared_ptr<MemoryReadBytestream> bytestream;
 		void setUp (void) {
 			setMeUp();
 			dataNeeded = false;
 			data =  "This is our testing file\n";
 			manager = new FileTransferManager(component, userManager);
 			connectUser();
 			add2Buddies();
 			received.clear();
+		}
 		void tearDown (void) {
 			received.clear();
 			delete manager;
 			disconnectUser();
 			tearMeDown();
+		}
 	void connectUser() {
 		CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());
 		userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password"));
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount());
 		User *user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);
 		UserInfo userInfo = user->getUserInfo();
 		CPPUNIT_ASSERT_EQUAL(std::string("password"), userInfo.password);
 		CPPUNIT_ASSERT(user->isReadyToConnect() == true);
 		CPPUNIT_ASSERT(user->isConnected() == false);
 		user->setConnected(true);
 		CPPUNIT_ASSERT(user->isConnected() == true);
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
 		received.clear();
+	}
 	void disconnectUser() {
 		userManager->disconnectUser("user@localhost");
 		dynamic_cast<Swift::DummyTimerFactory *>(factories->getTimerFactory())->setTime(10);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received[0])));
+	}
 	void add2Buddies() {
 		User *user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);
 		std::vector<std::string> grp;
 		grp.push_back("group1");
 		LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING);
 		buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1");
 		user->getRosterManager()->setBuddy(buddy);
 		std::vector<std::string> grp2;
 		grp2.push_back("group2");
 		buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy2", "Buddy 2", grp2, BUDDY_JID_ESCAPING);
 		buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2");
 		user->getRosterManager()->setBuddy(buddy);
+	}
 	void handleFTDataNeeded() {
 		dataNeeded = true;
 // 		std::cout << "data needed\n";
+	}
 	void handleFTStateChanged(Swift::FileTransfer::State state) {
 // 		std::cout << "state changed " << state.state << "\n";
 		ftState = state.state;
+	}
 	void _sendFile() {
 		User *user = userManager->getUser("user@localhost");
 		Swift::StreamInitiationFileInfo fileInfo;
 		fileInfo.setSize(data.size());
 		fileInfo.setName("test.pdf");
 		bytestream = boost::shared_ptr<MemoryReadBytestream>(new MemoryReadBytestream(data.size()));
 		bytestream->onDataNeeded.connect(boost::bind(&FileTransferManagerTest::handleFTDataNeeded, this));
 		transfer = manager->sendFile(user, user->getRosterManager()->getBuddy("buddy1"), bytestream, fileInfo);
+	}
 	void sendFileNoMethod() {
 		_sendFile();
 		CPPUNIT_ASSERT(!transfer.ft);
+	}
 	void sendFileSIIBB() {
 		User *user = userManager->getUser("user@localhost");
 		boost::shared_ptr<Swift::DiscoInfo> info(new Swift::DiscoInfo());
 		info->addFeature("http://jabber.org/protocol/si/profile/file-transfer");
 		user->handleDiscoInfo("user@localhost/resource", info);
 		// Send file request
 		_sendFile();
 		CPPUNIT_ASSERT(transfer.ft);
 		transfer.ft->onStateChange.connect(boost::bind(&FileTransferManagerTest::handleFTStateChanged, this, _1));
 		transfer.ft->start();
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Set, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::StreamInitiation>());
 		CPPUNIT_ASSERT_EQUAL(std::string("test.pdf"), dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getPayload<Swift::StreamInitiation>()->getFileInfo()->getName());
 		CPPUNIT_ASSERT_EQUAL((int) data.size(), (int) dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getPayload<Swift::StreamInitiation>()->getFileInfo()->getSize());
 		// request acceptation
 		Swift::IQ::ref accept = Swift::IQ::createResult(getStanza(received[0])->getFrom(), getStanza(received[0])->getTo(), getStanza(received[0])->getID());
 		Swift::StreamInitiation::ref payload(new Swift::StreamInitiation());
 		payload->setRequestedMethod("http://jabber.org/protocol/ibb");
 		accept->addPayload(payload);
 		injectIQ(accept);
 		loop->processEvents();
 		received.erase(received.begin());
 		// handle open packet and accept the FT
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Set, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::IBB>());
 		CPPUNIT_ASSERT_EQUAL(Swift::IBB::Open, getStanza(received[0])->getPayload<Swift::IBB>()->getAction());
 		injectIQ(Swift::IQ::createResult(getStanza(received[0])->getFrom(), getStanza(received[0])->getTo(), getStanza(received[0])->getID()));
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(true, dataNeeded);
 		CPPUNIT_ASSERT_EQUAL(Swift::FileTransfer::State::Transferring, ftState);
 		bytestream->appendData(data); // this will be send in one packet...
 		loop->processEvents();
 		received.erase(received.begin());
 		// we received data now
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(Swift::IQ::Set, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::IBB>());
 		CPPUNIT_ASSERT_EQUAL(Swift::IBB::Data, getStanza(received[0])->getPayload<Swift::IBB>()->getAction());
 		injectIQ(Swift::IQ::createResult(getStanza(received[0])->getFrom(), getStanza(received[0])->getTo(), getStanza(received[0])->getID()));
 		loop->processEvents();
 		received.erase(received.begin());
 // 		dumpReceived();
 		// TODO: Check that we receive Swift::IBB:Close stanza. This is not done right now because of Swiften bug...
+	}
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (FileTransferManagerTest);

0 comments (0 inline, 0 general)