[spectrum/el5/master] Fix spectrum-failed-test.patch

[Matej Cepl]

commit 749b2ff7de23a5652bf8e60676aa9f78a9c916f2
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Oct 8 17:47:16 2010 +0200

    Fix spectrum-failed-test.patch

 spectrum-0.3.1-cmake.patch |  112 --------------------------------------------
 spectrum-failed-test.patch |   54 ++++++++++-----------
 2 files changed, 26 insertions(+), 140 deletions(-)
---
diff --git a/spectrum-failed-test.patch b/spectrum-failed-test.patch
index 809dc7b..0fcc95d 100644
--- a/spectrum-failed-test.patch
+++ b/spectrum-failed-test.patch
@@ -1,85 +1,83 @@
-diff --git a/src/tests/registerhandlertest.cpp b/src/tests/registerhandlertest.cpp
-index eb29537..c630ac5 100644
---- a/src/tests/registerhandlertest.cpp
-+++ b/src/tests/registerhandlertest.cpp
-@@ -24,6 +24,7 @@ void RegisterHandlerTest::handleIqNoPermission() {
+diff -up spectrum-1.4.2/src/tests/registerhandlertest.cpp.failed-test spectrum-1.4.2/src/tests/registerhandlertest.cpp
+--- spectrum-1.4.2/src/tests/registerhandlertest.cpp.failed-test	2010-10-08 09:15:22.000000000 +0200
++++ spectrum-1.4.2/src/tests/registerhandlertest.cpp	2010-10-08 17:45:46.147372164 +0200
+@@ -24,6 +24,7 @@ void RegisterHandlerTest::handleIqNoPerm
  	Configuration cfg;
  	cfg.onlyForVIP = true;
  	cfg.allowedServers.push_back("example.com");
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -77,6 +78,7 @@ void RegisterHandlerTest::handleIqGetNewUser() {
+@@ -77,6 +78,7 @@ void RegisterHandlerTest::handleIqGetNew
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -134,6 +136,7 @@ void RegisterHandlerTest::handleIqGetExistingUser() {
+@@ -134,6 +136,7 @@ void RegisterHandlerTest::handleIqGetExi
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	UserRow row;
-@@ -169,6 +172,7 @@ void RegisterHandlerTest::handleIqRegisterLegacy() {
+@@ -169,6 +172,7 @@ void RegisterHandlerTest::handleIqRegist
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -207,6 +211,7 @@ void RegisterHandlerTest::handleIqRegisterLegacyNoPassword() {
+@@ -207,6 +211,7 @@ void RegisterHandlerTest::handleIqRegist
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -238,6 +243,7 @@ void RegisterHandlerTest::handleIqRegisterLegacyNoUsername() {
+@@ -238,6 +243,7 @@ void RegisterHandlerTest::handleIqRegist
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -267,6 +273,7 @@ void RegisterHandlerTest::handleIqRegisterXData() {
+@@ -267,6 +273,7 @@ void RegisterHandlerTest::handleIqRegist
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-@@ -343,6 +350,7 @@ void RegisterHandlerTest::handleIqRegisterXDataBadLanguage() {
+@@ -343,6 +350,7 @@ void RegisterHandlerTest::handleIqRegist
  	cfg.allowedServers.push_back("spectrum.im");
  	cfg.language = "en";
  	cfg.encoding = "windows-1250";
 +	cfg.enable_public_registration = 1;
  	m_backend->setConfiguration(cfg);
-
+ 	
  	Tag *iq = new Tag("iq");
-diff --git a/src/tests/testingbackend.h b/src/tests/testingbackend.h
-index 646fd20..ed55935 100644
---- a/src/tests/testingbackend.h
-+++ b/src/tests/testingbackend.h
+diff -up spectrum-1.4.2/src/tests/testingbackend.h.failed-test spectrum-1.4.2/src/tests/testingbackend.h
+--- spectrum-1.4.2/src/tests/testingbackend.h.failed-test	2010-10-08 09:15:22.000000000 +0200
++++ spectrum-1.4.2/src/tests/testingbackend.h	2010-10-08 17:43:53.400902005 +0200
 @@ -38,7 +38,7 @@ struct Buddy {
-
+ 
  class TestingBackend : public AbstractBackend {
  	public:
 -		TestingBackend() { m_pInstance = this; m_parser = new GlooxParser(); }
 +		TestingBackend() { m_pInstance = this; m_parser = new GlooxParser(); reset(); }
  		~TestingBackend() {}
  		static TestingBackend *instance() { return m_pInstance; }
- 		void addBuddySetting(long userId, long buddyId, const std::string &key, const std::string &value, PurpleType type) {}
-@@ -59,6 +59,8 @@ class TestingBackend : public AbstractBackend {
+ 		void addBuddySetting(long userId, long buddyId, const std::string &key, const std::string &value, PurpleType type) {} 
+@@ -59,6 +59,8 @@ class TestingBackend : public AbstractBa
  			m_buddies.clear();
  			m_users.clear();
  			Configuration cfg;
@@ -87,4 +85,4 @@ index 646fd20..ed55935 100644
 +			cfg.enable_public_registration = 1;
  			m_configuration = cfg;
  		}
-
+