Bug 1313475 - Part 2: Convert TestNsRefPtr to a gtest. r=froydnj
authorEric Rahm <erahm@mozilla.com>
Fri, 04 Nov 2016 16:23:23 -0700
changeset 351265 ce050e1aab2f73e214566fdb9bd00e2d45aff281
parent 351264 43bc6883159435d392d1340daf3874a4c9d9bba5
child 351266 b64e935b6316c2ebae0566d0577f0996d9729fc5
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1313475
milestone52.0a1
Bug 1313475 - Part 2: Convert TestNsRefPtr to a gtest. r=froydnj This converts the tests over to gtests. MozReview-Commit-ID: 3oXY9kUZdB6
testing/cppunittest.ini
xpcom/tests/TestNsRefPtr.cpp
xpcom/tests/gtest/TestNsRefPtr.cpp
xpcom/tests/gtest/moz.build
xpcom/tests/moz.build
--- a/testing/cppunittest.ini
+++ b/testing/cppunittest.ini
@@ -40,17 +40,16 @@ skip-if = os != 'win'
 [TestJemalloc]
 [TestLinkedList]
 [TestMacroArgs]
 [TestMacroForEach]
 [TestMathAlgorithms]
 [TestMaybe]
 [TestNativeXMLHttpRequest]
 skip-if = os == 'b2g' || os == 'android'  #Bug 919642
-[TestNsRefPtr]
 [TestNtPathToDosPath]
 skip-if = os != 'win'
 [TestObserverArray]
 [TestObserverService]
 [TestPLDHash]
 skip-if = os == 'b2g'  #Bug 1038197
 [TestPair]
 [TestPlainTextSerializer]
rename from xpcom/tests/TestNsRefPtr.cpp
rename to xpcom/tests/gtest/TestNsRefPtr.cpp
--- a/xpcom/tests/TestNsRefPtr.cpp
+++ b/xpcom/tests/gtest/TestNsRefPtr.cpp
@@ -1,21 +1,24 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include <assert.h>
-#include <stdio.h>
+#include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
 #include "nsISupports.h"
 #include "nsQueryObject.h"
 #include "mozilla/Unused.h"
 
