[SCM] ci-tooling packaging branch, master, updated. 569b3ca0d1ab57271dae2d0f08fabbc2e43b700a
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Mar 24 14:20:56 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=4b4637b
The following commit has been merged in the master branch:
commit 4b4637b608c2124fcb2c71882ee2bff430bce2a0
Author: Harald Sitter <sitter at kde.org>
Date: Tue Mar 24 15:16:32 2015 +0100
implement == on qml module
---
lib/qml.rb | 6 ++++++
test/test_qml_module.rb | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/lib/qml.rb b/lib/qml.rb
index f61b48f..befba7a 100644
--- a/lib/qml.rb
+++ b/lib/qml.rb
@@ -32,6 +32,12 @@ module QML
"#{@identifier}[#{@version}]"
end
+ def ==(other)
+ identifier == other.identifier \
+ && (version.nil? || other.version.nil? || version == other.version) \
+ && (qualifier.nil? || other.qualifier.nil? || qualifier == other.qualifier)
+ end
+
private
def parse(line)
diff --git a/test/test_qml_module.rb b/test/test_qml_module.rb
index baf0ac1..0a47634 100644
--- a/test/test_qml_module.rb
+++ b/test/test_qml_module.rb
@@ -28,4 +28,15 @@ class QMLTest < TestCase
assert_nil(QML::Module.parse('# import QtQuick 1'))
assert_nil(QML::Module.parse(' # import QtQuick 1'))
end
+
+ def test_compare
+ id = 'id'
+ version = 'version'
+ qualifier = 'qualifier'
+ ref = QML::Module.new(id, version, qualifier)
+ assert_equal(ref, QML::Module.new(id, version, qualifier))
+ assert_equal(ref, QML::Module.new(id, version))
+ assert_equal(ref, QML::Module.new(id))
+ assert_not_equal(ref, QML::Module.new('yolo'))
+ end
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list