From 8f2dbdc3aebbba17b4d763fef40f989cadd52af1 Mon Sep 17 00:00:00 2001 From: Alex Corrado Date: Mon, 5 Dec 2011 02:27:29 -0500 Subject: [PATCH] Remove more bitrot to fix the build --- tests/Makefile.am | 3 +- tests/MarshalingTests.cs | 2 - tests/Support/CppNUnitAsserts.cs | 116 ------------------------------- tests/Tests.csproj | 1 - 4 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 tests/Support/CppNUnitAsserts.cs diff --git a/tests/Makefile.am b/tests/Makefile.am index 7892923..63d2b3c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,8 +16,7 @@ MANAGED = \ FieldTests.cs \ InheritanceTests.cs \ ManglingTests.cs \ - MarshalingTests.cs \ - Support/CppNUnitAsserts.cs + MarshalingTests.cs REFERENCES = \ -pkg:mono-nunit diff --git a/tests/MarshalingTests.cs b/tests/MarshalingTests.cs index c060cad..08e4dfb 100644 --- a/tests/MarshalingTests.cs +++ b/tests/MarshalingTests.cs @@ -1,8 +1,6 @@ using System; using NUnit.Framework; -using Tests.Support; - namespace Tests { [TestFixture] diff --git a/tests/Support/CppNUnitAsserts.cs b/tests/Support/CppNUnitAsserts.cs deleted file mode 100644 index b3bbdcc..0000000 --- a/tests/Support/CppNUnitAsserts.cs +++ /dev/null @@ -1,116 +0,0 @@ -// -// CppNUnitAsserts.cs: Exposes NUnit Assert methods to C++ -// -// Author: -// Alexander Corrado (alexander.corrado@gmail.com) -// -// Copyright (C) 2010 Alexander Corrado -// - -using System; -using System.Runtime.InteropServices; -using NUnit.Framework; -using Mono.Cxxi; - -namespace Tests.Support { - public static class CppNUnitAsserts { - - private interface IAssert : ICppClassOverridable { - [Virtual] void Fail (CppInstancePtr @this, string message); - [Virtual] void Fail (CppInstancePtr @this); - [Virtual] void IsTrue (CppInstancePtr @this, bool condition, string message); - [Virtual] void IsTrue (CppInstancePtr @this, bool condition); - [Virtual] void IsFalse (CppInstancePtr @this, bool condition, string message); - [Virtual] void IsFalse (CppInstancePtr @this, bool condition); - [Virtual] void IsEmpty (CppInstancePtr @this, string aString, string message); - [Virtual] void IsEmpty (CppInstancePtr @this, string aString); - [Virtual] void IsNotEmpty (CppInstancePtr @this, string aString, string message); - [Virtual] void IsNotEmpty (CppInstancePtr @this, string aString); - [Virtual] void AreEqual (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void AreEqual (CppInstancePtr @this, int expected, int actual); - [Virtual] void AreEqual (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void AreEqual (CppInstancePtr @this, long expected, long actual); - [Virtual] void AreEqual (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void AreEqual (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void AreEqual (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void AreEqual (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void AreEqual (CppInstancePtr @this, double expected, double actual, double delta, string message); - [Virtual] void AreEqual (CppInstancePtr @this, double expected, double actual, double delta); - [Virtual] void AreEqual (CppInstancePtr @this, float expected, float actual, float delta, string message); - [Virtual] void AreEqual (CppInstancePtr @this, float expected, float actual, float delta); - [Virtual] void AreNotEqual (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, int expected, int actual); - [Virtual] void AreNotEqual (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, long expected, long actual); - [Virtual] void AreNotEqual (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void AreNotEqual (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void AreNotEqual (CppInstancePtr @this, double expected, double actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, double expected, double actual); - [Virtual] void AreNotEqual (CppInstancePtr @this, float expected, float actual, string message); - [Virtual] void AreNotEqual (CppInstancePtr @this, float expected, float actual); - [Virtual] void Greater (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void Greater (CppInstancePtr @this, int expected, int actual); - [Virtual] void Greater (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void Greater (CppInstancePtr @this, long expected, long actual); - [Virtual] void Greater (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void Greater (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void Greater (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void Greater (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void Greater (CppInstancePtr @this, double expected, double actual, string message); - [Virtual] void Greater (CppInstancePtr @this, double expected, double actual); - [Virtual] void Greater (CppInstancePtr @this, float expected, float actual, string message); - [Virtual] void Greater (CppInstancePtr @this, float expected, float actual); - [Virtual] void Less (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void Less (CppInstancePtr @this, int expected, int actual); - [Virtual] void Less (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void Less (CppInstancePtr @this, long expected, long actual); - [Virtual] void Less (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void Less (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void Less (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void Less (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void Less (CppInstancePtr @this, double expected, double actual, string message); - [Virtual] void Less (CppInstancePtr @this, double expected, double actual); - [Virtual] void Less (CppInstancePtr @this, float expected, float actual, string message); - [Virtual] void Less (CppInstancePtr @this, float expected, float actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, int expected, int actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, long expected, long actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, double expected, double actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, double expected, double actual); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, float expected, float actual, string message); - [Virtual] void GreaterOrEqual (CppInstancePtr @this, float expected, float actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, int expected, int actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, int expected, int actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, long expected, long actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, long expected, long actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, uint expected, uint actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, uint expected, uint actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, ulong expected, ulong actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, ulong expected, ulong actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, double expected, double actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, double expected, double actual); - [Virtual] void LessOrEqual (CppInstancePtr @this, float expected, float actual, string message); - [Virtual] void LessOrEqual (CppInstancePtr @this, float expected, float actual); - } - - private static CppInstancePtr? nunitInterface; - public static void Init () - { - if (!nunitInterface.HasValue) - nunitInterface = CppInstancePtr.ForManagedObject (null); - - SetNUnitInterface ((IntPtr)nunitInterface.Value); - } - - [DllImport("CPPTestLib")] - private static extern void SetNUnitInterface (IntPtr nunit); - } -} - diff --git a/tests/Tests.csproj b/tests/Tests.csproj index 59df790..6533f34 100644 --- a/tests/Tests.csproj +++ b/tests/Tests.csproj @@ -50,7 +50,6 @@ AllRules.ruleset -