diff -r e4d67989cc36 -r 47c74d1534e1 glib/tests/markup-escape-test.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/glib/tests/markup-escape-test.c	Fri Apr 16 16:46:38 2010 +0300
@@ -0,0 +1,164 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+#undef G_DISABLE_ASSERT
+#undef G_LOG_DOMAIN
+
+#include <stdarg.h>
+#include <string.h>
+#include <glib.h>
+#ifdef __SYMBIAN32__
+#include "mrt2_glib2_test.h"
+#endif /*__SYMBIAN32__*/
+
+
+static void test_format (const gchar *format,
+			 const gchar *expected, ...) G_GNUC_PRINTF (1, 3);
+
+static gboolean error = FALSE;
+
+static void
+test (const gchar *original,
+      const gchar *expected)
+{
+  gchar *result = g_markup_escape_text (original, -1);
+
+  if (strcmp (result, expected) != 0)
+    {
+      g_printerr ("g_markup_escape_text(): expected '%s', got '%s'\n",
+		  expected, result);
+      error = TRUE;
+    }
+
+  g_free (result);
+}
+
+static void
+test_unichar (gunichar c, 
+              gboolean entity)
+{
+  gint len;
+  gchar outbuf[7], expected[12];
+
+  len = g_unichar_to_utf8 (c, outbuf);
+  outbuf[len] = 0;
+
+  if (entity)
+    g_snprintf (expected, 12, "&#x%x;", c);
+  else
+    strcpy (expected, outbuf);
+
+  test (outbuf, expected);
+}
+
+static void
+test_format (const gchar *format,
+	     const gchar *expected,
+	     ...)
+{
+  gchar *result;
+  
+  va_list args;
+  
+  va_start (args, expected);
+  result = g_markup_vprintf_escaped (format, args);
+  va_end (args);
+
+  if (strcmp (result, expected) != 0)
+    {
+      g_printerr ("g_markup_printf_escaped(): expected '%s', got '%s'\n",
+		  expected, result);
+      error = TRUE;
+    }
+
+  g_free (result);
+}
+
+int main (int argc, char **argv)
+{
+  #ifdef __SYMBIAN32__
+  g_log_set_handler (NULL,  G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL);
+  g_set_print_handler(mrtPrintHandler);
+  #endif /*__SYMBIAN32__*/
+	  
+
+  /* Tests for g_markup_escape_text() */
+  test ("&", "&amp;");
+  test ("<", "&lt;");
+  test (">", "&gt;");
+  test ("'", "&apos;");
+  test ("\"", "&quot;");
+  
+  test ("", "");
+  test ("A", "A");
+  test ("A&", "A&amp;");
+  test ("&A", "&amp;A");
+  test ("A&A", "A&amp;A");
+  test ("&&A", "&amp;&amp;A");
+  test ("A&&", "A&amp;&amp;");
+  test ("A&&A", "A&amp;&amp;A");
+  test ("A&A&A", "A&amp;A&amp;A");
+  test ("A&#23;A", "A&amp;#23;A");
+  test ("A&#xa;A", "A&amp;#xa;A");
+  test_unichar (0x1, TRUE);
+  test_unichar (0x8, TRUE);
+  test_unichar (0x9, FALSE);
+  test_unichar (0xa, FALSE);
+  test_unichar (0xb, TRUE);
+  test_unichar (0xc, TRUE);
+  test_unichar (0xd, FALSE);
+  test_unichar (0xe, TRUE);
+  test_unichar (0x1f, TRUE);
+  test_unichar (0x20, FALSE);
+  test_unichar (0x7e, FALSE);
+  test_unichar (0x7f, TRUE);
+  test_unichar (0x84, TRUE);
+  test_unichar (0x85, FALSE);
+  test_unichar (0x86, TRUE);
+  test_unichar (0x9f, TRUE);
+  test_unichar (0xa0, FALSE);
+  
+  /* Tests for g_markup_printf_escaped() */
+  test_format ("A", "A");
+  test_format ("A%s", "A&amp;", "&");
+  test_format ("%sA", "&amp;A", "&");
+  test_format ("A%sA", "A&amp;A", "&");
+  test_format ("%s%sA", "&amp;&amp;A", "&", "&");
+  test_format ("A%s%s", "A&amp;&amp;", "&", "&");
+  test_format ("A%s%sA", "A&amp;&amp;A", "&", "&");
+  test_format ("A%sA%sA", "A&amp;A&amp;A", "&", "&");
+  
+  test_format ("%s", "&lt;B&gt;&amp;",
+	       "<B>&");
+  test_format ("%c%c", "&lt;&amp;",
+	       '<', '&');
+  test_format (".%c.%c.", ".&lt;.&amp;.",
+	       '<', '&');
+  test_format ("%s", "",
+	       "");
+  test_format ("%-5s", "A    ",
+	       "A");
+  test_format ("%2$s%1$s", "B.A.",
+	       "A.", "B.");
+	       
+
+  #ifdef __SYMBIAN32__
+  testResultXml("markup-escape-test");
+  #endif /* EMULATOR */
+
+  return error ? 1 : 0;
+}