Bug 551129: Move tests in TestPermanentAtoms.cpp into the new shiny TestAtoms.cpp. Disable tests with known intentional assertions in debug builds. r=jst

xpcom/tests/TestAtoms.cpp

@@ -149,6 +149,8 @@ test_invalid()
 
   nsCOMPtr<nsIAtom> emptyAtom = do_GetAtom("");
 
+#ifndef DEBUG
+    // Don't run these tests in debug builds as that intentionally asserts
   for (unsigned int i = 0; i < NS_ARRAY_LENGTH(Malformed8Strings); ++i) {
     nsrefcnt count = NS_GetNumberOfAtoms();
 
@@ -157,6 +159,7 @@ test_invalid()
         count != NS_GetNumberOfAtoms())
       return PR_FALSE;
   }
+#endif
 
   return PR_TRUE;
 }
@@ -180,11 +183,15 @@ static const nsStaticAtom sAtoms_info[] = {
 PRBool
 isStaticAtom(nsIAtom* atom)
 {
-  return atom->Release() == 1 &&
-         atom->Release() == 1 &&
-         atom->Release() == 1 &&
-         atom->AddRef() == 2 &&
-         atom->AddRef() == 2;
+  // Don't use logic && in order to ensure that all addrefs/releases are always
+  // run, even if one of the tests fail. This allows us to run this code on a
+  // non-static atom without affecting its refcount.
+  return atom->AddRef() == 2 &
+         atom->AddRef() == 2 &
+         atom->AddRef() == 2 &
+         atom->Release() == 1 &
+         atom->Release() == 1 &
+         atom->Release() == 1;
 }
 
 PRBool
@@ -194,10 +201,7 @@ test_atomtable()
   
   nsCOMPtr<nsIAtom> thirdNonPerm = do_GetAtom(THIRD_ATOM_STR);
   
-  if (thirdNonPerm->AddRef() != 2 ||
-      thirdNonPerm->AddRef() != 3 ||
-      thirdNonPerm->Release() != 2 ||
-      thirdNonPerm->Release() != 1)
+  if (isStaticAtom(thirdNonPerm))
     return PR_FALSE;
 
   if (!thirdNonPerm || NS_GetNumberOfAtoms() != count + 1)
@@ -218,6 +222,43 @@ test_atomtable()
          thirdNonPerm == sAtom3;
 }
 
+#define FIRST_PERM_ATOM_STR "first permanent atom. Hello!"
+#define SECOND_PERM_ATOM_STR "second permanent atom. @World!"
+
+PRBool
+test_permanent()
+{
+  nsrefcnt count = NS_GetNumberOfAtoms();
+
+  {
+    nsCOMPtr<nsIAtom> first = do_GetAtom(FIRST_PERM_ATOM_STR);
+    if (!first->Equals(NS_LITERAL_STRING(FIRST_PERM_ATOM_STR)) ||
+        isStaticAtom(first))
+      return PR_FALSE;
+  
+    nsCOMPtr<nsIAtom> first_p =
+      NS_NewPermanentAtom(NS_LITERAL_STRING(FIRST_PERM_ATOM_STR));
+    if (!first_p->Equals(NS_LITERAL_STRING(FIRST_PERM_ATOM_STR)) ||
+        !isStaticAtom(first_p) ||
+        first != first_p)
+      return PR_FALSE;
+  
+    nsCOMPtr<nsIAtom> second_p =
+      NS_NewPermanentAtom(NS_LITERAL_STRING(SECOND_PERM_ATOM_STR));
+    if (!second_p->Equals(NS_LITERAL_STRING(SECOND_PERM_ATOM_STR)) ||
+        !isStaticAtom(second_p))
+      return PR_FALSE;
+  
+    nsCOMPtr<nsIAtom> second = do_GetAtom(SECOND_PERM_ATOM_STR);
+    if (!second->Equals(NS_LITERAL_STRING(SECOND_PERM_ATOM_STR)) ||
+        !isStaticAtom(second) ||
+        second != second_p)
+      return PR_FALSE;
+  }
+
+  return NS_GetNumberOfAtoms() == count + 2;
+}
+
 typedef PRBool (*TestFunc)();
 
 static const struct Test
@@ -233,6 +274,7 @@ tests[] =
     { "test_null", test_null },
     { "test_invalid", test_invalid },
     { "test_atomtable", test_atomtable },
+    { "test_permanent", test_permanent },
     { nsnull, nsnull }
   };
 

xpcom/tests/TestPermanentAtoms.cpp

@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// vim:cindent:ts=8:et:sw=4:
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TestPermanentAtoms.cpp.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@dbaron.org> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIAtom.h"
-#include "nsAtomTable.h"
-#include "nsCOMPtr.h"
-#include <stdio.h>
-#include "nsString.h"
-#include "nsReadableUtils.h"
-
-static void Assert(PRBool aCondition, const char* aStatement)
-{
-    printf("%s: %s\n", aCondition?"PASS":"FAIL", aStatement);
-}
-
-static void AssertString(nsIAtom *aAtom, const nsACString& aString)
-{
-    Assert(aAtom->EqualsUTF8(aString), "string is correct");
-}
-
-static void AssertPermanence(nsIAtom *aAtom, PRBool aPermanence)
-{
-    Assert(static_cast<AtomImpl*>(aAtom)->IsPermanent() == aPermanence,
-           aPermanence ? "atom is permanent" : "atom is not permanent");
-}
-
-int main()
-{
-    nsCOMPtr<nsIAtom> foo = do_GetAtom("foo");
-    AssertString(foo, NS_LITERAL_CSTRING("foo"));
-    AssertPermanence(foo, PR_FALSE);
-
-    nsCOMPtr<nsIAtom> foop = NS_NewPermanentAtom(NS_LITERAL_STRING("foo"));
-    AssertString(foop, NS_LITERAL_CSTRING("foo"));
-    AssertPermanence(foop, PR_TRUE);
-    
-    Assert(foo == foop, "atoms are equal");
-    
-    nsCOMPtr<nsIAtom> barp = NS_NewPermanentAtom(NS_LITERAL_STRING("bar"));
-    AssertString(barp, NS_LITERAL_CSTRING("bar"));
-    AssertPermanence(barp, PR_TRUE);
-    
-    nsCOMPtr<nsIAtom> bar = do_GetAtom("bar");
-    AssertString(bar, NS_LITERAL_CSTRING("bar"));
-    AssertPermanence(bar, PR_TRUE);
-
-    Assert(bar == barp, "atoms are equal");
-    
-    return 0;
-}