[kdbus] Do not set body message if signature field is empty

[platform/upstream/glib.git] / tests / dirname-test.c

diff --git a/tests/dirname-test.c b/tests/dirname-test.c
index 7e7d33e..4260a05 100644 (file)
--- a/tests/dirname-test.c
+++ b/tests/dirname-test.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -60,7 +58,6 @@ main (int   argc,
     gchar *filename;
     gchar *dirname;
   } dirname_checks[] = {
-#ifndef G_OS_WIN32
     { "/", "/" },
     { "////", "/" },
     { ".////", "." },
@@ -72,17 +69,35 @@ main (int   argc,
     { "a/b", "a" },
     { "a/b/", "a/b" },
     { "c///", "c" },
-#else
+    { "/a/b", "/a" },
+    { "/a/b/", "/a/b" },
+#ifdef G_OS_WIN32
     { "\\", "\\" },
     { ".\\\\\\\\", "." },
+    { ".\\/\\/", "." },
     { ".", "." },
     { "..", "." },
     { "..\\", ".." },
     { "..\\\\\\\\", ".." },
+    { "..\\//\\", ".." },
     { "", "." },
     { "a\\b", "a" },
     { "a\\b\\", "a\\b" },
+    { "\\a\\b", "\\a" },
+    { "\\a\\b\\", "\\a\\b" },
     { "c\\\\\\", "c" },
+    { "c/\\\\", "c" },
+    { "a:", "a:." },
+    { "a:foo", "a:." },
+    { "a:foo\\bar", "a:foo" },
+    { "a:/foo", "a:/" },
+    { "a:/foo/bar", "a:/foo" },
+    { "a:/", "a:/" },
+    { "a://", "a:/" },
+    { "a:\\foo", "a:\\" },
+    { "a:\\", "a:\\" },
+    { "a:\\\\", "a:\\" },
+    { "a:\\/", "a:\\" },
 #endif
   };
   guint n_dirname_checks = sizeof (dirname_checks) / sizeof (dirname_checks[0]);
@@ -92,7 +107,10 @@ main (int   argc,
       gchar *dirname;
 
       dirname = g_path_get_dirname (dirname_checks[i].filename);
-      g_assert (strcmp (dirname, dirname_checks[i].dirname) == 0);
+      if (strcmp (dirname, dirname_checks[i].dirname) != 0)
+       g_error ("%s returned %s, should return %s",
+                dirname_checks[i].filename, dirname,
+                dirname_checks[i].dirname);
       g_free (dirname);
     }