+#include "gtest/gtest.h"
+
+namespace TestNsRefPtr
+{
+
 #define NS_FOO_IID \
 { 0x6f7652e0,  0xee43, 0x11d1, \
   { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
 
 class Foo : public nsISupports
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_FOO_IID)
@@ -26,123 +29,71 @@ public:
   virtual ~Foo();
 
   NS_IMETHOD_(MozExternalRefCountType) AddRef();
   NS_IMETHOD_(MozExternalRefCountType) Release();
   NS_IMETHOD QueryInterface( const nsIID&, void** );
   void MemberFunction( int, int*, int& );
   virtual void VirtualMemberFunction( int, int*, int& );
   virtual void VirtualConstMemberFunction( int, int*, int& ) const;
-  static void print_totals();
 
   void NonconstMethod() {}
   void ConstMethod() const {}
 
-private:
-  unsigned int refcount_;
+  int refcount_;
 
-  static unsigned int total_constructions_;
-  static unsigned int total_destructions_;
+  static int total_constructions_;
+  static int total_destructions_;
+  static int total_addrefs_;
+  static int total_queries_;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(Foo, NS_FOO_IID)
 
-class Bar;
-
-// some types I'll need
-typedef unsigned long NS_RESULT;
-
-// some functions I'll need (and define below)
-nsresult  CreateFoo( void** );
-nsresult  CreateBar( void** result );
-void  AnFooPtrPtrContext( Foo** );
-void	AnISupportsPtrPtrContext( nsISupports** );
-void  AVoidPtrPtrContext( void** );
-void  set_a_Foo( RefPtr<Foo>* result );
-RefPtr<Foo>  return_a_Foo();
-
-
-
-
-unsigned int Foo::total_constructions_;
-unsigned int Foo::total_destructions_;
-
-class test_message
-{
-  public:
-    test_message()
-    {
-      printf("BEGIN unit tests for |nsRefPtr|, compiled " __DATE__ "\n");
-    }
-
-    ~test_message()
-    {
-      Foo::print_totals();
-      printf("END unit tests for |nsRefPtr|.\n");
-    }
-};
-
-test_message gTestMessage;
-
-
-void
-Foo::print_totals()
-{
-  printf("total constructions/destructions --> %d/%d\n", 
-      total_constructions_, total_destructions_);
-}
+int Foo::total_constructions_;
+int Foo::total_destructions_;
+int Foo::total_addrefs_;
+int Foo::total_queries_;
 
 Foo::Foo()
   : refcount_(0)
 {
   ++total_constructions_;
-  printf("  new Foo@%p [#%d]\n",
-      static_cast<void*>(this), total_constructions_);
 }
 
 Foo::~Foo()
 {
   ++total_destructions_;
-  printf("Foo@%p::~Foo() [#%d]\n",
-      static_cast<void*>(this), total_destructions_);
 }
 
 MozExternalRefCountType
 Foo::AddRef()
 {
   ++refcount_;
-  printf("Foo@%p::AddRef(), refcount --> %d\n",
-      static_cast<void*>(this), refcount_);
+  ++total_addrefs_;
   return refcount_;
 }
 
 MozExternalRefCountType
 Foo::Release()
 {
   int newcount = --refcount_;
   if ( newcount == 0 )
-    printf(">>");
-
-  printf("Foo@%p::Release(), refcount --> %d\n",
-      static_cast<void*>(this), refcount_);
-
-  if ( newcount == 0 )
   {
-    printf("  delete Foo@%p\n", static_cast<void*>(this));
-    printf("<<Foo@%p::Release()\n", static_cast<void*>(this));
     delete this;
   }
 
   return newcount;
 }
 
 nsresult
 Foo::QueryInterface( const nsIID& aIID, void** aResult )
 {
-  printf("Foo@%p::QueryInterface()\n", static_cast<void*>(this));
+  ++total_queries_;
+
   nsISupports* rawPtr = 0;
   nsresult status = NS_OK;
 
   if ( aIID.Equals(NS_GET_IID(Foo)) )
     rawPtr = this;
   else
   {
     nsID iid_of_ISupports = NS_ISUPPORTS_IID;
@@ -156,69 +107,56 @@ Foo::QueryInterface( const nsIID& aIID, 
   *aResult = rawPtr;
 
   return status;
 }
 
 void
 Foo::MemberFunction( int aArg1, int* aArgPtr, int& aArgRef )
 {
-  printf("member function is invoked.\n");
 }
 
 void
 Foo::VirtualMemberFunction( int aArg1, int* aArgPtr, int& aArgRef )
 {
-  printf("virtual member function is invoked.\n");
 }
 
 void
 Foo::VirtualConstMemberFunction( int aArg1, int* aArgPtr, int& aArgRef ) const
 {
-  printf("virtual const member function is invoked.\n");
 }
 
 nsresult
 CreateFoo( void** result )
   // a typical factory function (that calls AddRef)
 {
-  printf(">>CreateFoo() --> ");
   Foo* foop = new Foo;
-  printf("Foo@%p\n", static_cast<void*>(foop));
 
   foop->AddRef();
   *result = foop;
 
-  printf("<<CreateFoo()\n");
   return NS_OK;
 }
 
 void
 set_a_Foo( RefPtr<Foo>* result )
 {
-  printf(">>set_a_Foo()\n");
   assert(result);
 
   RefPtr<Foo> foop( do_QueryObject(new Foo) );
   *result = foop;
-  printf("<<set_a_Foo()\n");
 }
 
 RefPtr<Foo>
 return_a_Foo()
 {
-  printf(">>return_a_Foo()\n");
   RefPtr<Foo> foop( do_QueryObject(new Foo) );
-  printf("<<return_a_Foo()\n");
   return foop;
 }
 
-
-
-
 #define NS_BAR_IID \
 { 0x6f7652e1,  0xee43, 0x11d1, \
   { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
 
 class Bar : public Foo
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_BAR_IID)
@@ -226,34 +164,43 @@ public:
 public:
   Bar();
   virtual ~Bar();
 
   NS_IMETHOD QueryInterface( const nsIID&, void** ) override;
 
   virtual void VirtualMemberFunction( int, int*, int& ) override;
   virtual void VirtualConstMemberFunction( int, int*, int& ) const override;
+
+  static int total_constructions_;
+  static int total_destructions_;
+  static int total_queries_;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(Bar, NS_BAR_IID)
 
+int Bar::total_constructions_;
+int Bar::total_destructions_;
+int Bar::total_queries_;
+
 Bar::Bar()
 {
-  printf("  new Bar@%p\n", static_cast<void*>(this));
+  ++total_constructions_;
 }
 
 Bar::~Bar()
 {
-  printf("Bar@%p::~Bar()\n", static_cast<void*>(this));
+  ++total_destructions_;
 }
 
 nsresult
 Bar::QueryInterface( const nsID& aIID, void** aResult )
 {
-  printf("Bar@%p::QueryInterface()\n", static_cast<void*>(this));
+  ++total_queries_;
+
   nsISupports* rawPtr = 0;
   nsresult status = NS_OK;
 
   if ( aIID.Equals(NS_GET_IID(Bar)) )
     rawPtr = this;
   else if ( aIID.Equals(NS_GET_IID(Foo)) )
     rawPtr = static_cast<Foo*>(this);
   else
@@ -269,91 +216,189 @@ Bar::QueryInterface( const nsID& aIID, v
   *aResult = rawPtr;
 
   return status;
 }
 
 void
 Bar::VirtualMemberFunction( int aArg1, int* aArgPtr, int& aArgRef )
 {
-  printf("override virtual member function is invoked.\n");
 }
 void
 Bar::VirtualConstMemberFunction( int aArg1, int* aArgPtr, int& aArgRef ) const
 {
-  printf("override virtual const member function is invoked.\n");
 }
 
-nsresult
-CreateBar( void** result )
-  // a typical factory function (that calls AddRef)
+} // namespace TestNsRefPtr
+
+using namespace TestNsRefPtr;
+
+TEST(nsRefPtr, AddRefAndRelease)
 {
-  printf(">>CreateBar() --> ");
-  Bar* barp = new Bar;
-  printf("Bar@%p\n", static_cast<void*>(barp));
+  Foo::total_constructions_ = 0;
+  Foo::total_destructions_ = 0;
+
+  {
+    RefPtr<Foo> foop( do_QueryObject(new Foo) );
+    ASSERT_EQ(Foo::total_constructions_, 1);
+    ASSERT_EQ(Foo::total_destructions_, 0);
+    ASSERT_EQ(foop->refcount_, 1);
+
+    foop = do_QueryObject(new Foo);
+    ASSERT_EQ(Foo::total_constructions_, 2);
+    ASSERT_EQ(Foo::total_destructions_, 1);
+
+    // [Shouldn't compile] Is it a compile time error to try to |AddRef| by hand?
+    //foop->AddRef();
+
+    // [Shouldn't compile] Is it a compile time error to try to |Release| be hand?
+    //foop->Release();
 
-  barp->AddRef();
-  *result = barp;
+    // [Shouldn't compile] Is it a compile time error to try to |delete| an |nsCOMPtr|?
+    //delete foop;
+
+    static_cast<Foo*>(foop)->AddRef();
+    ASSERT_EQ(foop->refcount_, 2);
+
+    static_cast<Foo*>(foop)->Release();
+    ASSERT_EQ(foop->refcount_, 1);
+  }
 
-  printf("<<CreateBar()\n");
-  return NS_OK;
+  ASSERT_EQ(Foo::total_destructions_, 2);
+
+  {
+    RefPtr<Foo> fooP( do_QueryObject(new Foo) );
+    ASSERT_EQ(Foo::total_constructions_, 3);
+    ASSERT_EQ(Foo::total_destructions_, 2);
+    ASSERT_EQ(fooP->refcount_, 1);
+
+    Foo::total_addrefs_ = 0;
+    RefPtr<Foo> fooP2( fooP.forget() );
+    ASSERT_EQ(Foo::total_addrefs_, 0);
+  }
 }
 
-  void
-AnFooPtrPtrContext( Foo** )
+TEST(nsRefPtr, VirtualDestructor)
 {
-}
+  Bar::total_destructions_ = 0;
 
-  void
-AVoidPtrPtrContext( void** )
-{
-}
+  {
+    RefPtr<Foo> foop( do_QueryObject(new Bar) );
+    mozilla::Unused << foop;
+  }
 
-  void
-AnISupportsPtrPtrContext( nsISupports** )
-{
+  ASSERT_EQ(Bar::total_destructions_, 1);
 }
 
-nsresult
-TestBloat_Raw_Unsafe()
+TEST(nsRefPtr, Equality)
 {
-  Bar* barP = 0;
-  nsresult result = CreateBar(reinterpret_cast<void**>(&barP));
+  Foo::total_constructions_ = 0;
+  Foo::total_destructions_ = 0;
 
-  if ( barP )
   {
-    Foo* fooP = 0;
-    if ( NS_SUCCEEDED( result = barP->QueryInterface(NS_GET_IID(Foo), reinterpret_cast<void**>(&fooP)) ) )
-    {
-      fooP->print_totals();
-      NS_RELEASE(fooP);
-    }
+    RefPtr<Foo> foo1p( do_QueryObject(new Foo) );
+    RefPtr<Foo> foo2p( do_QueryObject(new Foo) );
+
+    ASSERT_EQ(Foo::total_constructions_, 2);
+    ASSERT_EQ(Foo::total_destructions_, 0);
+
+    ASSERT_NE(foo1p, foo2p);
+
+    ASSERT_NE(foo1p, nullptr);
+    ASSERT_NE(nullptr, foo1p);
+    ASSERT_FALSE(foo1p == nullptr);
+    ASSERT_FALSE(nullptr == foo1p);
 
-    NS_RELEASE(barP);
+    ASSERT_NE(foo1p, foo2p.get());
+
+    foo1p = foo2p;
+
+    ASSERT_EQ(Foo::total_constructions_, 2);
+    ASSERT_EQ(Foo::total_destructions_, 1);
+    ASSERT_EQ(foo1p, foo2p);
+
+    ASSERT_EQ(foo2p, foo2p.get());
+
+    ASSERT_EQ(RefPtr<Foo>(foo2p.get()), foo2p);
+
+    ASSERT_TRUE(foo1p);
   }
 
-  return result;
+  ASSERT_EQ(Foo::total_constructions_, 2);
+  ASSERT_EQ(Foo::total_destructions_, 2);
 }
 
+TEST(nsRefPtr, AddRefHelpers)
+{
+  Foo::total_addrefs_ = 0;
 
-static
-nsresult
-TestBloat_Smart()
-{
-  RefPtr<Bar> barP;
-  nsresult result = CreateBar( getter_AddRefs(barP) );
+  {
+    Foo* raw_foo1p = new Foo;
+    raw_foo1p->AddRef();
+
+    Foo* raw_foo2p = new Foo;
+    raw_foo2p->AddRef();
+
+    ASSERT_EQ(Foo::total_addrefs_, 2);
+
+    RefPtr<Foo> foo1p( dont_AddRef(raw_foo1p) );
+
+    ASSERT_EQ(Foo::total_addrefs_, 2);
+
+    RefPtr<Foo> foo2p;
+    foo2p = dont_AddRef(raw_foo2p);
+
+    ASSERT_EQ(Foo::total_addrefs_, 2);
+  }
+
+  {
+    // Test that various assignment helpers compile.
+    RefPtr<Foo> foop;
+    CreateFoo( RefPtrGetterAddRefs<Foo>(foop) );
+    CreateFoo( getter_AddRefs(foop) );
+    set_a_Foo(address_of(foop));
+    foop = return_a_Foo();
+  }
+}
 
-  RefPtr<Foo> fooP( do_QueryObject(barP, &result) );
+TEST(nsRefPtr, QueryInterface)
+{
+  Foo::total_queries_ = 0;
+  Bar::total_queries_ = 0;
+
+  {
+    RefPtr<Foo> fooP;
+    fooP = do_QueryObject(new Foo);
+    ASSERT_EQ(Foo::total_queries_, 1);
+  }
+
+  {
+    RefPtr<Foo> fooP;
+    fooP = do_QueryObject(new Foo);
+    ASSERT_EQ(Foo::total_queries_, 2);
 
-  if ( fooP )
-    fooP->print_totals();
+    RefPtr<Foo> foo2P;
+    foo2P = fooP;
+    ASSERT_EQ(Foo::total_queries_, 2);
+  }
+
+  {
+    RefPtr<Bar> barP( do_QueryObject(new Bar) );
+    ASSERT_EQ(Bar::total_queries_, 1);
 
-  return result;
+    RefPtr<Foo> fooP( do_QueryObject(barP) );
+    ASSERT_TRUE(fooP);
+    ASSERT_EQ(Foo::total_queries_, 2);
+    ASSERT_EQ(Bar::total_queries_, 2);
+  }
 }
 
+// -------------------------------------------------------------------------
+// TODO(ER): The following tests should be moved to MFBT.
+
 #define NS_INLINE_DECL_THREADSAFE_MUTABLE_REFCOUNTING(_class)               \
 public:                                                                     \
 NS_METHOD_(MozExternalRefCountType) AddRef(void) const {                    \
   MOZ_ASSERT_TYPE_OK_FOR_REFCOUNTING(_class)                                \
   MOZ_RELEASE_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt");              \
   nsrefcnt count = ++mRefCnt;                                               \
   return (nsrefcnt) count;                                                  \
 }                                                                           \
@@ -371,310 +416,64 @@ mutable ::mozilla::ThreadSafeAutoRefCnt 
 public:
 
 class ObjectForConstPtr
 {
   private:
     // Reference-counted classes cannot have public destructors.
     ~ObjectForConstPtr()
     {
-      printf("ObjectForConstPtr@%p::~ObjectForConstPtr()\n", static_cast<void*>(this));
     }
   public:
     NS_INLINE_DECL_THREADSAFE_MUTABLE_REFCOUNTING(ObjectForConstPtr)
       void ConstMemberFunction( int aArg1, int* aArgPtr, int& aArgRef ) const
       {
-        printf("const member function is invoked by RefPtr<const T>->*.\n");
       }
 };
 #undef NS_INLINE_DECL_THREADSAFE_MUTABLE_REFCOUNTING
 
-
-RefPtr<Foo> gFoop;
-
-void AddRefAndRelease()
-{
-  {
-    printf("\n### Test  1: will a |nsCOMPtr| call |AddRef| on a pointer assigned into it?\n");
-    RefPtr<Foo> foop( do_QueryObject(new Foo) );
-
-    printf("\n### Test  2: will a |nsCOMPtr| |Release| its old pointer when a new one is assigned in?\n");
-    foop = do_QueryObject(new Foo);
-
-    // [Shouldn't compile] Is it a compile time error to try to |AddRef| by hand?
-    //foop->AddRef();
-
-    // [Shouldn't compile] Is it a compile time error to try to |Release| be hand?
-    //foop->Release();
-
-    // [Shouldn't compile] Is it a compile time error to try to |delete| an |nsCOMPtr|?
-    //delete foop;
-
-    printf("\n### Test  3: can you |AddRef| if you must?\n");
-    static_cast<Foo*>(foop)->AddRef();
-
-    printf("\n### Test  4: can you |Release| if you must?\n");
-    static_cast<Foo*>(foop)->Release();
-
-    printf("\n### Test  5: will a |nsCOMPtr| |Release| when it goes out of scope?\n");
-  }
-
-  {
-    printf("\n### setup for Test 24\n");
-    RefPtr<Foo> fooP( do_QueryObject(new Foo) );
-
-    printf("### Test 24: does |forget| avoid an AddRef/Release when assigning to another nsCOMPtr?\n");
-    RefPtr<Foo> fooP2( fooP.forget() );
-  }
-  printf("### End Test 24\n");
-}
-
-void VirtualDestructor()
-{
-  {
-    printf("\n### Test  6: will a |nsCOMPtr| call the correct destructor?\n");
-    RefPtr<Foo> foop( do_QueryObject(new Bar) );
-    mozilla::Unused << foop;
-  }
-}
-
-void Equality()
+namespace TestNsRefPtr
 {
-  {
-    printf("\n### Test  7: can you compare one |nsCOMPtr| with another [!=]?\n");
-
-    RefPtr<Foo> foo1p( do_QueryObject(new Foo) );
-
-    // [Shouldn't compile] Is it a compile time error to omit |getter_[doesnt_]AddRef[s]|?
-    //AnFooPtrPtrContext(&foo1p);
-
-    // [Shouldn't compile] Is it a compile time error to omit |getter_[doesnt_]AddRef[s]|?
-    //AVoidPtrPtrContext(&foo1p);
-
-    RefPtr<Foo> foo2p( do_QueryObject(new Foo) );
-
-    if ( foo1p != foo2p )
-      printf("foo1p != foo2p\n");
-    else
-      printf("foo1p == foo2p\n");
-
-    printf("\n### Test  7.5: can you compare a |nsCOMPtr| with nullptr [!=]?\n");
-    if ( foo1p != nullptr )
-      printf("foo1p != nullptr\n");
-    if ( nullptr != foo1p )
-      printf("nullptr != foo1p\n");
-    if ( foo1p == nullptr )
-      printf("foo1p == nullptr\n");
-    if ( nullptr == foo1p )
-      printf("nullptr == foo1p\n");
-
-
-    Foo* raw_foo2p = foo2p.get();
-
-    printf("\n### Test  8: can you compare a |nsCOMPtr| with a raw interface pointer [!=]?\n");
-    if ( foo1p.get() != raw_foo2p )
-      printf("foo1p != raw_foo2p\n");
-    else
-      printf("foo1p == raw_foo2p\n");
-
-
-    printf("\n### Test  9: can you assign one |nsCOMPtr| into another?\n");
-    foo1p = foo2p;
-
-    printf("\n### Test 10: can you compare one |nsCOMPtr| with another [==]?\n");
-    if ( foo1p == foo2p )
-      printf("foo1p == foo2p\n");
-    else
-      printf("foo1p != foo2p\n");
-
-    printf("\n### Test 11: can you compare a |nsCOMPtr| with a raw interface pointer [==]?\n");
-    if ( raw_foo2p == foo2p.get() )
-      printf("raw_foo2p == foo2p\n");
-    else
-      printf("raw_foo2p != foo2p\n");
+void AnFooPtrPtrContext(Foo**) { }
+void AVoidPtrPtrContext(void**) { }
+} // namespace TestNsRefPtr
 
-#if 1
-    printf("\n### Test 11.5: can you compare a |nsCOMPtr| with a raw interface pointer [==]?\n");
-    if ( RefPtr<Foo>( raw_foo2p ) == foo2p )
-      printf("raw_foo2p == foo2p\n");
-    else
-      printf("raw_foo2p != foo2p\n");
-#endif
-
-    printf("\n### Test 12: bare pointer test?\n");
-    if ( foo1p )
-      printf("foo1p is not NULL\n");
-    else
-      printf("foo1p is NULL\n");
-
-    printf("\n### Test 13: null pointer test?\n");
-    if ( foo1p == nullptr )
-      printf("foo1p is NULL\n");
-    else
-      printf("foo1p is not NULL\n");
-
-#if 0
-    if ( foo1p == 1 )
-      printf("foo1p allowed compare with in\n");
-#endif
-
-    printf("\n### Test 14: how about when two |nsCOMPtr|s referring to the same object go out of scope?\n");
-  }
-}
-
-void AddRefHelpers()
+TEST(nsRefPtr, RefPtrCompilationTests)
 {
-  {
-    printf("\n### Test 15,16 ...setup...\n");
-    Foo* raw_foo1p = new Foo;
-    raw_foo1p->AddRef();
-
-    Foo* raw_foo2p = new Foo;
-    raw_foo2p->AddRef();
-
-    printf("\n### Test 15: what if I don't want to |AddRef| when I construct?\n");
-    RefPtr<Foo> foo1p( dont_AddRef(raw_foo1p) );
-    //RefPtr<Foo> foo1p = dont_AddRef(raw_foo1p);
-
-    printf("\n### Test 16: what if I don't want to |AddRef| when I assign in?\n");
-    RefPtr<Foo> foo2p;
-    foo2p = dont_AddRef(raw_foo2p);
-  }
-
-  {
-    printf("\n### setup for Test 17\n");
-    RefPtr<Foo> foop;
-    printf("### Test 17: basic parameter behavior?\n");
-    CreateFoo( RefPtrGetterAddRefs<Foo>(foop) );
-  }
-  printf("### End Test 17\n");
-
 
   {
-    printf("\n### setup for Test 18\n");
-    RefPtr<Foo> foop;
-    printf("### Test 18: basic parameter behavior, using the short form?\n");
-    CreateFoo( getter_AddRefs(foop) );
-  }
-  printf("### End Test 18\n");
-
-
-  {
-    printf("\n### setup for Test 19, 20\n");
-    RefPtr<Foo> foop;
-    printf("### Test 19: reference parameter behavior?\n");
-    set_a_Foo(address_of(foop));
-
-    printf("### Test 20: return value behavior?\n");
-    foop = return_a_Foo();
-  }
-  printf("### End Test 19, 20\n");
-}
-
-void QueryInterface()
-{
-  {
-    printf("\n### setup for Test 21\n");
-    RefPtr<Foo> fooP;
-
-    printf("### Test 21: is |QueryInterface| called on assigning in a raw pointer?\n");
-    fooP = do_QueryObject(new Foo);
-  }
-  printf("### End Test 21\n");
-
-  {
-    printf("\n### setup for Test 22\n");
-    RefPtr<Foo> fooP;
-    fooP = do_QueryObject(new Foo);
-
-    RefPtr<Foo> foo2P;
-
-    printf("### Test 22: is |QueryInterface| _not_ called when assigning in a smart-pointer of the same type?\n");
-    foo2P = fooP;
-  }
-  printf("### End Test 22\n");
-
-  {
-    printf("\n### setup for Test 23\n");
-    RefPtr<Bar> barP( do_QueryObject(new Bar) );
-
-    printf("### Test 23: is |QueryInterface| called when assigning in a smart-pointer of a different type?\n");
-
-    RefPtr<Foo> fooP( do_QueryObject(barP) );
-    if ( fooP )
-      printf("an Bar* is an Foo*\n");
-  }
-  printf("### End Test 23\n");
-}
-
-void TestsThatWillBeDeleted()
-{
-  {
     RefPtr<Foo> fooP;
 
     AnFooPtrPtrContext( getter_AddRefs(fooP) );
     AVoidPtrPtrContext( getter_AddRefs(fooP) );
   }
 
   {
-    printf("\n### setup for Test 25\n");
     RefPtr<Foo> fooP(new Foo);
-
-    printf("### Test 25: can you construct an |RefPtr<const T>| from an |RefPtr<T>|?\n");
     RefPtr<const Foo> constFooP = fooP;
-
-    printf("### Test 25: can you call a non-const method on an |RefPtr<const T>|?\n");
     constFooP->ConstMethod();
 
     // [Shouldn't compile] Is it a compile time error to call a non-const method on an |RefPtr<const T>|?
     //constFooP->NonconstMethod();
 
     // [Shouldn't compile] Is it a compile time error to construct an |RefPtr<T> from an |RefPtr<const T>|?
     //RefPtr<Foo> otherFooP(constFooP);
   }
 
-  printf("\n### Test 26: will a static |nsCOMPtr| |Release| before program termination?\n");
-  gFoop = do_QueryObject(new Foo);
-
   {
-    printf("\n### setup for Test 26, 27, 28\n");
     RefPtr<Foo> foop = new Foo;
     RefPtr<Foo> foop2 = new Bar;
     RefPtr<const ObjectForConstPtr> foop3 = new ObjectForConstPtr;
     int test = 1;
     void (Foo::*fPtr)( int, int*, int& ) = &Foo::MemberFunction;
     void (Foo::*fVPtr)( int, int*, int& ) = &Foo::VirtualMemberFunction;
     void (Foo::*fVCPtr)( int, int*, int& ) const = &Foo::VirtualConstMemberFunction;
     void (ObjectForConstPtr::*fCPtr2)( int, int*, int& ) const = &ObjectForConstPtr::ConstMemberFunction;
 
-    printf("### Test 26: invoke member function via operator ->*\n");
     (foop->*fPtr)(test, &test, test);
-    printf("### End Test 26\n");
-
-    printf("### Test 27: invoke virtual / virtual const member function via operator ->*\n");
     (foop2->*fVPtr)(test, &test, test);
     (foop2->*fVCPtr)(test, &test, test);
-    printf("### End Test 27\n");
-
-    printf("### Test 28: invoke virtual const member function via RefPtr<const T> operator ->*\n");
     (foop3->*fCPtr2)(test, &test, test);
-    printf("### End Test 28\n");
   }
-}
-
-int
-main()
-{
-  printf(">>main()\n");
 
-  printf("sizeof(RefPtr<Foo>) --> %u\n", unsigned(sizeof(RefPtr<Foo>)));
-
-  TestBloat_Raw_Unsafe();
-  TestBloat_Smart();
-  AddRefAndRelease();
-  VirtualDestructor();
-  Equality();
-  AddRefHelpers();
-  QueryInterface();
-
-  printf("<<main()\n");
-  return 0;
+  // Looks like everything ran.
+  ASSERT_TRUE(true);
 }
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -39,15 +39,16 @@ UNIFIED_SOURCES += [
 ]
 
 # Compile TestAllocReplacement separately so Windows headers don't pollute
 # the global namespace for other files.
 SOURCES += [
     'TestAllocReplacement.cpp',
     'TestCOMPtr.cpp', # Redefines IFoo and IBar
     'TestHashtables.cpp', # Redefines IFoo
+    'TestNsRefPtr.cpp', # Redefines Foo
 ]
 
 LOCAL_INCLUDES += [
     '../../base',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -41,17 +41,16 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 if CONFIG['WRAP_STL_INCLUDES'] and not CONFIG['CLANG_CL']:
     GeckoSimplePrograms([
         'TestSTLWrappers',
     ])
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 GeckoCppUnitTests([
-    'TestNsRefPtr',
     'TestObserverArray',
     'TestObserverService',
     'TestStringAPI',
     'TestTArray',
     'TestTextFormatter',
     'TestThreadUtils',
     'TestTimers'
 ])