From 0210644c4d1a4c4c4dd2a558cf6523a9bbb8adbb Mon Sep 17 00:00:00 2001 From: Alex Corrado Date: Fri, 1 Jul 2011 21:41:57 -0400 Subject: [PATCH] Give test suites more general names --- tests/{VirtualTests.cs => InheritanceTests.cs} | 2 +- tests/Makefile.am | 10 +++++----- tests/{ByValTests.cs => MarshalingTests.cs} | 2 +- .../{VirtualTests.cpp => InheritanceTests.cpp} | 2 +- .../Native/{VirtualTests.h => InheritanceTests.h} | 0 .../Native/{ByValTests.cpp => MarshalingTests.cpp} | 2 +- tests/Native/{ByValTests.h => MarshalingTests.h} | 0 tests/Tests.csproj | 14 +++++++------- 8 files changed, 16 insertions(+), 16 deletions(-) rename tests/{VirtualTests.cs => InheritanceTests.cs} (99%) rename tests/{ByValTests.cs => MarshalingTests.cs} (97%) rename tests/Native/{VirtualTests.cpp => InheritanceTests.cpp} (97%) rename tests/Native/{VirtualTests.h => InheritanceTests.h} (100%) rename tests/Native/{ByValTests.cpp => MarshalingTests.cpp} (94%) rename tests/Native/{ByValTests.h => MarshalingTests.h} (100%) diff --git a/tests/VirtualTests.cs b/tests/InheritanceTests.cs similarity index 99% rename from tests/VirtualTests.cs rename to tests/InheritanceTests.cs index b7d92a67..dddc3b9b 100644 --- a/tests/VirtualTests.cs +++ b/tests/InheritanceTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; namespace Tests { [TestFixture] - public class VirtualTests { + public class InheritanceTests { [Test] public void TestVirtualCall () diff --git a/tests/Makefile.am b/tests/Makefile.am index d0fdeb16..dd496a15 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,13 +7,13 @@ INTEROP_DLL = \ TEST_DLL = $(BUILD_DIR)/Test.dll NATIVE = \ - ByValTests \ - VirtualTests + MarshalingTests \ + InheritanceTests MANAGED = \ - ByValTests.cs \ - Support/CppNUnitAsserts.cs \ - VirtualTests.cs + InheritanceTests.cs \ + MarshalingTests.cs \ + Support/CppNUnitAsserts.cs REFERENCES = \ -pkg:mono-nunit diff --git a/tests/ByValTests.cs b/tests/MarshalingTests.cs similarity index 97% rename from tests/ByValTests.cs rename to tests/MarshalingTests.cs index fe66ee93..a476b733 100644 --- a/tests/ByValTests.cs +++ b/tests/MarshalingTests.cs @@ -6,7 +6,7 @@ using Tests.Support; namespace Tests { [TestFixture] - public class ByValTests { + public class MarshalingTests { [Test] public void TestClassReturn () diff --git a/tests/Native/VirtualTests.cpp b/tests/Native/InheritanceTests.cpp similarity index 97% rename from tests/Native/VirtualTests.cpp rename to tests/Native/InheritanceTests.cpp index 95cdf8d9..553b85d4 100644 --- a/tests/Native/VirtualTests.cpp +++ b/tests/Native/InheritanceTests.cpp @@ -1,5 +1,5 @@ -#include "VirtualTests.h" +#include "InheritanceTests.h" NumberClass::NumberClass (int n) : num (n) diff --git a/tests/Native/VirtualTests.h b/tests/Native/InheritanceTests.h similarity index 100% rename from tests/Native/VirtualTests.h rename to tests/Native/InheritanceTests.h diff --git a/tests/Native/ByValTests.cpp b/tests/Native/MarshalingTests.cpp similarity index 94% rename from tests/Native/ByValTests.cpp rename to tests/Native/MarshalingTests.cpp index ff5fa8a0..361b44c3 100644 --- a/tests/Native/ByValTests.cpp +++ b/tests/Native/MarshalingTests.cpp @@ -1,5 +1,5 @@ -#include "ByValTests.h" +#include "MarshalingTests.h" ClassWithCopyCtor::ClassWithCopyCtor(const ClassWithCopyCtor& f) { x = f.x; diff --git a/tests/Native/ByValTests.h b/tests/Native/MarshalingTests.h similarity index 100% rename from tests/Native/ByValTests.h rename to tests/Native/MarshalingTests.h diff --git a/tests/Tests.csproj b/tests/Tests.csproj index 2345648e..098d4562 100644 --- a/tests/Tests.csproj +++ b/tests/Tests.csproj @@ -52,8 +52,8 @@ - - + + @@ -70,10 +70,10 @@ - - - - + + + + @@ -100,4 +100,4 @@ Mono.Cxxi - \ No newline at end of file +