fixed problem in testCRT. GetUnicode returns a const ptr

base/tests/TestCRT.cpp

@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsCRT.h"
-#include "nsString.h"
-#include "plstr.h"
-#include <stdlib.h>
-
-// Verify that nsCRT versions of string comparison routines get the
-// same answers as the native non-unicode versions. We only pass in
-// iso-latin-1 strings, so the comparision must be valid.
-static void Check(const char* s1, const char* s2, PRIntn n)
-{
-  PRIntn clib = PL_strcmp(s1, s2);
-  PRIntn clib_n = PL_strncmp(s1, s2, n);
-  PRIntn clib_case = PL_strcasecmp(s1, s2);
-  PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
-
-  nsAutoString t1(s1), t2(s2);
-  PRUnichar* us1 = t1.GetUnicode();
-  PRUnichar* us2 = t2.GetUnicode();
-
-  PRIntn u = nsCRT::strcmp(us1, s2);
-  PRIntn u_n = nsCRT::strncmp(us1, s2, n);
-  PRIntn u_case = nsCRT::strcasecmp(us1, s2);
-  PRIntn u_case_n = nsCRT::strncasecmp(us1, s2, n);
-
-  PRIntn u2 = nsCRT::strcmp(us1, us2);
-  PRIntn u2_n = nsCRT::strncmp(us1, us2, n);
-  PRIntn u2_case = nsCRT::strcasecmp(us1, us2);
-  PRIntn u2_case_n = nsCRT::strncasecmp(us1, us2, n);
-
-  NS_ASSERTION(clib == u, "strcmp");
-  NS_ASSERTION(clib_n == u_n, "strncmp");
-  NS_ASSERTION(clib_case == u_case, "strcasecmp");
-  NS_ASSERTION(clib_case_n == u_case_n, "strncasecmp");
-
-  NS_ASSERTION(clib == u2, "strcmp");
-  NS_ASSERTION(clib_n == u2_n, "strncmp");
-  NS_ASSERTION(clib_case == u2_case, "strcasecmp");
-  NS_ASSERTION(clib_case_n == u2_case_n, "strncasecmp");
-}
-
-struct Test {
-  const char* s1;
-  const char* s2;
-  PRIntn n;
-};
-
-static Test tests[] = {
-  { "foo", "foo", 3 },
-  { "foo", "fo", 3 },
-
-  { "foo", "bar", 3 },
-  { "foo", "ba", 3 },
-
-  { "foo", "zap", 3 },
-  { "foo", "za", 3 },
-
-  { "bar", "foo", 3 },
-  { "bar", "fo", 3 },
-
-  { "bar", "foo", 3 },
-  { "bar", "fo", 3 },
-};
-#define NUM_TESTS (sizeof(tests) / sizeof(tests[0]))
-
-void main()
-{
-  Test* tp = tests;
-  for (PRIntn i = 0; i < NUM_TESTS; i++, tp++) {
-    Check(tp->s1, tp->s2, tp->n);
-  }
-}

xpcom/tests/TestCRT.cpp

@@ -32,8 +32,8 @@ static void Check(const char* s1, const char* s2, PRIntn n)
   PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
 
   nsAutoString t1(s1), t2(s2);
-  PRUnichar* us1 = t1.GetUnicode();
-  PRUnichar* us2 = t2.GetUnicode();
+  const PRUnichar* us1 = t1.GetUnicode();
+  const PRUnichar* us2 = t2.GetUnicode();
 
   PRIntn u = nsCRT::strcmp(us1, s2);
   PRIntn u_n = nsCRT::strncmp(us1, s2, n);