diff --git a/ipc/ipdl/test/cxx/PTestSanity.ipdl b/ipc/ipdl/test/cxx/PTestSanity.ipdl deleted file mode 100644 index 3b3e130d4ab4..000000000000 --- a/ipc/ipdl/test/cxx/PTestSanity.ipdl +++ /dev/null @@ -1,21 +0,0 @@ - -include "mozilla/_ipdltest/TestSanity.h"; - -namespace mozilla { -namespace _ipdltest { - - -[ManualDealloc, ChildImpl="TestSanityChild", ParentImpl="TestSanityParent"] -protocol PTestSanity { - -child: - async Ping(int zero, float zeroPtFive, int8_t dummy); - async __delete__(); - -parent: - async Pong(int one, float zeroPtTwoFive, uint8_t dummy); -}; - - -} // namespace mozilla -} // namespace _ipdltest diff --git a/ipc/ipdl/test/cxx/TestSanity.cpp b/ipc/ipdl/test/cxx/TestSanity.cpp deleted file mode 100644 index ba1920fdcc2a..000000000000 --- a/ipc/ipdl/test/cxx/TestSanity.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "TestSanity.h" - -#include "IPDLUnitTests.h" // fail etc. - -namespace mozilla { -namespace _ipdltest { - -//----------------------------------------------------------------------------- -// parent - -TestSanityParent::TestSanityParent() { MOZ_COUNT_CTOR(TestSanityParent); } - -TestSanityParent::~TestSanityParent() { MOZ_COUNT_DTOR(TestSanityParent); } - -void TestSanityParent::Main() { - if (!SendPing(0, 0.5f, 0)) fail("sending Ping"); -} - -mozilla::ipc::IPCResult TestSanityParent::RecvPong(const int& one, - const float& zeroPtTwoFive, - const uint8_t& /*unused*/) { - if (1 != one) fail("invalid argument `%d', should have been `1'", one); - - if (0.25f != zeroPtTwoFive) - fail("invalid argument `%g', should have been `0.25'", zeroPtTwoFive); - - Close(); - - return IPC_OK(); -} - -//----------------------------------------------------------------------------- -// child - -TestSanityChild::TestSanityChild() { MOZ_COUNT_CTOR(TestSanityChild); } - -TestSanityChild::~TestSanityChild() { MOZ_COUNT_DTOR(TestSanityChild); } - -mozilla::ipc::IPCResult TestSanityChild::RecvPing(const int& zero, - const float& zeroPtFive, - const int8_t& /*unused*/) { - if (0 != zero) fail("invalid argument `%d', should have been `0'", zero); - - if (0.5f != zeroPtFive) - fail("invalid argument `%g', should have been `0.5'", zeroPtFive); - - if (!SendPong(1, 0.25f, 0)) fail("sending Pong"); - return IPC_OK(); -} - -} // namespace _ipdltest -} // namespace mozilla diff --git a/ipc/ipdl/test/cxx/TestSanity.h b/ipc/ipdl/test/cxx/TestSanity.h deleted file mode 100644 index ca29d6767243..000000000000 --- a/ipc/ipdl/test/cxx/TestSanity.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef mozilla__ipdltest_TestSanity_h -#define mozilla__ipdltest_TestSanity_h 1 - -#include "mozilla/_ipdltest/IPDLUnitTests.h" - -#include "mozilla/_ipdltest/PTestSanityParent.h" -#include "mozilla/_ipdltest/PTestSanityChild.h" - -namespace mozilla { -namespace _ipdltest { - -class TestSanityParent : public PTestSanityParent { - friend class PTestSanityParent; - - public: - TestSanityParent(); - virtual ~TestSanityParent(); - - static bool RunTestInProcesses() { return true; } - static bool RunTestInThreads() { return true; } - - void Main(); - - protected: - mozilla::ipc::IPCResult RecvPong(const int& one, const float& zeroPtTwoFive, - const uint8_t& dummy); - - virtual void ActorDestroy(ActorDestroyReason why) override { - if (NormalShutdown != why) fail("unexpected destruction!"); - passed("ok"); - QuitParent(); - } -}; - -class TestSanityChild : public PTestSanityChild { - friend class PTestSanityChild; - - public: - TestSanityChild(); - virtual ~TestSanityChild(); - - protected: - mozilla::ipc::IPCResult RecvPing(const int& zero, const float& zeroPtFive, - const int8_t& dummy); - - virtual void ActorDestroy(ActorDestroyReason why) override { - if (NormalShutdown != why) fail("unexpected destruction!"); - QuitChild(); - } -}; - -} // namespace _ipdltest -} // namespace mozilla - -#endif // ifndef mozilla__ipdltest_TestSanity_h diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build index 66a73e76efd7..35b139d5d4f0 100644 --- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -12,7 +12,6 @@ EXPORTS.mozilla._ipdltest += [ "IPDLUnitTestTypes.h", "IPDLUnitTestUtils.h", "TestOffMainThreadPainting.h", - "TestSanity.h", "TestSelfManageRoot.h", "TestShmem.h", "TestShutdown.h", @@ -27,7 +26,6 @@ EXPORTS.mozilla._ipdltest += [ SOURCES += [ "TestOffMainThreadPainting.cpp", - "TestSanity.cpp", "TestSelfManageRoot.cpp", "TestShmem.cpp", "TestShutdown.cpp", @@ -53,7 +51,6 @@ IPDL_SOURCES += [ "PTestIndirectProtocolParamSecond.ipdl", "PTestPaintThread.ipdl", "PTestPriority.ipdl", - "PTestSanity.ipdl", "PTestSelfManage.ipdl", "PTestSelfManageRoot.ipdl", "PTestShmem.ipdl",