Renamed the test suite projects.

tests/Basic/premake4.lua

@@ -1,2 +0,0 @@
-group "Tests/Basic"
-  SetupTestProject("Basic", { "AnotherUnit" })

tests/CLI/CLI.Tests.cs

@@ -1,6 +1,6 @@
 using CppSharp.Utils;
 using NUnit.Framework;
-using CLITemp;
+using CLI;
 
 public class CLITests : GeneratorTestFixture
 {

tests/CLI/CLI.cpp

@@ -1,4 +1,4 @@
-#include "CLITemp.h"
+#include "CLI.h"
 
 int Types::AttributedSum(int A, int B)
 {

tests/CLI/CLI.cs

@@ -4,10 +4,10 @@ using CppSharp.Utils;
 
 namespace CppSharp.Tests
 {
-    public class CLITemp : GeneratorTest
+    public class CLITestsGenerator : GeneratorTest
     {
-        public CLITemp(GeneratorKind kind)
-            : base("CLITemp", kind)
+        public CLITestsGenerator(GeneratorKind kind)
+            : base("CLI", kind)
         {
         }
 
@@ -24,7 +24,7 @@ namespace CppSharp.Tests
 
         public static void Main(string[] args)
         {
-            ConsoleDriver.Run(new CLITemp(GeneratorKind.CLI));
+            ConsoleDriver.Run(new CLITestsGenerator(GeneratorKind.CLI));
         }
     }
 }

tests/CLI/premake4.lua

@@ -0,0 +1,2 @@
+group "Tests/CLI"
+  SetupTestCLI("CLI")

tests/CLITemp/premake4.lua

@@ -1,2 +0,0 @@
-group "Tests/CLITemp"
-  SetupTestCLI("CLITemp")

tests/CSharp/CSharp.Tests.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
 using CppSharp.Utils;
-using CSharpTemp;
+using CSharp;
 using NUnit.Framework;
 
-public class CSharpTempTests : GeneratorTestFixture
+public class CSharpTests : GeneratorTestFixture
 {
     public class ExtendsWrapper : TestOverrideFromSecondaryBase
     {
@@ -127,13 +127,13 @@ public class CSharpTempTests : GeneratorTestFixture
     [Test]
     public void TestDestructors()
     {
-        CSharpTemp.TestDestructors.InitMarker();
-        Assert.AreEqual(0, CSharpTemp.TestDestructors.Marker);
+        CSharp.TestDestructors.InitMarker();
+        Assert.AreEqual(0, CSharp.TestDestructors.Marker);
 
         var dtors = new TestDestructors();
-        Assert.AreEqual(0xf00d, CSharpTemp.TestDestructors.Marker);
+        Assert.AreEqual(0xf00d, CSharp.TestDestructors.Marker);
         dtors.Dispose();
-        Assert.AreEqual(0xcafe, CSharpTemp.TestDestructors.Marker);
+        Assert.AreEqual(0xcafe, CSharp.TestDestructors.Marker);
     }
 
     [Test]

tests/CSharp/CSharp.cpp

@@ -1,4 +1,4 @@
-#include "CSharpTemp.h"
+#include "CSharp.h"
 
 Foo::Foo()
 {

tests/CSharp/CSharp.cs

@@ -117,10 +117,10 @@ namespace CppSharp.Tests
         }
     }
 
-    public class CSharpTempTests : GeneratorTest
+    public class CSharpTestsGenerator : GeneratorTest
     {
-        public CSharpTempTests(GeneratorKind kind)
-            : base("CSharpTemp", kind)
+        public CSharpTestsGenerator(GeneratorKind kind)
+            : base("CSharp", kind)
         {
         }
 
@@ -160,7 +160,7 @@ namespace CppSharp.Tests
 
         public static void Main(string[] args)
         {
-            ConsoleDriver.Run(new CSharpTempTests(GeneratorKind.CSharp));
+            ConsoleDriver.Run(new CSharpTestsGenerator(GeneratorKind.CSharp));
         }
     }
 }

tests/CSharp/premake4.lua

@@ -0,0 +1,2 @@
+group "Tests/CSharp"
+  SetupTestCSharp("CSharp")

tests/CSharpTemp/premake4.lua

@@ -1,2 +0,0 @@
-group "Tests/CSharpTemp"
-  SetupTestCSharp("CSharpTemp")

tests/Common/Common.Tests.cs

@@ -1,11 +1,11 @@
 using System;
+using BasicTest;
 using CppSharp.Utils;
 using NUnit.Framework;
-using BasicTest;
 using Enum = BasicTest.Enum;
 
 [TestFixture]
-public class BasicTests : GeneratorTestFixture
+public class CommonTests : GeneratorTestFixture
 {
     [Test]
     public void TestUncompilableCode()
@@ -235,7 +235,7 @@ public class BasicTests : GeneratorTestFixture
     [Test]
     public void TestMoveFunctionToClass()
     {
-        Assert.That(basic.test(new basic()), Is.EqualTo(5));
+        Assert.That(common.test(new common()), Is.EqualTo(5));
     }
 
     [Test]
@@ -358,7 +358,7 @@ public class BasicTests : GeneratorTestFixture
     [Test]
     public void TestFunctions()
     {
-        var ret = BasicTest.basic.Function();
+        var ret = BasicTest.common.Function();
         Assert.That(ret, Is.EqualTo(5));
     }
 
@@ -424,14 +424,14 @@ public class BasicTests : GeneratorTestFixture
     [Test]
     public unsafe void TestDecltype()
     {
-        var ret = basic.TestDecltype();
+        var ret = common.TestDecltype();
         Assert.AreEqual(0, ret);
     }
 
     [Test]
     public unsafe void TestNullPtrType()
     {
-        var ret = basic.TestNullPtrTypeRet();
+        var ret = common.TestNullPtrTypeRet();
         Assert.AreEqual(IntPtr.Zero, new IntPtr(ret));
     }
 
@@ -527,12 +527,12 @@ public class BasicTests : GeneratorTestFixture
     public void TestOutTypeClassesPassTry()
     {
         RefTypeClassPassTry refTypeClassPassTry;
-        basic.funcTryRefTypeOut(out refTypeClassPassTry);
-        basic.funcTryRefTypePtrOut(out refTypeClassPassTry);
+        common.funcTryRefTypeOut(out refTypeClassPassTry);
+        common.funcTryRefTypePtrOut(out refTypeClassPassTry);
 
         ValueTypeClassPassTry valueTypeClassPassTry;
-        basic.funcTryValTypeOut(out valueTypeClassPassTry);
-        basic.funcTryValTypePtrOut(out valueTypeClassPassTry);
+        common.funcTryValTypeOut(out valueTypeClassPassTry);
+        common.funcTryValTypePtrOut(out valueTypeClassPassTry);
     }
 }
  

tests/Common/Common.cpp

@@ -1,4 +1,4 @@
-#include "Basic.h"
+#include "Common.h"
 #include <string.h>
 
 Foo::Foo()
@@ -335,7 +335,7 @@ void DefaultParameters::Bar()
 {
 }
 
-int test(basic& s)
+int test(common& s)
 {
     return 5;
 }

tests/Common/Common.cs

@@ -6,10 +6,10 @@ using CppSharp.Utils;
 
 namespace CppSharp.Tests
 {
-    public class Basic : GeneratorTest
+    public class CommonTestsGenerator : GeneratorTest
     {
-        public Basic(GeneratorKind kind)
-            : base("Basic", kind)
+        public CommonTestsGenerator(GeneratorKind kind)
+            : base("Common", kind)
         {
 
         }
@@ -43,8 +43,8 @@ namespace CppSharp.Tests
 
         public static void Main(string[] args)
         {
-            ConsoleDriver.Run(new Basic(GeneratorKind.CLI));
-            ConsoleDriver.Run(new Basic(GeneratorKind.CSharp));
+            ConsoleDriver.Run(new CommonTestsGenerator(GeneratorKind.CLI));
+            ConsoleDriver.Run(new CommonTestsGenerator(GeneratorKind.CSharp));
         }
     }
 }

tests/Common/Common.h

@@ -257,12 +257,12 @@ class Derived : public Base<Derived>
 };
 
 // Tests the MoveFunctionToClassPass
-class DLL_API basic
+class DLL_API common
 {
 
 };
 
-DLL_API int test(basic& s);
+DLL_API int test(common& s);
 
 // Tests the MoveOperatorToClassPass
 struct DLL_API TestMoveOperatorToClass

tests/Common/premake4.lua

@@ -0,0 +1,2 @@
+group "Tests/Common"
+  SetupTestProject("Common", { "AnotherUnit" })

tests/Encodings/Encodings.Tests.cs

@@ -1,8 +1,8 @@
 using CppSharp.Utils;
 using NUnit.Framework;
-using Foo = UTF16.Foo;
+using Foo = Encodings.Foo;
 
-public class UTF16Tests : GeneratorTestFixture
+public class EncodingsTests : GeneratorTestFixture
 {
     [Test]
     public void TestFoo()

tests/Encodings/Encodings.cpp

@@ -1,4 +1,4 @@
-#include "UTF16.h"
+#include "Encodings.h"
 
 // TODO: move this, it has nothing to do with Unicode, it's here only not to break the CLI branch
 int Foo::operator[](int i) const

tests/Encodings/Encodings.cs

@@ -5,10 +5,10 @@ using CppSharp.Utils;
 
 namespace CppSharp.Tests
 {
-    public class UTF16Tests : GeneratorTest
+    public class EncodingsTestsGenerator : GeneratorTest
     {
-        public UTF16Tests(GeneratorKind kind)
-            : base("UTF16", kind)
+        public EncodingsTestsGenerator(GeneratorKind kind)
+            : base("Encodings", kind)
         {
         }
 
@@ -24,7 +24,7 @@ namespace CppSharp.Tests
 
         public static void Main(string[] args)
         {
-            ConsoleDriver.Run(new UTF16Tests(GeneratorKind.CSharp));
+            ConsoleDriver.Run(new EncodingsTestsGenerator(GeneratorKind.CSharp));
         }
     }
 }

tests/Encodings/premake4.lua

@@ -0,0 +1,2 @@
+group "Tests/Encodings"
+  SetupTestCSharp("Encodings")

tests/STL/premake4.lua

@@ -1,2 +0,0 @@
-group "Tests/STL"
-  SetupTestCLI("STL")

tests/StandardLib/StandardLib.Tests.cs

@@ -1,17 +1,17 @@
 using CppSharp.Utils;
 using NUnit.Framework;
-using STL;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using StandardLib;
 
-public class STLTests : GeneratorTestFixture
+public class StandardLibTests : GeneratorTestFixture
 {
     [Test]
     public void TestVectors()
     {
-        var vectors = new STL.TestVectors();
+        var vectors = new StandardLib.TestVectors();
 
         var sum = vectors.SumIntVector(new List<int> { 1, 2, 3 });
         Assert.AreEqual(sum, 6);

tests/StandardLib/StandardLib.cpp

@@ -1,4 +1,4 @@
-#include "STL.h"
+#include "StandardLib.h"
 
 TestVectors::TestVectors()
 {

tests/StandardLib/StandardLib.cs

@@ -4,10 +4,10 @@ using CppSharp.Utils;
 
 namespace CppSharp.Tests
 {
-    public class STL : GeneratorTest
+    public class StandardLibTestsGenerator : GeneratorTest
     {
-        public STL(GeneratorKind kind)
-            : base("STL", kind)
+        public StandardLibTestsGenerator(GeneratorKind kind)
+            : base("StandardLib", kind)
         {
         }
 
@@ -18,7 +18,7 @@ namespace CppSharp.Tests
 
         public static void Main(string[] args)
         {
-            ConsoleDriver.Run(new STL(GeneratorKind.CLI));
+            ConsoleDriver.Run(new StandardLibTestsGenerator(GeneratorKind.CLI));
         }
     }
 }

tests/StandardLib/premake4.lua

@@ -0,0 +1,2 @@
+group "Tests/StandardLib"
+  SetupTestCLI("StandardLib")

tests/UTF16/premake4.lua

@@ -1,2 +0,0 @@
-group "Tests/UTF16"
-  SetupTestCSharp("UTF16")