libtransport.git Changeset - 8ef948c25f19

Changeset - 8ef948c25f19

Parent rev.

Child rev.

[Not reviewed]

! ! !

Jan Kaluza - 10 years ago 2015-12-24 10:08:19
jkaluza@redhat.com

Move libtransport form ./src to ./libtransport. Move all tests to ./tests directory and add 'make test' target.

80 files changed with 453 insertions and 38 deletions:

.travis.yml

CMakeLists.txt

cmake_modules/eventConfig.cmake

libtransport/AdminInterface.cpp

rename

libtransport/Buddy.cpp

rename

libtransport/CMakeLists.txt

libtransport/Config.cpp

rename

libtransport/Conversation.cpp

rename

libtransport/ConversationManager.cpp

rename

libtransport/FileTransferManager.cpp

rename

libtransport/HTTPRequest.cpp

rename

libtransport/HTTPRequestQueue.cpp

rename

libtransport/LocalBuddy.cpp

rename

libtransport/Logging.cpp

rename

libtransport/MemoryReadByteStream.cpp

rename

libtransport/MemoryUsage.cpp

rename

libtransport/MySQLBackend.cpp

rename

libtransport/NetworkPluginServer.cpp

rename

libtransport/OAuth2.cpp

rename

libtransport/PQXXBackend.cpp

rename

libtransport/PresenceOracle.cpp

rename

libtransport/RosterManager.cpp

rename

libtransport/RosterStorage.cpp

rename

libtransport/SQLite3Backend.cpp

rename

libtransport/StorageBackend.cpp

rename

libtransport/ThreadPool.cpp

rename

libtransport/Transport.cpp

rename

libtransport/User.cpp

rename

libtransport/UserManager.cpp

rename

libtransport/UserRegistration.cpp

rename

libtransport/UserRegistry.cpp

rename

libtransport/UsersReconnecter.cpp

rename

libtransport/Util.cpp

rename

libtransport/WebSocketClient.cpp

rename

libtransport/transport.pc.in

rename

plugin/cpp/CMakeLists.txt

spectrum_manager/src/CMakeLists.txt

tests/CMakeLists.txt

tests/libcommuni/irc_test.cfg

tests/libcommuni/irc_test2.cfg

tests/libcommuni/muc_change_topic.py

rename

tests/libcommuni/muc_echo.py

rename

tests/libcommuni/muc_join_leave.py

rename

tests/libcommuni/muc_pm.py

rename

tests/libcommuni/muc_whois.py

rename

tests/libcommuni/ngircd.conf

rename

tests/libpurple_jabber/jabber_test.cfg

tests/libpurple_jabber/manager.conf

tests/libpurple_jabber/muc_echo.py

tests/libpurple_jabber/muc_join_leave.py

tests/libpurple_jabber/muc_pm.py

tests/libpurple_jabber/prosody.cfg.lua

rename

tests/libtransport/CMakeLists.txt

tests/libtransport/basictest.cpp

rename

tests/libtransport/basictest.h

rename

tests/libtransport/component.cpp

rename

tests/libtransport/config.cpp

rename

tests/libtransport/conversationmanager.cpp

rename

tests/libtransport/discoitemsresponder.cpp

rename

tests/libtransport/gatewayresponder.cpp

rename

tests/libtransport/localbuddy.cpp

rename

tests/libtransport/main.cpp

rename

tests/libtransport/main.h

rename

tests/libtransport/networkpluginserver.cpp

rename

tests/libtransport/rostermanager.cpp

rename

tests/libtransport/rosterresponder.cpp

rename

tests/libtransport/settingsadhoccommand.cpp

rename

tests/libtransport/stringtreeparser.cpp

rename

tests/libtransport/user.cpp

rename

tests/libtransport/usermanager.cpp

rename

tests/libtransport/userregistration.cpp

rename

tests/libtransport/userregistry.cpp

rename

tests/libtransport/util.cpp

rename

tests/slack_jabber/jabber_slack_test.cfg

tests/slack_jabber/muc_echo.py

tests/slack_jabber/prosody.cfg.lua

167

tests/slack_jabber/slack.sql

rename

tests/start.py

tests/tests_output/localhost/accounts/client.dat

rename

tests/tests_output/localhost/accounts/responder.dat

rename

0 comments (0 inline, 0 general)

.travis.yml

➞

Show inline comments

 language: cpp
 python:
   - "2.7_with_system_site_packages"
 virtualenv:
   system_site_packages: true
 sudo: required
 dist: trusty
 before_script:
           - curl -k https://swift.im/keys/packages.key | sudo apt-key add -
           - echo "deb http://swift.im/packages/ubuntu/trusty development main" | sudo tee -a /etc/apt/sources.list
           - echo "deb http://packages.spectrum.im/spectrum2/ trusty main" | sudo tee -a /etc/apt/sources.list
           - echo " deb http://packages.prosody.im/debian trusty main" | sudo tee -a /etc/apt/sources.list
           - sudo apt-get update -qq
           - sudo apt-get install -y --force-yes prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler pidgin-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev
           - sudo killall lua5.1
 install: "pip install --user sleekxmpp"
 script:
-          - cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON . && make && ./src/libtransport_test && cd ./spectrum/src/tests && python -V && python start.py
+          - cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON . && make && make test
 notifications:
   slack: spectrum2:CIlYHtxGMAaxs3qVHfwBzCuy

CMakeLists.txt

➞

Show inline comments

