Merge lp:~mhr3/unity-lens-files/moar-tests into lp:unity-lens-files

[Michal Hruby]

Fix URL checking regressions, add tests

Fixes regressions in UrlChecker, adds unit tests for UrlChecker

[Mikkel Kamstrup Erlandsen (kamstrup)]

Loving it!

(have you considered upstreaming assertions.vapi? I think it would be great to have a GLib.Assertions namespace)

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-07 09:01:34 +0000
+++ Makefile.am	2012-03-20 09:43:20 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = src data po
+SUBDIRS = src data po tests
 
 #
 # Install the files.lens file

=== modified file 'configure.ac'
--- configure.ac	2012-03-12 08:40:35 +0000
+++ configure.ac	2012-03-20 09:43:20 +0000
@@ -127,6 +127,7 @@
   src/Makefile
   src/config.vala
   po/Makefile.in
+  tests/Makefile
 ])
 AC_OUTPUT
 

=== modified file 'src/url-checker.vala'
--- src/url-checker.vala	2012-03-14 16:04:50 +0000
+++ src/url-checker.vala	2012-03-20 09:43:20 +0000
@@ -53,8 +53,8 @@
       mountable_icon = new ThemedIcon ("folder-remote").to_string ();
       
       try {
-        web_regex = new Regex ("(http[s]{0,1}://.+){0,1}" +
-                                "[a-zA-Z0-9\\-\\.]+\\." + TLD_REGEX + "$",
+        web_regex = new Regex ("(http[s]?://.+)|" +
+                                "([a-zA-Z0-9\\-\\.]+\\." +TLD_REGEX+ "\\b.*)",
                                 RegexCompileFlags.OPTIMIZE);
         mountable_regex = new Regex ("(\\\\|(ftp|ssh|sftp|smb|dav)://).+");
       } catch (RegexError e) {

=== added file 'tests/Makefile.am'
--- tests/Makefile.am	1970-01-01 00:00:00 +0000
+++ tests/Makefile.am	2012-03-20 09:43:20 +0000
@@ -0,0 +1,27 @@
+check_PROGRAMS = test-url-checker
+
+TESTS = $(check_PROGRAMS)
+
+AM_CPPFLAGS = \
+  -w \
+  $(LENS_DAEMON_CFLAGS) \
+  $(NULL)
+
+AM_VALAFLAGS = \
+  --pkg gio-2.0 \
+  $(srcdir)/assertions.vapi \
+  $(NULL)
+
+test_libs = \
+  $(LENS_DAEMON_LIBS) \
+  $(NULL)
+
+test_url_checker_LDADD = $(test_libs)
+
+test_url_checker_SOURCES = \
+  test-url-checker.vala \
+  $(top_srcdir)/src/url-checker.vala \
+  $(NULL)
+
+CLEANFILES = *.stamp
+

=== added file 'tests/assertions.vapi'
--- tests/assertions.vapi	1970-01-01 00:00:00 +0000
+++ tests/assertions.vapi	2012-03-20 09:43:20 +0000
@@ -0,0 +1,23 @@
+[CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "glib.h")]
+namespace Assertions {
+  public enum OperatorType {
+    [CCode (cname = "==")]
+    EQUAL,
+    [CCode (cname = "!=")]
+    NOT_EQUAL,
+    [CCode (cname = "<")]
+    LESS_THAN,
+    [CCode (cname = ">")]
+    GREATER_THAN,
+    [CCode (cname = "<=")]
+    LESS_OR_EQUAL,
+    [CCode (cname = ">=")]
+    GREATER_OR_EQUAL
+  }
+
+  public void assert_cmpstr (string? s1, OperatorType op, string? s2);
+  public void assert_cmpint (int n1, OperatorType op, int n2);
+  public void assert_cmpuint (uint n1, OperatorType op, uint n2);
+  public void assert_cmphex (uint n1, OperatorType op, uint n2);
+  public void assert_cmpfloat (float n1, OperatorType op, float n2);
+}

=== added file 'tests/test-url-checker.vala'
--- tests/test-url-checker.vala	1970-01-01 00:00:00 +0000
+++ tests/test-url-checker.vala	2012-03-20 09:43:20 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Michal Hruby <[e-mail]>
+ *
+ */
+
+using Unity.FilesLens;
+using Assertions;
+
+public class Main
+{
+  public static int main (string[] args)
+  {
+    Test.init (ref args);
+
+    Test.add_data_func ("/Unit/UrlChecker/WebUris", test_web_uris);
+    Test.add_data_func ("/Unit/UrlChecker/MountableUris", test_mountable_uris);
+
+    Test.run ();
+
+    return 0;
+  }
+
+  private static void test_web_uris ()
+  {
+    string result;
+    var checker = new UrlChecker ();
+    UrlType url_type;
+
+    result = checker.check_url ("facebook.com", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "http://facebook.com");
+
+    result = checker.check_url ("google.co.uk", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "http://google.co.uk");
+
+    result = checker.check_url ("http://www.bbc.co.uk", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "http://www.bbc.co.uk");
+
+    result = checker.check_url ("https://launchpad.net", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "https://launchpad.net");
+
+    result = checker.check_url ("https://code.launchpad.net/unity-lens-files", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "https://code.launchpad.net/unity-lens-files");
+
+    result = checker.check_url ("google.com/?q=unity-lens-files", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "http://google.com/?q=unity-lens-files");
+
+    result = checker.check_url ("192.168.0.1", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.WEB);
+    assert_cmpstr (result, OperatorType.EQUAL, "http://192.168.0.1");
+
+    result = checker.check_url ("daemon.vala", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.UNKNOWN);
+    assert_cmpstr (result, OperatorType.EQUAL, null);
+
+    result = checker.check_url ("non-existing-tld.qv", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.UNKNOWN);
+    assert_cmpstr (result, OperatorType.EQUAL, null);
+  }
+
+  private static void test_mountable_uris ()
+  {
+    string result;
+    var checker = new UrlChecker ();
+    UrlType url_type;
+
+    result = checker.check_url ("\\\\smb_share", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "smb://smb_share");
+
+    result = checker.check_url ("smb://another_share", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "smb://another_share");
+
+    result = checker.check_url ("ftp://mozilla.org", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "ftp://mozilla.org");
+
+    result = checker.check_url ("ssh://a.server.somewhere", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "ssh://a.server.somewhere");
+
+    result = checker.check_url ("sftp://secure.mozilla.org", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "sftp://secure.mozilla.org");
+
+    result = checker.check_url ("dav://dav.share.co.uk", out url_type);
+    assert_cmpint (url_type, OperatorType.EQUAL, UrlType.MOUNTABLE);
+    assert_cmpstr (result, OperatorType.EQUAL, "dav://dav.share.co.uk");
+  }
+}