Tests for parsing of channel lists in UpdateChecker

6 files changed, 111 insertions, 2 deletions

diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp
index 5ff1898e..af56288c 100644
--- a/logic/updater/UpdateChecker.cpp
+++ b/logic/updater/UpdateChecker.cpp
@@ -44,7 +44,7 @@ QList<UpdateChecker::ChannelListEntry> UpdateChecker::getChannelList() const
 
 bool UpdateChecker::hasChannels() const
 {
-	return m_channels.isEmpty();
+	return !m_channels.isEmpty();
 }
 
 void UpdateChecker::checkForUpdate()
diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h
index 59fb8e47..131f49a2 100644
--- a/logic/updater/UpdateChecker.h
+++ b/logic/updater/UpdateChecker.h
@@ -27,6 +27,9 @@ public:
 	UpdateChecker();
 	void checkForUpdate();
 
+	void setCurrentChannel(const QString &channel) { m_currentChannel = channel; }
+	void setChannelListUrl(const QString &url) { m_channelListUrl = url; }
+
 	/*!
 	 * Causes the update checker to download the channel list from the URL specified in config.h (generated by CMake).
 	 * If this isn't called before checkForUpdate(), it will automatically be called.
diff --git a/tests/data/channels.json b/tests/data/channels.json
new file mode 100644
index 00000000..dd99fd27
--- /dev/null
+++ b/tests/data/channels.json
@@ -0,0 +1,23 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "http://example.org/stuff"
+		},
+		{
+			"id": "stable",
+			"name": "Stable",
+			"description": "It's stable at least",
+			"url": "ftp://username@host/path/to/stuff"
+		},
+		{
+			"id": "42",
+			"name": "The Channel",
+			"description": "This is the channel that is going to answer all of your questions",
+			"url": "https://dent.me/tea"
+		}
+	]
+}
diff --git a/tests/data/noChannels.json b/tests/data/noChannels.json
new file mode 100644
index 00000000..bbb2cb70
--- /dev/null
+++ b/tests/data/noChannels.json
@@ -0,0 +1,5 @@
+{
+	"format_version": 0,
+	"channels": [
+	]
+}
diff --git a/tests/data/oneChannel.json b/tests/data/oneChannel.json
new file mode 100644
index 00000000..84727ac7
--- /dev/null
+++ b/tests/data/oneChannel.json
@@ -0,0 +1,11 @@
+{
+	"format_version": 0,
+	"channels": [
+		{
+			"id": "develop",
+			"name": "Develop",
+			"description": "The channel called \"develop\"",
+			"url": "http://example.org/stuff"
+		}
+	]
+}
diff --git a/tests/tst_UpdateChecker.cpp b/tests/tst_UpdateChecker.cpp
index dd31f253..a73dc1fd 100644
--- a/tests/tst_UpdateChecker.cpp
+++ b/tests/tst_UpdateChecker.cpp
@@ -1,6 +1,18 @@
 #include <QTest>
+#include <QSignalSpy>
 
 #include "TestUtil.h"
+#include "logic/updater/UpdateChecker.h"
+
+Q_DECLARE_METATYPE(UpdateChecker::ChannelListEntry)
+
+bool operator==(const UpdateChecker::ChannelListEntry &e1, const UpdateChecker::ChannelListEntry &e2)
+{
+	return e1.id == e2.id &&
+			e1.name == e2.name &&
+			e1.description == e2.description &&
+			e1.url == e2.url;
+}
 
 class UpdateCheckerTest : public QObject
 {
@@ -15,8 +27,63 @@ slots:
 	{
 
 	}
+
+	static QString findTestDataUrl(const char *file)
+	{
+		return QUrl::fromLocalFile(QFINDTESTDATA(file)).toString();
+	}
+	void tst_ChannelListParsing_data()
+	{
+		QTest::addColumn<QString>("channel");
+		QTest::addColumn<QString>("channelUrl");
+		QTest::addColumn<bool>("hasChannels");
+		QTest::addColumn<QList<UpdateChecker::ChannelListEntry> >("result");
+
+		QTest::newRow("no channels")
+				<< QString()
+				<< findTestDataUrl("tests/data/noChannels.json")
+				<< false
+				<< QList<UpdateChecker::ChannelListEntry>();
+		QTest::newRow("one channel")
+				<< QString("develop")
+				<< findTestDataUrl("tests/data/oneChannel.json")
+				<< true
+				<< (QList<UpdateChecker::ChannelListEntry>() << UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "http://example.org/stuff"});
+		QTest::newRow("several channels")
+				<< QString("develop")
+				<< findTestDataUrl("tests/data/channels.json")
+				<< true
+				<< (QList<UpdateChecker::ChannelListEntry>()
+					<< UpdateChecker::ChannelListEntry{"develop", "Develop", "The channel called \"develop\"", "http://example.org/stuff"}
+					<< UpdateChecker::ChannelListEntry{"stable", "Stable", "It's stable at least", "ftp://username@host/path/to/stuff"}
+					<< UpdateChecker::ChannelListEntry{"42", "The Channel", "This is the channel that is going to answer all of your questions", "https://dent.me/tea"});
+	}
+	void tst_ChannelListParsing()
+	{
+		QFETCH(QString, channel);
+		QFETCH(QString, channelUrl);
+		QFETCH(bool, hasChannels);
+		QFETCH(QList<UpdateChecker::ChannelListEntry>, result);
+
+		UpdateChecker checker;
+
+		QSignalSpy spy(&checker, SIGNAL(channelListLoaded()));
+		QVERIFY(spy.isValid());
+
+		checker.setCurrentChannel(channel);
+		checker.setChannelListUrl(channelUrl);
+
+		checker.updateChanList();
+
+		QVERIFY(spy.wait());
+
+		QCOMPARE(spy.size(), 1);
+
+		QCOMPARE(checker.hasChannels(), hasChannels);
+		QCOMPARE(checker.getChannelList(), result);
+	}
 };
 
-QTEST_GUILESS_MAIN(UpdateCheckerTest)
+QTEST_GUILESS_MAIN_MULTIMC(UpdateCheckerTest)
 
 #include "tst_UpdateChecker.moc"