@@ @@ -410,90 +410,91 @@ if (LOG4CXX_FOUND) @@
 	include_directories(${LOG4CXX_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DWITH_LOG4CXX)
 else()
 	set(LOG4CXX_LIBRARIES "")
 	if (WIN32)
 		message("Log4cxx           : no (install log4cxx-devel)")
 	else()
 		message(FATAL_ERROR "Log4cxx           : no (install log4cxx-devel)")
 	endif()
 endif()
 if (WIN32)
 	ADD_DEFINITIONS(-DLOG4CXX_STATIC)
 	ADD_DEFINITIONS(-D_WIN32_WINNT=0x501)
 	ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
 	ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H)
 	ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 endif()
 # We cannot use boost:signals2, because Swiften does not use them,
 # for now, just ignore the deprecation warning.
 ADD_DEFINITIONS(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	if (CMAKE_COMPILER_IS_GNUCXX)
 		ADD_DEFINITIONS(-O0)
 		ADD_DEFINITIONS(-ggdb)
 	endif()
 	ADD_DEFINITIONS(-DDEBUG)
 	message("Debug             : yes")
 else(CMAKE_BUILD_TYPE MATCHES Debug)
 	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
 SET(TRANSPORT_VERSION 2.0)
 SET(PROJECT_VERSION 2.0)
 include_directories(include)
 include_directories(${EVENT_INCLUDE_DIRS})
 include_directories(${SWIFTEN_INCLUDE_DIR})
 include_directories(${Boost_INCLUDE_DIRS})
 if (CMAKE_COMPILER_IS_GNUCXX)
 include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
-ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(libtransport)
 ADD_SUBDIRECTORY(plugin)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(spectrum)
 ADD_SUBDIRECTORY(backends)
 ADD_SUBDIRECTORY(tests)
 if (NOT WIN32)
 	ADD_SUBDIRECTORY(spectrum_manager)
 #	ADD_SUBDIRECTORY(spectrum2_send_message)
 endif()
 if (CPPUNIT_FOUND)
 	message("tests             : yes")
 	include_directories(${CPPUNIT_INCLUDE_DIR})
 else()
 	if(ENABLE_TESTS)
 		message("tests             : no (install CPPUnit)")
 	else(ENABLE_TESTS)
 		message("tests             : no (user disabled)")
 	endif()
 endif()
 if(DOXYGEN_FOUND)
 	message("Docs              : yes")
 	ADD_SUBDIRECTORY(docs)
 else(DOXYGEN_FOUND)
 	if(ENABLE_DOCS)
 		message("Docs              : no (install doxygen)")
 	else(ENABLE_DOCS)
 		message("Docs              : no (user disabled)")
 	endif()
 endif(DOXYGEN_FOUND)
 message("----------------------")
 if(NOT SQLITE3_FOUND AND NOT MYSQL_FOUND AND NOT PQXX_FOUND)
 	if(ENABLE_SQLITE3 OR ENABLE_MYSQL OR ENABLE_PQXX)
 		message("Could not find any database - Please install at least one of sqlite3-devel, mysql-devel or pqxx-devel if you want to use transport mode.")
 	else(ENABLE_SQLITE3 OR ENABLE_MYSQL OR ENABLE_PQXX)
 		message("Please enable at least one of SQLITE3, MYSQL, PQXX databases to use transport mode.")
 	endif()
 endif()

cmake_modules/eventConfig.cmake

➞

Show inline comments

 FIND_PATH(EVENT_INCLUDE_DIRS event.h ev.h PATH_SUFFIXES libev)
 SET(EVENT_NAMES ${EVENT_NAMES} ev libev)
 FIND_LIBRARY(EVENT_LIBRARIES NAMES ${EVENT_NAMES} PATH)
 IF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET(HAVE_EVENT TRUE)
-file(APPEND src/transport_config.h "#define WITH_LIBEVENT 1\n")
+file(APPEND libtransport/transport_config.h "#define WITH_LIBEVENT 1\n")
 ELSE(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 SET (EVENT_INCLUDE_DIRS "")
 SET (EVENT_LIBRARIES "")
 ENDIF(EVENT_INCLUDE_DIRS AND EVENT_LIBRARIES)
 IF(HAVE_EVENT)
 MESSAGE(STATUS "Found Event: ${EVENT_LIBRARIES} ${EVENT_INCLUDE_DIRS}")
 ENDIF(HAVE_EVENT)

libtransport/AdminInterface.cpp

➞

Show inline comments

file renamed from src/AdminInterface.cpp to libtransport/AdminInterface.cpp

libtransport/Buddy.cpp

➞

Show inline comments

file renamed from src/Buddy.cpp to libtransport/Buddy.cpp

libtransport/CMakeLists.txt

➞

Show inline comments

@@ file renamed from src/CMakeLists.txt to libtransport/CMakeLists.txt @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
 # Build without openssl on msvc
 if (NOT MSVC)
 if (APPLE)
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 else()
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 else()
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 FILE(GLOB HEADERS ../include/transport/*.h)
 include_directories(../spectrum/src/frontends/xmpp/)
 if (CPPUNIT_FOUND)
 	FILE(GLOB SRC_TEST tests/*.cpp)
 	FILE(GLOB SRC_TEST_FRONTEND ../spectrum/src/frontends/xmpp/*.cpp)
 	ADD_EXECUTABLE(libtransport_test ${SRC_TEST} ${SRC_TEST_FRONTEND})
 	set_target_properties(libtransport_test PROPERTIES COMPILE_DEFINITIONS LIBTRANSPORT_TEST=1)
 	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARY} ${Boost_LIBRARIES})
 endif()
 if (NOT WIN32)
 include_directories(${POPT_INCLUDE_DIR})
 endif()
 # SOURCE_GROUP(headers FILES ${HEADERS})
 if (PROTOBUF_FOUND)
 	if (NOT WIN32)
 		ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 	else()
 		ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 	endif()
 #	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 	ADD_DEPENDENCIES(transport pb)
 else(PROTOBUF_FOUND)
 	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
 endif(PROTOBUF_FOUND)
 # if (CMAKE_COMPILER_IS_GNUCXX)
 	if (NOT WIN32)
 		ADD_DEFINITIONS(-fPIC)
 	endif()
 # endif()
 find_package(CURL)
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
 else()
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
 if (APPLE)
 	TARGET_LINK_LIBRARIES(transport ${APPLE_FRAMEWORKS})
 endif()
 INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
 #CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
 #INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

libtransport/Config.cpp

➞

Show inline comments

file renamed from src/Config.cpp to libtransport/Config.cpp

libtransport/Conversation.cpp

➞

Show inline comments

file renamed from src/Conversation.cpp to libtransport/Conversation.cpp

libtransport/ConversationManager.cpp

➞

Show inline comments

file renamed from src/ConversationManager.cpp to libtransport/ConversationManager.cpp

libtransport/FileTransferManager.cpp

➞

Show inline comments

file renamed from src/FileTransferManager.cpp to libtransport/FileTransferManager.cpp

libtransport/HTTPRequest.cpp

➞

Show inline comments

file renamed from src/HTTPRequest.cpp to libtransport/HTTPRequest.cpp

libtransport/HTTPRequestQueue.cpp

➞

Show inline comments

file renamed from src/HTTPRequestQueue.cpp to libtransport/HTTPRequestQueue.cpp

libtransport/LocalBuddy.cpp

➞

Show inline comments

file renamed from src/LocalBuddy.cpp to libtransport/LocalBuddy.cpp

libtransport/Logging.cpp

➞

Show inline comments

file renamed from src/Logging.cpp to libtransport/Logging.cpp

libtransport/MemoryReadByteStream.cpp

➞

Show inline comments

file renamed from src/MemoryReadByteStream.cpp to libtransport/MemoryReadByteStream.cpp

libtransport/MemoryUsage.cpp

➞

Show inline comments

file renamed from src/MemoryUsage.cpp to libtransport/MemoryUsage.cpp

libtransport/MySQLBackend.cpp

➞

Show inline comments

file renamed from src/MySQLBackend.cpp to libtransport/MySQLBackend.cpp

libtransport/NetworkPluginServer.cpp

➞

Show inline comments

file renamed from src/NetworkPluginServer.cpp to libtransport/NetworkPluginServer.cpp

libtransport/OAuth2.cpp

➞

Show inline comments

file renamed from src/OAuth2.cpp to libtransport/OAuth2.cpp

libtransport/PQXXBackend.cpp

➞

Show inline comments

file renamed from src/PQXXBackend.cpp to libtransport/PQXXBackend.cpp

libtransport/PresenceOracle.cpp

➞

Show inline comments

file renamed from src/PresenceOracle.cpp to libtransport/PresenceOracle.cpp

libtransport/RosterManager.cpp

➞

Show inline comments

file renamed from src/RosterManager.cpp to libtransport/RosterManager.cpp

libtransport/RosterStorage.cpp

➞

Show inline comments

file renamed from src/RosterStorage.cpp to libtransport/RosterStorage.cpp

libtransport/SQLite3Backend.cpp

➞

Show inline comments

file renamed from src/SQLite3Backend.cpp to libtransport/SQLite3Backend.cpp

libtransport/StorageBackend.cpp

➞

Show inline comments

file renamed from src/StorageBackend.cpp to libtransport/StorageBackend.cpp

libtransport/ThreadPool.cpp

➞

Show inline comments

file renamed from src/ThreadPool.cpp to libtransport/ThreadPool.cpp

libtransport/Transport.cpp

➞

Show inline comments

file renamed from src/Transport.cpp to libtransport/Transport.cpp

libtransport/User.cpp

➞

Show inline comments

file renamed from src/User.cpp to libtransport/User.cpp

libtransport/UserManager.cpp

➞

Show inline comments

file renamed from src/UserManager.cpp to libtransport/UserManager.cpp

libtransport/UserRegistration.cpp

➞

Show inline comments

file renamed from src/UserRegistration.cpp to libtransport/UserRegistration.cpp

libtransport/UserRegistry.cpp

➞

Show inline comments

file renamed from src/UserRegistry.cpp to libtransport/UserRegistry.cpp

libtransport/UsersReconnecter.cpp

➞

Show inline comments

file renamed from src/UsersReconnecter.cpp to libtransport/UsersReconnecter.cpp

libtransport/Util.cpp

➞

Show inline comments

file renamed from src/Util.cpp to libtransport/Util.cpp

libtransport/WebSocketClient.cpp

➞

Show inline comments

file renamed from src/WebSocketClient.cpp to libtransport/WebSocketClient.cpp

libtransport/transport.pc.in

➞

Show inline comments

file renamed from src/transport.pc.in to libtransport/transport.pc.in

plugin/cpp/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../include/transport/*.h)
 set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/MemoryUsage.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Logging.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Config.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Util.cpp)
 set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/MemoryUsage.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/Logging.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/Config.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../libtransport/Util.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
 if (NOT WIN32)
 	ADD_LIBRARY(transport-plugin SHARED ${HEADERS} ${SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS} ${EXTRA_SOURCES})
 else()
 	ADD_LIBRARY(transport-plugin STATIC ${HEADERS} ${SRC} ${EXTRA_SOURCES} )
 endif()
 ADD_DEPENDENCIES(transport-plugin pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 if (CMAKE_COMPILER_IS_GNUCXX)
 	if (NOT WIN32)
 	ADD_DEFINITIONS(-fPIC)
 	endif()
 endif()
 if (NOT WIN32)
 	TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES})
 else()
 	TARGET_LINK_LIBRARIES(transport-plugin ${PROTOBUF_LIBRARY} ${LOG4CXX_LIBRARIES} ${Boost_LIBRARIES} ws2_32.lib)
 endif()
 SET_TARGET_PROPERTIES(transport-plugin PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
 INSTALL(TARGETS transport-plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)
 #CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc")
 #INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/transport.pc" DESTINATION lib/pkgconfig)

spectrum_manager/src/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.c)
-ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/Config.cpp ../../src/Util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
+ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../libtransport/Config.cpp ../../libtransport/Util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
 ADD_DEPENDENCIES(spectrum2_manager pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 target_link_libraries(spectrum2_manager ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES})
 if(APPLE)
 target_link_libraries(spectrum2_manager ${APPLE_FRAMEWORKS})
 endif()
 INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
 INSTALL(FILES
 	spectrum_manager.cfg
 	DESTINATION /etc/spectrum2
+	)

tests/CMakeLists.txt

➞

Show inline comments

		new file 100644
		ADD_SUBDIRECTORY(libtransport)


		add_custom_target(test ${CMAKE_CURRENT_BINARY_DIR}/libtransport/libtransport_test COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/start.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output)

tests/libcommuni/irc_test.cfg

➞

Show inline comments

 [service]
 jid = localhost
 password = secret
 server = 127.0.0.1
 port = 5223
 server_mode = 1
 backend_host=127.0.0.1
 pidfile=./test.pid
 # < this option doesn't work yet
 #backend_port=10001
 #admin_jid=admin@localhost
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
 #backend=../../../backends/twitter/spectrum2_twitter_backend
-backend=../../../backends/libcommuni/spectrum2_libcommuni_backend
 backend=../../backends/libcommuni/spectrum2_libcommuni_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=./$jid.port
 irc_server=localhost
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 type=sqlite3 # or "none" without database backend
 database=users.sqlite
 prefix=twitter
 #type = mysql # or "none" without database backend.......................................................................................................................
 #database = test
 #prefix=
 #user=root
 #password=yourrootsqlpassword
 #encryption_key=hanzzik

tests/libcommuni/irc_test2.cfg

➞

Show inline comments

 [service]
 jid = localhost
 password = secret
 server = 127.0.0.1
 port = 5223
 server_mode = 1
 backend_host=127.0.0.1
 pidfile=./test.pid
 # < this option doesn't work yet
 #backend_port=10001
 #admin_jid=admin@localhost
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
 #backend=../../../backends/twitter/spectrum2_twitter_backend
-backend=../../../backends/libcommuni/spectrum2_libcommuni_backend
 backend=../../backends/libcommuni/spectrum2_libcommuni_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=./$jid.port
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 type=sqlite3 # or "none" without database backend
 database=users.sqlite
 prefix=twitter
 #type = mysql # or "none" without database backend.......................................................................................................................
 #database = test
 #prefix=
 #user=root
 #password=yourrootsqlpassword
 #encryption_key=hanzzik

tests/libcommuni/muc_change_topic.py

➞

Show inline comments

file renamed from spectrum/src/tests/muc_change_topic.py to tests/libcommuni/muc_change_topic.py

tests/libcommuni/muc_echo.py

➞

Show inline comments

file renamed from spectrum/src/tests/muc_echo.py to tests/libcommuni/muc_echo.py

tests/libcommuni/muc_join_leave.py

➞

Show inline comments

file renamed from spectrum/src/tests/muc_join_leave.py to tests/libcommuni/muc_join_leave.py

tests/libcommuni/muc_pm.py

➞

Show inline comments

file renamed from spectrum/src/tests/muc_pm.py to tests/libcommuni/muc_pm.py

tests/libcommuni/muc_whois.py

➞

Show inline comments

file renamed from spectrum/src/tests/muc_whois.py to tests/libcommuni/muc_whois.py

tests/libcommuni/ngircd.conf

➞

Show inline comments

file renamed from spectrum/src/tests/ngircd.conf to tests/libcommuni/ngircd.conf

tests/libpurple_jabber/jabber_test.cfg

➞

Show inline comments

 [service]
 jid = localhostxmpp
 password = secret
 server = 0.0.0.0
 port = 5223
 server_mode = 1
 backend_host=127.0.0.1
 pidfile=./test.pid
 # < this option doesn't work yet
 #backend_port=10001
 admin_jid=admin
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
 #backend=../../../backends/twitter/spectrum2_twitter_backend
-backend=../../../backends/libpurple/spectrum2_libpurple_backend
 backend=../../backends/libpurple/spectrum2_libpurple_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=./$jid.port
 irc_server=localhost
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 type=sqlite3 # or "none" without database backend
 database=users.sqlite
 prefix=twitter
 #type = mysql # or "none" without database backend.......................................................................................................................
 #database = test
 #prefix=
 #user=root
 #password=yourrootsqlpassword
 #encryption_key=hanzzik

tests/libpurple_jabber/manager.conf

➞

Show inline comments

 [service]
 admin_username=admin
 admin_password=test
 config_directory=./
+config_directory=../libpurple_jabber/
 [servers]
 server=localhostxmpp
 #server=icq.spectrum.im
 #server=msn.spectrum.im
@@ \ No newline at end of file @@

tests/libpurple_jabber/muc_echo.py

➞

Show inline comments

@@ new file 100644 @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.room_password = room_password
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("groupchat_message", self.muc_message)
 		self.tests = {}
 	def muc_message(self, msg):
 		if msg['mucnick'] != self.nick:
 			self.send_message(mto=msg['from'].bare,
 							mbody="echo %s" % msg['body'],
 							mtype='groupchat')
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("groupchat_message", self.muc_message)
 		self.finished = False
 		self.tests = {}
 		self.tests["echo_received"] = ["libcommuni: Send and receive messages", False]
 	def muc_message(self, msg):
 		if msg['mucnick'] != self.nick:
 			if msg['body'] == "echo abc" or msg['body'] == "<owner> echo abc":
 				self.tests["echo_received"][1] = True
 				self.finished = True
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
 		self.send_message(mto=self.room, mbody="abc", mtype='groupchat')

tests/libpurple_jabber/muc_join_leave.py

➞

Show inline comments

@@ new file 100644 @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.room_password = room_password
 		self.nick = nick
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
 		self.add_event_handler("muc::" + room + "::got_offline", self.muc_got_offline)
 		self.tests = {}
 		self.tests["online_received"] = ["libcommuni: Received available presence", False]
 		self.tests["offline_received"] = ["libcommuni: Received unavailable presence", False]
 	def muc_got_online(self, presence):
 		if presence['muc']['nick'] == "client":
 			self.tests["online_received"][1] = True
 	def muc_got_offline(self, presence):
 		if presence['muc']['nick'] == "client":
 			self.tests["offline_received"][1] = True
 			self.finished = True
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.finished = False
 		self.tests = {}
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
 		self.plugin['xep_0045'].leaveMUC(self.room, self.nick)

tests/libpurple_jabber/muc_pm.py

➞

Show inline comments

@@ new file 100644 @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.room_password = room_password
 		self.nick = nick
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.tests = {}
 	def message(self, msg):
 		if msg['body'] == "abc" and msg['from'] == self.room + "/client":
 			self.send_message(mto=self.room + "/client",
 							mbody="echo %s" % msg['body'],
 							mtype='chat')
 		elif msg['body'] == "def" and msg['from'] == self.room + "/client":
 			self.send_message(mto=self.room + "/client",
 							mbody="echo %s" % msg['body'],
 							mtype='chat')
 		else:
 			self.finished = True
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.finished = False
 		self.tests = {}
 		self.tests["echo1_received"] = ["libcommuni: Send and receive private messages - 1st msg", False]
 		self.tests["echo2_received"] = ["libcommuni: Send and receive private messages - 2nd msg", False]
 	def message(self, msg):
 		if msg['body'] == "echo abc" and msg['from'] == self.room + "/responder":
 			self.tests["echo1_received"][1] = True
 			self.send_message(mto=self.room + "/responder", mbody="def", mtype='chat')
 		elif msg['body'] == "echo def" and msg['from'] == self.room + "/responder":
 			self.tests["echo2_received"][1] = True
 			self.finished = True
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
 		self.send_message(mto=self.room + "/responder", mbody="abc", mtype='chat')

tests/libpurple_jabber/prosody.cfg.lua

➞

Show inline comments

file renamed from spectrum/src/tests/prosody.cfg.lua to tests/libpurple_jabber/prosody.cfg.lua

tests/libtransport/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
 # Build without openssl on msvc
 if (NOT MSVC)
 if (APPLE)
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 else()
 	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 else()
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
 FILE(GLOB HEADERS ../../include/transport/*.h)
 include_directories(../../spectrum/src/frontends/xmpp/)
 if (CPPUNIT_FOUND)
 	FILE(GLOB SRC_TEST *.cpp)
 	FILE(GLOB SRC_TEST_FRONTEND ../../spectrum/src/frontends/xmpp/*.cpp)
 	ADD_EXECUTABLE(libtransport_test ${SRC_TEST} ${SRC_TEST_FRONTEND})
 	set_target_properties(libtransport_test PROPERTIES COMPILE_DEFINITIONS LIBTRANSPORT_TEST=1)
 	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARY} ${Boost_LIBRARIES})
 endif()

tests/libtransport/basictest.cpp

➞

Show inline comments

file renamed from src/tests/basictest.cpp to tests/libtransport/basictest.cpp

tests/libtransport/basictest.h

➞

Show inline comments

file renamed from src/tests/basictest.h to tests/libtransport/basictest.h

tests/libtransport/component.cpp

➞

Show inline comments

file renamed from src/tests/component.cpp to tests/libtransport/component.cpp

tests/libtransport/config.cpp

➞

Show inline comments

file renamed from src/tests/config.cpp to tests/libtransport/config.cpp

tests/libtransport/conversationmanager.cpp

➞

Show inline comments

file renamed from src/tests/conversationmanager.cpp to tests/libtransport/conversationmanager.cpp

tests/libtransport/discoitemsresponder.cpp

➞

Show inline comments

file renamed from src/tests/discoitemsresponder.cpp to tests/libtransport/discoitemsresponder.cpp

tests/libtransport/gatewayresponder.cpp

➞

Show inline comments

file renamed from src/tests/gatewayresponder.cpp to tests/libtransport/gatewayresponder.cpp

tests/libtransport/localbuddy.cpp

➞

Show inline comments

file renamed from src/tests/localbuddy.cpp to tests/libtransport/localbuddy.cpp

tests/libtransport/main.cpp

➞

Show inline comments

file renamed from src/tests/main.cpp to tests/libtransport/main.cpp

tests/libtransport/main.h

➞

Show inline comments

file renamed from src/tests/main.h to tests/libtransport/main.h

tests/libtransport/networkpluginserver.cpp

➞

Show inline comments

file renamed from src/tests/networkpluginserver.cpp to tests/libtransport/networkpluginserver.cpp

tests/libtransport/rostermanager.cpp

➞

Show inline comments

file renamed from src/tests/rostermanager.cpp to tests/libtransport/rostermanager.cpp

tests/libtransport/rosterresponder.cpp

➞

Show inline comments

file renamed from src/tests/rosterresponder.cpp to tests/libtransport/rosterresponder.cpp

tests/libtransport/settingsadhoccommand.cpp

➞

Show inline comments

file renamed from src/tests/settingsadhoccommand.cpp to tests/libtransport/settingsadhoccommand.cpp

tests/libtransport/stringtreeparser.cpp

➞

Show inline comments

file renamed from src/tests/stringtreeparser.cpp to tests/libtransport/stringtreeparser.cpp

tests/libtransport/user.cpp

➞

Show inline comments

file renamed from src/tests/user.cpp to tests/libtransport/user.cpp

tests/libtransport/usermanager.cpp

➞

Show inline comments

file renamed from src/tests/usermanager.cpp to tests/libtransport/usermanager.cpp

tests/libtransport/userregistration.cpp

➞

Show inline comments

file renamed from src/tests/userregistration.cpp to tests/libtransport/userregistration.cpp

tests/libtransport/userregistry.cpp

➞

Show inline comments

file renamed from src/tests/userregistry.cpp to tests/libtransport/userregistry.cpp

tests/libtransport/util.cpp

➞

Show inline comments

file renamed from src/tests/util.cpp to tests/libtransport/util.cpp

tests/slack_jabber/jabber_slack_test.cfg

➞

Show inline comments

 [service]
 frontend=slack
 jid = localhostxmpp
 password = secret
 server = 0.0.0.0
 port = 5223
 server_mode = 0
 backend_host=127.0.0.1
 pidfile=./test.pid
 # < this option doesn't work yet
 #backend_port=10001
 admin_jid=admin
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
 #backend=../../../backends/twitter/spectrum2_twitter_backend
-backend=../../../backends/libpurple/spectrum2_libpurple_backend
 backend=../../backends/libpurple/spectrum2_libpurple_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=./$jid.port
 irc_server=localhost
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=/home/hanzz/code/libtransport/spectrum/src/backend-logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 type=sqlite3 # or "none" without database backend
 database=users.sqlite
 #prefix=twitter
 #type = mysql # or "none" without database backend.......................................................................................................................
 #database = test
 #prefix=
 #user=root
 #password=yourrootsqlpassword
 #encryption_key=hanzzik

tests/slack_jabber/muc_echo.py

➞

Show inline comments

@@ new file 100644 @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.room_password = room_password
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("groupchat_message", self.muc_message)
 		self.tests = {}
 	def muc_message(self, msg):
 		if msg['mucnick'] != self.nick:
 			self.send_message(mto=msg['from'].bare,
 							mbody="echo %s" % msg['body'],
 							mtype='groupchat')
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("groupchat_message", self.muc_message)
 		self.finished = False
 		self.tests = {}
 		self.tests["echo_received"] = ["libcommuni: Send and receive messages", False]
 	def muc_message(self, msg):
 		if msg['mucnick'] != self.nick:
 			if msg['body'] == "echo abc" or msg['body'] == "<owner> echo abc":
 				self.tests["echo_received"][1] = True
 				self.finished = True
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
 		self.send_message(mto=self.room, mbody="abc", mtype='groupchat')

tests/slack_jabber/prosody.cfg.lua

➞

Show inline comments

@@ new file 100644 @@
 -- Prosody Example Configuration File
 --
 -- Information on configuring Prosody can be found on our
 -- website at http://prosody.im/doc/configure
 --
 -- Tip: You can check that the syntax of this file is correct
 -- when you have finished by running: luac -p prosody.cfg.lua
 -- If there are any errors, it will let you know what and where
 -- they are, otherwise it will keep quiet.
 --
 -- The only thing left to do is rename this file to remove the .dist ending, and fill in the
 -- blanks. Good luck, and happy Jabbering!
 ---------- Server-wide settings ----------
 -- Settings in this section apply to the whole server and are the default settings
 -- for any virtual hosts
 -- This is a (by default, empty) list of accounts that are admins
 -- for the server. Note that you must create the accounts separately
 -- (see http://prosody.im/doc/creating_accounts for info)
 -- Example: admins = { "user1@example.com", "user2@example.net" }
 admins = { }
 data_path="."
 -- Enable use of libevent for better performance under high load
 -- For more information see: http://prosody.im/doc/libevent
 --use_libevent = true;
 -- This is the list of modules Prosody will load on startup.
 -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 	-- Generally required
 		"roster"; -- Allow users to have a roster. Recommended ;)
 		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
 -- 		"tls"; -- Add support for secure TLS on c2s/s2s connections
 		"dialback"; -- s2s dialback support
 		"disco"; -- Service discovery
 		"muc";
 	-- Not essential, but recommended
 		"private"; -- Private XML storage (for room bookmarks, etc.)
 		"vcard"; -- Allow users to set vCards
 	-- These are commented by default as they have a performance impact
 		--"privacy"; -- Support privacy lists
 		--"compression"; -- Stream compression (Note: Requires installed lua-zlib RPM package)
 	-- Nice to have
 		"version"; -- Replies to server version requests
 		"uptime"; -- Report how long server has been running
 		"time"; -- Let others know the time here on this server
 		"ping"; -- Replies to XMPP pings with pongs
 		"pep"; -- Enables users to publish their mood, activity, playing music and more
 		"register"; -- Allow users to register on this server using a client and change passwords
 	-- Admin interfaces
 		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 	-- HTTP modules
 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
 		--"http_files"; -- Serve static files from a directory over HTTP
 	-- Other specific functionality
 -- 		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 		--"groups"; -- Shared roster support
 		--"announce"; -- Send announcement to all online users
 		--"welcome"; -- Welcome users who register accounts
 		--"watchregistrations"; -- Alert admins of registrations
 		--"motd"; -- Send a message to users when they log in
 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 };
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
 	-- "offline"; -- Store offline messages
 	-- "c2s"; -- Handle client connections
 	-- "s2s"; -- Handle server-to-server connections
 };
 -- Disable account creation by default, for security
 -- For more information see http://prosody.im/doc/creating_accounts
 allow_registration = true
 -- These are the SSL/TLS-related settings. If you don't want
 -- to use SSL/TLS, you may comment or remove this
 -- ssl = {
 -- 	key = "/etc/pki/prosody/localhost.key";
 -- 	certificate = "/etc/pki/prosody/localhost.crt";
 -- }
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 c2s_require_encryption = false
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate
 -- with to support encryption AND present valid, trusted certificates.
 -- NOTE: Your version of LuaSec must support certificate verification!
 -- For more information see http://prosody.im/doc/s2s#security
 s2s_secure_auth = false
 -- Many servers don't support encryption or have invalid or self-signed
 -- certificates. You can list domains here that will not be required to
 -- authenticate using certificates. They will be authenticated using DNS.
 --s2s_insecure_domains = { "gmail.com" }
 -- Even if you leave s2s_secure_auth disabled, you can still require valid
 -- certificates for some domains by specifying a list here.
 --s2s_secure_domains = { "jabber.org" }
 -- Select the authentication backend to use. The 'internal' providers
 -- use Prosody's configured data storage to store the authentication data.
 -- To allow Prosody to offer secure authentication mechanisms to clients, the
 -- default provider stores passwords in plaintext. If you do not trust your
 -- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
 -- for information about using the hashed backend.
 authentication = "internal_plain"
 -- Select the storage backend to use. By default Prosody uses flat files
 -- in its configured data directory, but it also supports more backends
 -- through modules. An "sql" backend is included by default, but requires
 -- additional dependencies. See http://prosody.im/doc/storage for more info.
 --storage = "sql" -- Default is "internal" (Note: "sql" requires installed
 -- lua-dbi RPM package)
 -- For the "sql" backend, you can uncomment *one* of the below to configure:
 -- sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
 --sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
 --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 -- log = {
 	-- Log everything of level "info" and higher (that is, all except "debug" messages)
 	-- to /var/log/prosody/prosody.log and errors also to /var/log/prosody/prosody.err
 -- 	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
 -- 	error = "/var/log/prosody/prosody.err"; -- Log errors also to file
 	-- error = "*syslog"; -- Log errors also to syslog
 	-- log = "*console"; -- Log to the console, useful for debugging with daemonize=false
 -- }
 log = "*console"
 -- POSIX configuration, see also http://prosody.im/doc/modules/mod_posix
 -- pidfile = "/run/prosody/prosody.pid";
 daemonize = false -- Default is "true"
 ------ Additional config files ------
 -- For organizational purposes you may prefer to add VirtualHost and
 -- Component definitions in their own config files. This line includes
 -- all config files in /etc/prosody/conf.d/
 VirtualHost "localhost"
 --Component "gateway.localhost"
 --	component_secret = "secret"
 Component "conference.localhost" "muc"

tests/slack_jabber/slack.sql

➞

Show inline comments

file renamed from spectrum/src/tests/slack.sql to tests/slack_jabber/slack.sql

tests/start.py

➞

Show inline comments

@@ file renamed from spectrum/src/tests/start.py to tests/start.py @@
 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 import imp
 def registerXMPPAccount(user, password):
 	responder = sleekxmpp.ClientXMPP(user, password)
 	responder.register_plugin('xep_0030')  # Service Discovery
 	responder.register_plugin('xep_0077')
 	responder['feature_mechanisms'].unencrypted_plain = True
 	if responder.connect(("127.0.0.1", 5222)):
 		responder.process(block=False)
 	else:
 		print "connect() failed"
 		sys.exit(1)
 class BaseTest:
 	def __init__(self, config, server_mode, room):
 		self.config = config
 		self.server_mode = server_mode
 		self.room = room
 		self.responder_jid = "responder@localhost"
 		self.client_jid = "client@localhost"
 		self.responder_password = "password"
 		self.client_password = "password"
 		self.client_room = room
 		self.responder_room = room
 		self.client_nick = "client"
 		self.responder_nick = "responder"
 		self.responder_roompassword = ""
 	def skip_test(self, test):
 		return False
 	def start(self, Client, Responder):
 		os.system("../spectrum2 -n ./" + self.config + " > spectrum2.log &")
+		os.system("../../spectrum/src/spectrum2 -n ./" + self.config + " > spectrum2.log &")
 		self.pre_test()
 		time.sleep(1)
 		responder = Responder(self.responder_jid, self.responder_password, self.responder_room, self.responder_roompassword, self.responder_nick)
 		responder.register_plugin('xep_0030')  # Service Discovery
 		responder.register_plugin('xep_0045')  # Multi-User Chat
 		responder.register_plugin('xep_0199')  # XMPP Ping
 		responder['feature_mechanisms'].unencrypted_plain = True
 		to = ("127.0.0.1", 5223)
 		if self.responder_password != "password":
 			to = ()
 		if responder.connect(to):
 			responder.process(block=False)
 		else:
 			print "connect() failed"
 			os.system("killall spectrum2")
 			self.post_test()
 			sys.exit(1)
 		client = Client(self.client_jid, self.client_password, self.client_room, self.client_nick)
 		client.register_plugin('xep_0030')  # Service Discovery
 		client.register_plugin('xep_0045')  # Multi-User Chat
 		client.register_plugin('xep_0199')  # XMPP Ping
 		client['feature_mechanisms'].unencrypted_plain = True
 		time.sleep(2)
 		to = ("127.0.0.1", 5223)
 		if self.responder_password != "password":
 			to = ("127.0.0.1", 5222)
 		if client.connect(to):
 			client.process(block=False)
 		else:
 			print "connect() failed"
 			os.system("killall spectrum2")
 			self.post_test()
 			sys.exit(1)
 		max_time = 60
 		while not client.finished and not responder.finished and max_time > 0:
 			time.sleep(1)
 			max_time -= 1
 		client.disconnect()
 		responder.disconnect()
 		os.system("killall spectrum2")
 		self.post_test()
 		ret = True
 		tests = []
 		tests += client.tests.values()
 		tests += responder.tests.values()
 		for v in tests:
 			if v[1]:
 				print v[0] + ": PASSED"
 			else:
 				print v[0] + ": FAILED"
 				ret = False
 		if not ret:
 			os.system("cat spectrum2.log")
 		return ret
 class LibcommuniServerModeSingleServerConf(BaseTest):
 	def __init__(self):
 		BaseTest.__init__(self, "irc_test.cfg", True, "#channel@localhost")
 		BaseTest.__init__(self, "../libcommuni/irc_test.cfg", True, "#channel@localhost")
 		self.directory = "../libcommuni/"
 	def pre_test(self):
 		os.system("ngircd -f ngircd.conf &")
+		os.system("ngircd -f ../libcommuni/ngircd.conf &")
 	def post_test(self):
 		os.system("killall ngircd 2>/dev/null")
 		os.system("killall spectrum2_libcommuni_backend 2>/dev/null")
 class LibcommuniServerModeConf(BaseTest):
 	def __init__(self):
 		BaseTest.__init__(self, "irc_test2.cfg", True, "#channel%localhost@localhost")
 		BaseTest.__init__(self, "../libcommuni/irc_test2.cfg", True, "#channel%localhost@localhost")
 		self.directory = "../libcommuni/"
 	def pre_test(self):
 		os.system("ngircd -f ngircd.conf &")
+		os.system("ngircd -f ../libcommuni/ngircd.conf &")
 	def post_test(self):
 		os.system("killall ngircd 2>/dev/null")
 		os.system("killall spectrum2_libcommuni_backend 2>/dev/null")
 class JabberServerModeConf(BaseTest):
 	def __init__(self):
 		BaseTest.__init__(self, "jabber_test.cfg", True, "room%conference.localhost@localhostxmpp")
 		BaseTest.__init__(self, "../libpurple_jabber/jabber_test.cfg", True, "room%conference.localhost@localhostxmpp")
 		self.directory = "../libpurple_jabber/"
 		self.client_jid = "client%localhost@localhostxmpp"
 		self.responder_jid = "responder%localhost@localhostxmpp"
 	def skip_test(self, test):
 		if test in ["muc_whois.py", "muc_change_topic.py"]:
 			return True
 		return False
 	def pre_test(self):
 		os.system("prosody --config prosody.cfg.lua >prosody.log &")
+		os.system("prosody --config ../libpurple_jabber/prosody.cfg.lua >prosody.log &")
 		time.sleep(3)
 		os.system("../../../spectrum_manager/src/spectrum2_manager -c manager.conf localhostxmpp register client%localhost@localhostxmpp client@localhost password 2>/dev/null >/dev/null")
 		os.system("../../../spectrum_manager/src/spectrum2_manager -c manager.conf localhostxmpp register responder%localhost@localhostxmpp responder@localhost password 2>/dev/null >/dev/null")
 		os.system("../../spectrum_manager/src/spectrum2_manager -c ../libpurple_jabber/manager.conf localhostxmpp register client%localhost@localhostxmpp client@localhost password 2>/dev/null >/dev/null")
 		os.system("../../spectrum_manager/src/spectrum2_manager -c ../libpurple_jabber/manager.conf localhostxmpp register responder%localhost@localhostxmpp responder@localhost password 2>/dev/null >/dev/null")
 	def post_test(self):
 		os.system("killall lua-5.1 2>/dev/null")
 		os.system("killall spectrum2_libpurple_backend 2>/dev/null")
 class JabberSlackServerModeConf(BaseTest):
 	def __init__(self):
 		BaseTest.__init__(self, "jabber_slack_test.cfg", True, "room%conference.localhost@localhostxmpp")
 		BaseTest.__init__(self, "../slack_jabber/jabber_slack_test.cfg", True, "room%conference.localhost@localhostxmpp")
 		self.directory = "../slack_jabber/"
 		self.client_jid = "client@localhost"
 		self.client_room = "room@conference.localhost"
 		self.responder_jid = "owner@spectrum2tests.xmpp.slack.com"
 		self.responder_password = "spectrum2tests.rkWHkOrjYucxsmBVkA9K"
 		self.responder_room = "spectrum2_room@conference.spectrum2tests.xmpp.slack.com"
 		self.responder_nick = "owner"
 		self.responder_roompassword = "spectrum2tests.rkWHkOrjYucxsmBVkA9K"
 	def skip_test(self, test):
 		os.system("cp slack.sql users.sqlite")
+		os.system("cp ../slack_jabber/slack.sql users.sqlite")
 		if test in ["muc_whois.py", "muc_change_topic.py", "muc_join_leave.py", "muc_pm.py"]:
 			return True
 		return False
 	def pre_test(self):
 		os.system("prosody --config prosody.cfg.lua > prosody.log &")
+		os.system("prosody --config ../slack_jabber/prosody.cfg.lua > prosody.log &")
 		#time.sleep(3)
 		#os.system("../../../spectrum_manager/src/spectrum2_manager -c manager.conf localhostxmpp set_oauth2_code xoxb-17213576196-VV2K8kEwwrJhJFfs5YWv6La6 use_bot_token 2>/dev/null >/dev/null")
 	def post_test(self):
 		os.system("killall lua-5.1 2>/dev/null")
 		os.system("killall spectrum2_libpurple_backend 2>/dev/null")
 configurations = []
 configurations.append(LibcommuniServerModeSingleServerConf())
 configurations.append(LibcommuniServerModeConf())
 configurations.append(JabberServerModeConf())
 configurations.append(JabberSlackServerModeConf())
 exitcode = 0
 for conf in configurations:
-	for f in os.listdir("."):
+	for f in os.listdir(conf.directory):
 		if not f.endswith(".py") or f == "start.py":
 			continue
 		if len(sys.argv) == 2 and sys.argv[1] != f:
 			continue
 		print conf.__class__.__name__ + ": Starting " + f + " test ..."
-		test = imp.load_source('test', './' + f)
+		test = imp.load_source('test', conf.directory + f)
 		if conf.skip_test(f):
 			print "Skipped."
 			continue
 		#try:
 		ret = conf.start(test.Client, test.Responder)
 		#except:
 			#ret = False
 		if not ret:
 			exitcode = -1
 sys.exit(exitcode)

tests/tests_output/localhost/accounts/client.dat

➞

Show inline comments

file renamed from spectrum/src/tests/localhost/accounts/client.dat to tests/tests_output/localhost/accounts/client.dat

tests/tests_output/localhost/accounts/responder.dat

➞

Show inline comments

file renamed from spectrum/src/tests/localhost/accounts/responder.dat to tests/tests_output/localhost/accounts/responder.dat

0 comments (0 inline, 0 general)