diff --git a/tests/Hello/Hello.Tests.cs b/tests/Basic/Basic.Tests.cs similarity index 94% rename from tests/Hello/Hello.Tests.cs rename to tests/Basic/Basic.Tests.cs index 576702aa..c676c27b 100644 --- a/tests/Hello/Hello.Tests.cs +++ b/tests/Basic/Basic.Tests.cs @@ -1,7 +1,8 @@ using NUnit.Framework; +using Basic; [TestFixture] -public class HelloTests +public class BasicTests { [Test] public void TestHello() @@ -42,8 +43,7 @@ public class HelloTests static void Main(string[] args) { var hello = new Hello(); - - Assert.That(hello.RetEnum(Enum.A), Is.EqualTo(0)); + hello.RetFoo(7, 2.0f); } } \ No newline at end of file diff --git a/tests/Hello/Hello.cpp b/tests/Basic/Basic.cpp similarity index 97% rename from tests/Hello/Hello.cpp rename to tests/Basic/Basic.cpp index 0ca77847..99ea4654 100644 --- a/tests/Hello/Hello.cpp +++ b/tests/Basic/Basic.cpp @@ -1,4 +1,4 @@ -#include "Hello.h" +#include "Basic.h" Foo::Foo() { diff --git a/tests/Hello/Hello.cs b/tests/Basic/Basic.cs similarity index 65% rename from tests/Hello/Hello.cs rename to tests/Basic/Basic.cs index 93190f14..7cbe0d64 100644 --- a/tests/Hello/Hello.cs +++ b/tests/Basic/Basic.cs @@ -4,10 +4,10 @@ using CppSharp.Utils; namespace CppSharp.Tests { - public class Hello : LibraryTest + public class Basic : LibraryTest { - public Hello(LanguageGeneratorKind kind) - : base("Hello", kind) + public Basic(LanguageGeneratorKind kind) + : base("Basic", kind) { } @@ -21,8 +21,8 @@ namespace CppSharp.Tests { public static void Main(string[] args) { - ConsoleDriver.Run(new Hello(LanguageGeneratorKind.CPlusPlusCLI)); - ConsoleDriver.Run(new Hello(LanguageGeneratorKind.CSharp)); + ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CPlusPlusCLI)); + ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CSharp)); } } } diff --git a/tests/Hello/Hello.h b/tests/Basic/Basic.h similarity index 97% rename from tests/Hello/Hello.h rename to tests/Basic/Basic.h index b13f7ce5..7a721f34 100644 --- a/tests/Hello/Hello.h +++ b/tests/Basic/Basic.h @@ -1,5 +1,3 @@ -//#include - #if defined(_MSC_VER) #define CppSharp_API __declspec(dllexport) #else diff --git a/tests/Basic/premake4.lua b/tests/Basic/premake4.lua new file mode 100644 index 00000000..6ddb9e42 --- /dev/null +++ b/tests/Basic/premake4.lua @@ -0,0 +1,2 @@ +group "Tests/Basic" + SetupTestProject("Basic") \ No newline at end of file diff --git a/tests/Hello/premake4.lua b/tests/Hello/premake4.lua deleted file mode 100644 index 7918ed76..00000000 --- a/tests/Hello/premake4.lua +++ /dev/null @@ -1,2 +0,0 @@ -group "Tests/Hello" - SetupTestProject("Hello") \ No newline at end of file