[libchamplain/libchamplain-0-4] Relax the license validation as they change too often
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain/libchamplain-0-4] Relax the license validation as they change too often
- Date: Sat, 9 Jan 2010 19:57:01 +0000 (UTC)
commit 156ae2a007e6f153a0a766874932a8e20f3d4624
Author: Emmanuel Rodriguez <emmanuel rodriguez gmail com>
Date: Thu Jan 7 08:47:44 2010 +0100
Relax the license validation as they change too often
bindings/perl/Champlain/t/ChamplainMapSource.t | 8 ++++----
bindings/perl/Champlain/t/ChamplainMapSourceDesc.t | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/bindings/perl/Champlain/t/ChamplainMapSource.t b/bindings/perl/Champlain/t/ChamplainMapSource.t
index ad29868..336deef 100644
--- a/bindings/perl/Champlain/t/ChamplainMapSource.t
+++ b/bindings/perl/Champlain/t/ChamplainMapSource.t
@@ -7,7 +7,7 @@ use Clutter::TestHelper tests => 165;
use Champlain qw(:coords :maps);
-my $OSM_LICENSE = "CC-BY-SA 2.0 OpenStreetMap contributors";
+my $OSM_LICENSE_REGEXP = qr/OpenStreetMap contributors/;
my $OSM_URL_LICENSE = 'http://creativecommons.org/licenses/by-sa/2.0/';
exit tests();
@@ -34,7 +34,7 @@ sub test_osm_mapnik {
is($map->get_min_zoom_level, 0, "$label min zoom");
is($map->get_max_zoom_level, 18, "$label max zoom");
is($map->get_tile_size, 256, "$label tile size");
- is($map->get_license, $OSM_LICENSE, "$label license");
+ ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
# Generic map operations
@@ -54,7 +54,7 @@ sub test_osm_cyclemap {
is($map->get_min_zoom_level, 0, "$label min zoom");
is($map->get_max_zoom_level, 18, "$label max zoom");
is($map->get_tile_size, 256, "$label tile size");
- is($map->get_license, $OSM_LICENSE, "$label license");
+ ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
# Generic map operations
@@ -74,7 +74,7 @@ sub test_osm_osmarender {
is($map->get_min_zoom_level, 0, "$label min zoom");
is($map->get_max_zoom_level, 17, "$label max zoom");
is($map->get_tile_size, 256, "$label tile size");
- is($map->get_license, $OSM_LICENSE, "$label license");
+ ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
# Generic map operations
diff --git a/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t b/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
index 778bacd..f5c53bd 100644
--- a/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
+++ b/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
@@ -37,7 +37,7 @@ sub test_get_set {
isa_ok($source, 'Champlain::MapSourceDesc');
is($source->id, Champlain::MapSourceFactory->OSM_MAPNIK, "get id()");
is($source->name, 'OpenStreetMap Mapnik', "get name()");
- is($source->license, "CC-BY-SA 2.0 OpenStreetMap contributors", "get license()");
+ ok($source->license =~ /OpenStreetMap contributors/, "get license()");
is($source->license_uri, 'http://creativecommons.org/licenses/by-sa/2.0/', "get license_uri()");
is($source->min_zoom_level, 0, "get min_zoom_level()");
is($source->max_zoom_level, 18, "get max_zoom_level()");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]