Adding upstream version 6.0.4-dfsg.upstream/6.0.4-dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 939 insertions, 0 deletions

diff --git a/src/libs/xpcom18a4/xpcom/tests/TestHashtables.cpp b/src/libs/xpcom18a4/xpcom/tests/TestHashtables.cpp
new file mode 100644
index 00000000..9c26d1b2
--- /dev/null
+++ b/src/libs/xpcom18a4/xpcom/tests/TestHashtables.cpp
@@ -0,0 +1,939 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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 C++ hashtable templates.
+ *
+ * The Initial Developer of the Original Code is
+ * Benjamin Smedberg.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 "nsTHashtable.h"
+#include "nsBaseHashtable.h"
+#include "nsDataHashtable.h"
+#include "nsInterfaceHashtable.h"
+#include "nsClassHashtable.h"
+
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsCRT.h"
+#include "nsCOMArray.h"
+
+class TestUniChar // for nsClassHashtable
+{
+public:
+  TestUniChar(PRUint32 aWord)
+  {
+    printf("    TestUniChar::TestUniChar() %u\n", aWord);
+    mWord = aWord;
+  }
+
+  ~TestUniChar()
+  {
+    printf("    TestUniChar::~TestUniChar() %u\n", mWord);
+  }
+
+  PRUint32 GetChar() const { return mWord; }
+
+private:
+  PRUint32 mWord;
+};
+
+struct EntityNode {
+  const char*   mStr; // never owns buffer
+  PRUint32       mUnicode;
+};
+
+EntityNode gEntities[] = {
+  {"nbsp",160},
+  {"iexcl",161},
+  {"cent",162},
+  {"pound",163},
+  {"curren",164},
+  {"yen",165},
+  {"brvbar",166},
+  {"sect",167},
+  {"uml",168},
+  {"copy",169},
+  {"ordf",170},
+  {"laquo",171},
+  {"not",172},
+  {"shy",173},
+  {"reg",174},
+  {"macr",175}
+};
+
+#define ENTITY_COUNT (sizeof(gEntities)/sizeof(EntityNode))
+
+class EntityToUnicodeEntry : public PLDHashEntryHdr
+{
+public:
+  typedef const char* KeyType;
+  typedef const char* KeyTypePointer;
+
+  EntityToUnicodeEntry(const char* aKey) { mNode = nsnull; }
+  EntityToUnicodeEntry(const EntityToUnicodeEntry& aEntry) { mNode = aEntry.mNode; }
+  ~EntityToUnicodeEntry() { };
+
+  const char* GetKeyPointer() const { return mNode->mStr; }
+  PRBool KeyEquals(const char* aEntity) const { return !strcmp(mNode->mStr, aEntity); }
+  static const char* KeyToPointer(const char* aEntity) { return aEntity; }
+  static PLDHashNumber HashKey(const char* aEntity) { return nsCRT::HashCode(aEntity); }
+  enum { ALLOW_MEMMOVE = PR_TRUE };
+
+  const EntityNode* mNode;
+};
+
+PLDHashOperator
+nsTEnumGo(EntityToUnicodeEntry* aEntry, void* userArg) {
+  printf("  enumerated \"%s\" = %u\n", 
+         aEntry->mNode->mStr, aEntry->mNode->mUnicode);
+
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsTEnumStop(EntityToUnicodeEntry* aEntry, void* userArg) {
+  printf("  enumerated \"%s\" = %u\n",
+         aEntry->mNode->mStr, aEntry->mNode->mUnicode);
+
+  return PL_DHASH_REMOVE;
+}
+
+void
+testTHashtable(nsTHashtable<EntityToUnicodeEntry>& hash, PRUint32 numEntries) {
+  printf("Filling hash with %d entries.\n", numEntries);
+
+  PRUint32 i;
+  for (i = 0; i < numEntries; ++i) {
+    printf("  Putting entry \"%s\"...", gEntities[i].mStr);
+    EntityToUnicodeEntry* entry =
+      hash.PutEntry(gEntities[i].mStr);
+
+    if (!entry) {
+      printf("FAILED\n");
+      exit (2);
+    }
+    printf("OK...");
+
+    if (entry->mNode) {
+      printf("entry already exists!\n");
+      exit (3);
+    }
+    printf("\n");
+
+    entry->mNode = &gEntities[i];
+  }
+
+  printf("Testing Get:\n");
+
+  for (i = 0; i < numEntries; ++i) {
+    printf("  Getting entry \"%s\"...", gEntities[i].mStr);
+    EntityToUnicodeEntry* entry =
+      hash.GetEntry(gEntities[i].mStr);
+
+    if (!entry) {
+      printf("FAILED\n");
+      exit (4);
+    }
+
+    printf("Found %u\n", entry->mNode->mUnicode);
+  }
+
+  printf("Testing non-existent entries...");
+
+  EntityToUnicodeEntry* entry =
+    hash.GetEntry("xxxy");
+
+  if (entry) {
+    printf("FOUND! BAD!\n");
+    exit (5);
+  }
+
+  printf("not found; good.\n");
+
+  printf("Enumerating:\n");
+  PRUint32 count = hash.EnumerateEntries(nsTEnumGo, nsnull);
+  if (count != numEntries) {
+    printf("  Bad count!\n");
+    exit (6);
+  }
+}
+
+PLDHashOperator
+nsDEnumRead(const PRUint32& aKey, const char* aData, void* userArg) {
+  printf("  enumerated %u = \"%s\"\n", aKey, aData);
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsDEnum(const PRUint32& aKey, const char*& aData, void* userArg) {
+  printf("  enumerated %u = \"%s\"\n", aKey, aData);
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsCEnumRead(const nsACString& aKey, TestUniChar* aData, void* userArg) {
+  printf("  enumerated \"%s\" = %c\n",
+         PromiseFlatCString(aKey).get(), aData->GetChar());
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsCEnum(const nsACString& aKey, nsAutoPtr<TestUniChar>& aData, void* userArg) {
+    printf("  enumerated \"%s\" = %c\n", 
+           PromiseFlatCString(aKey).get(), aData->GetChar());
+  return PL_DHASH_NEXT;
+}
+
+//
+// all this nsIFoo stuff was copied wholesale from TestCOMPTr.cpp
+//
+
+#define NS_IFOO_IID \
+{ 0x6f7652e0,  0xee43, 0x11d1, \
+ { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
+
+class IFoo : public nsISupports
+  {
+		public:
+			NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFOO_IID)
+
+		public:
+      IFoo();
+
+      NS_IMETHOD_(nsrefcnt) AddRef();
+      NS_IMETHOD_(nsrefcnt) Release();
+      NS_IMETHOD QueryInterface( const nsIID&, void** );
+
+      NS_IMETHOD SetString(const nsACString& /*in*/ aString);
+      NS_IMETHOD GetString(nsACString& /*out*/ aString);
+
+      static void print_totals();
+
+    private:
+      ~IFoo();
+
+      unsigned int refcount_;
+
+      static unsigned int total_constructions_;
+      static unsigned int total_destructions_;
+      nsCString mString;
+  };
+
+unsigned int IFoo::total_constructions_;
+unsigned int IFoo::total_destructions_;
+
+void
+IFoo::print_totals()
+  {
+    printf("total constructions/destructions --> %d/%d\n",
+           total_constructions_, total_destructions_);
+  }
+
+IFoo::IFoo()
+    : refcount_(0)
+  {
+    ++total_constructions_;
+    printf("  new IFoo@%p [#%d]\n",
+           NS_STATIC_CAST(void*, this), total_constructions_);
+  }
+
+IFoo::~IFoo()
+  {
+    ++total_destructions_;
+    printf("IFoo@%p::~IFoo() [#%d]\n",
+           NS_STATIC_CAST(void*, this), total_destructions_);
+  }
+
+nsrefcnt
+IFoo::AddRef()
+  {
+    ++refcount_;
+    printf("IFoo@%p::AddRef(), refcount --> %d\n", 
+           NS_STATIC_CAST(void*, this), refcount_);
+    return refcount_;
+  }
+
+nsrefcnt
+IFoo::Release()
+  {
+    int wrap_message = (refcount_ == 1);
+    if ( wrap_message )
+      printf(">>");
+      
+    --refcount_;
+    printf("IFoo@%p::Release(), refcount --> %d\n",
+           NS_STATIC_CAST(void*, this), refcount_);
+
+    if ( !refcount_ )
+      {
+        printf("  delete IFoo@%p\n", NS_STATIC_CAST(void*, this));
+        delete this;
+      }
+
+    if ( wrap_message )
+      printf("  delete IFoo@%p\n", NS_STATIC_CAST(void*, this));
+
+    return refcount_;
+  }
+
+nsresult
+IFoo::QueryInterface( const nsIID& aIID, void** aResult )
+	{
+    printf("IFoo@%p::QueryInterface()\n", NS_STATIC_CAST(void*, this));
+		nsISupports* rawPtr = 0;
+		nsresult status = NS_OK;
+
+		if ( aIID.Equals(GetIID()) )
+			rawPtr = this;
+		else
+			{
+				nsID iid_of_ISupports = NS_ISUPPORTS_IID;
+				if ( aIID.Equals(iid_of_ISupports) )
+					rawPtr = NS_STATIC_CAST(nsISupports*, this);
+				else
+					status = NS_ERROR_NO_INTERFACE;
+			}
+
+		NS_IF_ADDREF(rawPtr);
+		*aResult = rawPtr;
+
+		return status;
+	}
+
+nsresult
+IFoo::SetString(const nsACString& aString)
+{
+  mString = aString;
+  return NS_OK;
+}
+
+nsresult
+IFoo::GetString(nsACString& aString)
+{
+  aString = mString;
+  return NS_OK;
+}
+
+nsresult
+CreateIFoo( IFoo** result )
+    // a typical factory function (that calls AddRef)
+  {
+    printf("    >>CreateIFoo() --> ");
+    IFoo* foop = new IFoo();
+    printf("IFoo@%p\n", NS_STATIC_CAST(void*, foop));
+
+    foop->AddRef();
+    *result = foop;
+
+    printf("<<CreateIFoo()\n");
+    return 0;
+  }
+
+PLDHashOperator
+nsIEnumRead(const PRUint32& aKey, IFoo* aFoo, void* userArg) {
+  nsCAutoString str;
+  aFoo->GetString(str);
+
+  printf("  enumerated %u = \"%s\"\n", aKey, str.get());
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsIEnum(const PRUint32& aKey, nsCOMPtr<IFoo>& aData, void* userArg) {
+  nsCAutoString str;
+  aData->GetString(str);
+
+  printf("  enumerated %u = \"%s\"\n", aKey, str.get());
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsIEnum2Read(nsISupports* aKey, PRUint32 aData, void* userArg) {
+  nsCAutoString str;
+  nsCOMPtr<IFoo> foo = do_QueryInterface(aKey);
+  foo->GetString(str);
+
+
+  printf("  enumerated \"%s\" = %u\n", str.get(), aData);
+  return PL_DHASH_NEXT;
+}
+
+PLDHashOperator
+nsIEnum2(nsISupports* aKey, PRUint32& aData, void* userArg) {
+  nsCAutoString str;
+  nsCOMPtr<IFoo> foo = do_QueryInterface(aKey);
+  foo->GetString(str);
+
+  printf("  enumerated \"%s\" = %u\n", str.get(), aData);
+  return PL_DHASH_NEXT;
+}
+
+int
+main(void) {
+  // check an nsTHashtable
+  nsTHashtable<EntityToUnicodeEntry> EntityToUnicode;
+
+  printf("Initializing nsTHashtable...");
+  if (!EntityToUnicode.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (1);
+  }
+  printf("OK\n");
+
+  printf("Partially filling nsTHashtable:\n");
+  testTHashtable(EntityToUnicode, 5);
+
+  printf("Enumerate-removing...\n");
+  PRUint32 count = EntityToUnicode.EnumerateEntries(nsTEnumStop, nsnull);
+  if (count != 5) {
+    printf("wrong count\n");
+    exit (7);
+  }
+  printf("OK\n");
+
+  printf("Check enumeration...");
+  count = EntityToUnicode.EnumerateEntries(nsTEnumGo, nsnull);
+  if (count) {
+    printf("entries remain in table!\n");
+    exit (8);
+  }
+  printf("OK\n");
+
+  printf("Filling nsTHashtable:\n");
+  testTHashtable(EntityToUnicode, ENTITY_COUNT);
+
+  printf("Clearing...");
+  EntityToUnicode.Clear();
+  printf("OK\n");
+
+  printf("Check enumeration...");
+  count = EntityToUnicode.EnumerateEntries(nsTEnumGo, nsnull);
+  if (count) {
+    printf("entries remain in table!\n");
+    exit (9);
+  }
+  printf("OK\n");
+
+  //
+  // now check a data-hashtable
+  //
+
+  nsDataHashtable<nsUint32HashKey,const char*> UniToEntity;
+
+  printf("Initializing nsDataHashtable...");
+  if (!UniToEntity.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (10);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  PRUint32 i;
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    if (!UniToEntity.Put(gEntities[i].mUnicode, gEntities[i].mStr)) {
+      printf("FAILED\n");
+      exit (11);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+  const char* str;
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %u...", gEntities[i].mUnicode);
+    if (!UniToEntity.Get(gEntities[i].mUnicode, &str)) {
+      printf("FAILED\n");
+      exit (12);
+    }
+
+    printf("Found %s\n", str);
+  }
+
+  printf("Testing non-existent entries...");
+  if (UniToEntity.Get(99446, &str)) {
+    printf("FOUND! BAD!\n");
+    exit (13);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = UniToEntity.EnumerateRead(nsDEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (14);
+  }
+  
+  printf("Clearing...");
+  UniToEntity.Clear();
+  printf("OK\n");
+
+  printf("Checking count...");
+  count = UniToEntity.Enumerate(nsDEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (15);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check a thread-safe data-hashtable
+  //
+
+  nsDataHashtableMT<nsUint32HashKey,const char*> UniToEntityL;
+
+  printf("Initializing nsDataHashtableMT...");
+  if (!UniToEntityL.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (10);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    if (!UniToEntityL.Put(gEntities[i].mUnicode, gEntities[i].mStr)) {
+      printf("FAILED\n");
+      exit (11);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %u...", gEntities[i].mUnicode);
+    if (!UniToEntityL.Get(gEntities[i].mUnicode, &str)) {
+      printf("FAILED\n");
+      exit (12);
+    }
+
+    printf("Found %s\n", str);
+  }
+
+  printf("Testing non-existent entries...");
+  if (UniToEntityL.Get(99446, &str)) {
+    printf("FOUND! BAD!\n");
+    exit (13);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = UniToEntityL.EnumerateRead(nsDEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (14);
+  }
+  
+  printf("Clearing...");
+  UniToEntityL.Clear();
+  printf("OK\n");
+
+  printf("Checking count...");
+  count = UniToEntityL.Enumerate(nsDEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (15);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check a class-hashtable
+  //
+
+  nsClassHashtable<nsCStringHashKey,TestUniChar> EntToUniClass;
+
+  printf("Initializing nsClassHashtable...");
+  if (!EntToUniClass.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (16);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    TestUniChar* temp = new TestUniChar(gEntities[i].mUnicode);
+
+    if (!EntToUniClass.Put(nsDependentCString(gEntities[i].mStr), temp)) {
+      printf("FAILED\n");
+      delete temp;
+      exit (17);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+  TestUniChar* myChar;
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %s...", gEntities[i].mStr);
+    if (!EntToUniClass.Get(nsDependentCString(gEntities[i].mStr), &myChar)) {
+      printf("FAILED\n");
+      exit (18);
+    }
+
+    printf("Found %c\n", myChar->GetChar());
+  }
+
+  printf("Testing non-existent entries...");
+  if (EntToUniClass.Get(NS_LITERAL_CSTRING("xxxx"), &myChar)) {
+    printf("FOUND! BAD!\n");
+    exit (19);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = EntToUniClass.EnumerateRead(nsCEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (20);
+  }
+  
+  printf("Clearing...\n");
+  EntToUniClass.Clear();
+  printf("  Clearing OK\n");
+
+  printf("Checking count...");
+  count = EntToUniClass.Enumerate(nsCEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (21);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check a thread-safe class-hashtable
+  //
+
+  nsClassHashtableMT<nsCStringHashKey,TestUniChar> EntToUniClassL;
+
+  printf("Initializing nsClassHashtableMT...");
+  if (!EntToUniClassL.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (16);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    TestUniChar* temp = new TestUniChar(gEntities[i].mUnicode);
+
+    if (!EntToUniClassL.Put(nsDependentCString(gEntities[i].mStr), temp)) {
+      printf("FAILED\n");
+      delete temp;
+      exit (17);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %s...", gEntities[i].mStr);
+    if (!EntToUniClassL.Get(nsDependentCString(gEntities[i].mStr), &myChar)) {
+      printf("FAILED\n");
+      exit (18);
+    }
+
+    printf("Found %c\n", myChar->GetChar());
+  }
+
+  printf("Testing non-existent entries...");
+  if (EntToUniClassL.Get(NS_LITERAL_CSTRING("xxxx"), &myChar)) {
+    printf("FOUND! BAD!\n");
+    exit (19);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = EntToUniClassL.EnumerateRead(nsCEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (20);
+  }
+  
+  printf("Clearing...\n");
+  EntToUniClassL.Clear();
+  printf("  Clearing OK\n");
+
+  printf("Checking count...");
+  count = EntToUniClassL.Enumerate(nsCEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (21);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check a data-hashtable with an interface key
+  //
+
+  nsDataHashtable<nsISupportsHashKey,PRUint32> EntToUniClass2;
+
+  printf("Initializing nsDataHashtable with interface key...");
+  if (!EntToUniClass2.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (22);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  nsCOMArray<IFoo> fooArray;
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    nsCOMPtr<IFoo> foo;
+    CreateIFoo(getter_AddRefs(foo));
+    foo->SetString(nsDependentCString(gEntities[i].mStr));
+    
+    
+    fooArray.InsertObjectAt(foo, i);
+
+    if (!EntToUniClass2.Put(foo, gEntities[i].mUnicode)) {
+      printf("FAILED\n");
+      exit (23);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+  PRUint32 myChar2;
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %s...", gEntities[i].mStr);
+    
+    if (!EntToUniClass2.Get(fooArray[i], &myChar2)) {
+      printf("FAILED\n");
+      exit (24);
+    }
+
+    printf("Found %c\n", myChar2);
+  }
+
+  printf("Testing non-existent entries...");
+  if (EntToUniClass2.Get((nsISupports*) 0x55443316, &myChar2)) {
+    printf("FOUND! BAD!\n");
+    exit (25);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = EntToUniClass2.EnumerateRead(nsIEnum2Read, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (26);
+  }
+  
+  printf("Clearing...\n");
+  EntToUniClass2.Clear();
+  printf("  Clearing OK\n");
+
+  printf("Checking count...");
+  count = EntToUniClass2.Enumerate(nsIEnum2, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (27);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check an interface-hashtable with an PRUint32 key
+  //
+
+  nsInterfaceHashtable<nsUint32HashKey,IFoo> UniToEntClass2;
+
+  printf("Initializing nsInterfaceHashtable...");
+  if (!UniToEntClass2.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (28);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    nsCOMPtr<IFoo> foo;
+    CreateIFoo(getter_AddRefs(foo));
+    foo->SetString(nsDependentCString(gEntities[i].mStr));
+    
+    if (!UniToEntClass2.Put(gEntities[i].mUnicode, foo)) {
+      printf("FAILED\n");
+      exit (29);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %s...", gEntities[i].mStr);
+    
+    nsCOMPtr<IFoo> myEnt;
+    if (!UniToEntClass2.Get(gEntities[i].mUnicode, getter_AddRefs(myEnt))) {
+      printf("FAILED\n");
+      exit (30);
+    }
+    
+    nsCAutoString str;
+    myEnt->GetString(str);
+    printf("Found %s\n", str.get());
+  }
+
+  printf("Testing non-existent entries...");
+  nsCOMPtr<IFoo> myEnt;
+  if (UniToEntClass2.Get(9462, getter_AddRefs(myEnt))) {
+    printf("FOUND! BAD!\n");
+    exit (31);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = UniToEntClass2.EnumerateRead(nsIEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (32);
+  }
+  
+  printf("Clearing...\n");
+  UniToEntClass2.Clear();
+  printf("  Clearing OK\n");
+
+  printf("Checking count...");
+  count = UniToEntClass2.Enumerate(nsIEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (33);
+  }
+
+  printf("OK\n");
+
+  //
+  // now check a thread-safe interface hashtable
+  //
+
+  nsInterfaceHashtableMT<nsUint32HashKey,IFoo> UniToEntClass2L;
+
+  printf("Initializing nsInterfaceHashtableMT...");
+  if (!UniToEntClass2L.Init(ENTITY_COUNT)) {
+    printf("FAILED\n");
+    exit (28);
+  }
+  printf("OK\n");
+
+  printf("Filling hash with %zd entries.\n", ENTITY_COUNT);
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Putting entry %u...", gEntities[i].mUnicode);
+    nsCOMPtr<IFoo> foo;
+    CreateIFoo(getter_AddRefs(foo));
+    foo->SetString(nsDependentCString(gEntities[i].mStr));
+    
+    if (!UniToEntClass2L.Put(gEntities[i].mUnicode, foo)) {
+      printf("FAILED\n");
+      exit (29);
+    }
+    printf("OK...\n");
+  }
+
+  printf("Testing Get:\n");
+
+  for (i = 0; i < ENTITY_COUNT; ++i) {
+    printf("  Getting entry %s...", gEntities[i].mStr);
+    
+    nsCOMPtr<IFoo> myEnt;
+    if (!UniToEntClass2L.Get(gEntities[i].mUnicode, getter_AddRefs(myEnt))) {
+      printf("FAILED\n");
+      exit (30);
+    }
+    
+    nsCAutoString str;
+    myEnt->GetString(str);
+    printf("Found %s\n", str.get());
+  }
+
+  printf("Testing non-existent entries...");
+  if (UniToEntClass2L.Get(9462, getter_AddRefs(myEnt))) {
+    printf("FOUND! BAD!\n");
+    exit (31);
+  }
+      
+  printf("not found; good.\n");
+      
+  printf("Enumerating:\n");
+  
+  count = UniToEntClass2L.EnumerateRead(nsIEnumRead, nsnull);
+  if (count != ENTITY_COUNT) {
+    printf("  Bad count!\n");
+    exit (32);
+  }
+  
+  printf("Clearing...\n");
+  UniToEntClass2L.Clear();
+  printf("  Clearing OK\n");
+
+  printf("Checking count...");
+  count = UniToEntClass2L.Enumerate(nsIEnum, nsnull);
+  if (count) {
+    printf("  Clear did not remove all entries.\n");
+    exit (33);
+  }
+
+  printf("OK\n");
+
+  return 0;
+}