Move .NET tests to tests/dotnet.

3 years ago · 753d2a8712
103 changed files with 11 additions and 19 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -34,7 +34,7 @@
				@@ -34,7 +34,7 @@
    <GeneratorFileExtension>dll</GeneratorFileExtension>
    <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
    <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
-    <RID Condition="$(IsWindows)">win</RID>    
+    <RID Condition="$(IsWindows)">win</RID>
    <RID Condition="$(IsLinux)">linux</RID>
    <RID Condition="$(IsMacOSX)">osx</RID>
    <RID>$(RID)-$(PlatformTarget)</RID>
--- a/build/Helpers.lua
+++ b/build/Helpers.lua
@ -47,7 +47,7 @@ rootdir = path.getabsolute("../")
				@@ -47,7 +47,7 @@ rootdir = path.getabsolute("../")
 srcdir = path.join(rootdir, "src");
 incdir = path.join(rootdir, "include");
 examplesdir = path.join(rootdir, "examples");
-testsdir = path.join(rootdir, "tests");
+testsdir = path.join(rootdir, "tests/dotnet");
 builddir = path.join(rootdir, "build")
 bindir = path.join(rootdir, "bin")
 objsdir = path.join(builddir, "obj");
--- a/build/premake5.lua
+++ b/build/premake5.lua
@ -44,7 +44,7 @@ workspace "CppSharp"
				@@ -44,7 +44,7 @@ workspace "CppSharp"
  workspacefiles(path.join(builddir, "premake5.lua"))
  workspacefiles(path.join(builddir, "*.sh"))
  workspacefiles(path.join(rootdir, ".github/workflows/*.yml"))
-  workspacefiles(path.join(rootdir, "tests/Test*.props"))
+  workspacefiles(path.join(testsdir, "Test*.props"))

  group "Libraries"
    if EnableNativeProjects() then
--- a/src/Generator.Tests/GeneratorTest.cs
+++ b/src/Generator.Tests/GeneratorTest.cs
@ -74,12 +74,12 @@ namespace CppSharp.Utils
				@@ -74,12 +74,12 @@ namespace CppSharp.Utils

            while (directory != null)
            {
-                var path = Path.Combine(directory.FullName, "tests", name);
+                var path = Path.Combine(directory.FullName, "tests", "dotnet", name);

                if (Directory.Exists(path))
                    return path;

-                path = Path.Combine(directory.FullName, "external", "CppSharp", "tests", name);
+                path = Path.Combine(directory.FullName, "external", "CppSharp", "tests", "dotnet", name);

                if (Directory.Exists(path))
                    return path;
--- a/tests/NamespacesBase/premake4.lua
+++ b/tests/NamespacesBase/premake4.lua
@ -1,11 +0,0 @@
				@@ -1,11 +0,0 @@
-function SetupWrapper(name)
-  if not EnabledManagedProjects() then
-    return
-  end
-
-  SetupExternalManagedTestProject(name .. ".CSharp")
-end
-
-group "Tests/Namespaces"
-  SetupTestNativeProject("NamespacesBase")
-  targetdir (path.join(gendir, "NamespacesDerived"))
--- a/tests/dotnet/CLI/CLI.Gen.cs
+++ b/tests/dotnet/CLI/CLI.Gen.cs
--- a/tests/dotnet/CLI/CLI.Gen.csproj
+++ b/tests/dotnet/CLI/CLI.Gen.csproj
--- a/tests/dotnet/CLI/CLI.Tests.CLI.csproj
+++ b/tests/dotnet/CLI/CLI.Tests.CLI.csproj
--- a/tests/dotnet/CLI/CLI.Tests.cs
+++ b/tests/dotnet/CLI/CLI.Tests.cs
--- a/tests/dotnet/CLI/CLI.cpp
+++ b/tests/dotnet/CLI/CLI.cpp
--- a/tests/dotnet/CLI/CLI.h
+++ b/tests/dotnet/CLI/CLI.h
--- a/tests/dotnet/CLI/NestedEnumInClassTest/ClassWithNestedEnum.cpp
+++ b/tests/dotnet/CLI/NestedEnumInClassTest/ClassWithNestedEnum.cpp
--- a/tests/dotnet/CLI/NestedEnumInClassTest/ClassWithNestedEnum.h
+++ b/tests/dotnet/CLI/NestedEnumInClassTest/ClassWithNestedEnum.h
--- a/tests/dotnet/CLI/NestedEnumInClassTest/NestedEnumConsumer.cpp
+++ b/tests/dotnet/CLI/NestedEnumInClassTest/NestedEnumConsumer.cpp
--- a/tests/dotnet/CLI/NestedEnumInClassTest/NestedEnumConsumer.h
+++ b/tests/dotnet/CLI/NestedEnumInClassTest/NestedEnumConsumer.h
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/Employee.cpp
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/Employee.cpp
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/Employee.h
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/Employee.h
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeForwardDecl.h
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeForwardDecl.h
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeOrg.cpp
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeOrg.cpp
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeOrg.h
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/EmployeeOrg.h
--- a/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/IgnoredClassTemplateForEmployee.h
+++ b/tests/dotnet/CLI/UseTemplateTypeFromIgnoredClassTemplate/IgnoredClassTemplateForEmployee.h
--- a/tests/dotnet/CLI/premake4.lua
+++ b/tests/dotnet/CLI/premake4.lua
--- a/tests/dotnet/CSharp/AnonTypes.h
+++ b/tests/dotnet/CSharp/AnonTypes.h
--- a/tests/dotnet/CSharp/AnotherUnit.cpp
+++ b/tests/dotnet/CSharp/AnotherUnit.cpp
--- a/tests/dotnet/CSharp/AnotherUnit.h
+++ b/tests/dotnet/CSharp/AnotherUnit.h
--- a/tests/dotnet/CSharp/CSharp.CSharp.csproj
+++ b/tests/dotnet/CSharp/CSharp.CSharp.csproj
--- a/tests/dotnet/CSharp/CSharp.Gen.cs
+++ b/tests/dotnet/CSharp/CSharp.Gen.cs
--- a/tests/dotnet/CSharp/CSharp.Gen.csproj
+++ b/tests/dotnet/CSharp/CSharp.Gen.csproj
--- a/tests/dotnet/CSharp/CSharp.Tests.CSharp.csproj
+++ b/tests/dotnet/CSharp/CSharp.Tests.CSharp.csproj
--- a/tests/dotnet/CSharp/CSharp.Tests.cs
+++ b/tests/dotnet/CSharp/CSharp.Tests.cs
--- a/tests/dotnet/CSharp/CSharp.cpp
+++ b/tests/dotnet/CSharp/CSharp.cpp
--- a/tests/dotnet/CSharp/CSharp.h
+++ b/tests/dotnet/CSharp/CSharp.h
--- a/tests/dotnet/CSharp/CSharpPartialMethods.cs
+++ b/tests/dotnet/CSharp/CSharpPartialMethods.cs
--- a/tests/dotnet/CSharp/CSharpTemplates.cpp
+++ b/tests/dotnet/CSharp/CSharpTemplates.cpp
--- a/tests/dotnet/CSharp/CSharpTemplates.h
+++ b/tests/dotnet/CSharp/CSharpTemplates.h
--- a/tests/dotnet/CSharp/ExcludedUnit.hpp
+++ b/tests/dotnet/CSharp/ExcludedUnit.hpp
--- a/tests/dotnet/CSharp/premake4.lua
+++ b/tests/dotnet/CSharp/premake4.lua
--- a/tests/dotnet/Common/AnotherUnit.cpp
+++ b/tests/dotnet/Common/AnotherUnit.cpp
--- a/tests/dotnet/Common/AnotherUnit.h
+++ b/tests/dotnet/Common/AnotherUnit.h
--- a/tests/dotnet/Common/Common.CSharp.csproj
+++ b/tests/dotnet/Common/Common.CSharp.csproj
--- a/tests/dotnet/Common/Common.Gen.cs
+++ b/tests/dotnet/Common/Common.Gen.cs
--- a/tests/dotnet/Common/Common.Gen.csproj
+++ b/tests/dotnet/Common/Common.Gen.csproj
--- a/tests/dotnet/Common/Common.Tests.CLI.csproj
+++ b/tests/dotnet/Common/Common.Tests.CLI.csproj
--- a/tests/dotnet/Common/Common.Tests.CSharp.csproj
+++ b/tests/dotnet/Common/Common.Tests.CSharp.csproj
--- a/tests/dotnet/Common/Common.Tests.cs
+++ b/tests/dotnet/Common/Common.Tests.cs
--- a/tests/dotnet/Common/Common.cpp
+++ b/tests/dotnet/Common/Common.cpp
--- a/tests/dotnet/Common/Common.h
+++ b/tests/dotnet/Common/Common.h
--- a/tests/dotnet/Common/interface.h
+++ b/tests/dotnet/Common/interface.h
--- a/tests/dotnet/Common/premake4.lua
+++ b/tests/dotnet/Common/premake4.lua
--- a/tests/dotnet/Directory.Build.props
+++ b/tests/dotnet/Directory.Build.props
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="../Directory.Build.props" />
+  <Import Project="../../Directory.Build.props" />
  <Import Project="Test.Common.props" />  
  <Import Project="Test.Generator.props" Condition="$(IsTestGenerator)" />
  <Import Project="Test.Bindings.props" Condition="$(IsTestBindings)" />
--- a/tests/dotnet/Empty/Empty.Gen.cs
+++ b/tests/dotnet/Empty/Empty.Gen.cs
--- a/tests/dotnet/Empty/Empty.Tests.cs
+++ b/tests/dotnet/Empty/Empty.Tests.cs
--- a/tests/dotnet/Empty/Empty.cpp
+++ b/tests/dotnet/Empty/Empty.cpp
--- a/tests/dotnet/Empty/Empty.h
+++ b/tests/dotnet/Empty/Empty.h
--- a/tests/dotnet/Empty/premake4.lua
+++ b/tests/dotnet/Empty/premake4.lua
--- a/tests/dotnet/Encodings/Encodings.CSharp.csproj
+++ b/tests/dotnet/Encodings/Encodings.CSharp.csproj
--- a/tests/dotnet/Encodings/Encodings.Gen.cs
+++ b/tests/dotnet/Encodings/Encodings.Gen.cs
--- a/tests/dotnet/Encodings/Encodings.Gen.csproj
+++ b/tests/dotnet/Encodings/Encodings.Gen.csproj
--- a/tests/dotnet/Encodings/Encodings.Tests.CSharp.csproj
+++ b/tests/dotnet/Encodings/Encodings.Tests.CSharp.csproj
--- a/tests/dotnet/Encodings/Encodings.Tests.cs
+++ b/tests/dotnet/Encodings/Encodings.Tests.cs
--- a/tests/dotnet/Encodings/Encodings.cpp
+++ b/tests/dotnet/Encodings/Encodings.cpp
--- a/tests/dotnet/Encodings/Encodings.h
+++ b/tests/dotnet/Encodings/Encodings.h
--- a/tests/dotnet/Encodings/premake4.lua
+++ b/tests/dotnet/Encodings/premake4.lua
--- a/tests/dotnet/NamespacesBase/NamespacesBase.cpp
+++ b/tests/dotnet/NamespacesBase/NamespacesBase.cpp
--- a/tests/dotnet/NamespacesBase/NamespacesBase.h
+++ b/tests/dotnet/NamespacesBase/NamespacesBase.h
--- a/tests/dotnet/NamespacesBase/premake4.lua
+++ b/tests/dotnet/NamespacesBase/premake4.lua
@ -0,0 +1,3 @@
				@@ -0,0 +1,3 @@
+group "Tests/Namespaces"
+  SetupTestNativeProject("NamespacesBase")
+  targetdir (path.join(gendir, "NamespacesDerived"))
--- a/tests/dotnet/NamespacesBase/test.cs
+++ b/tests/dotnet/NamespacesBase/test.cs
--- a/tests/dotnet/NamespacesDerived/Independent.h
+++ b/tests/dotnet/NamespacesDerived/Independent.h
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.Gen.cs
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.Gen.cs
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.Gen.csproj
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.Gen.csproj
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.Tests.CSharp.csproj
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.Tests.CSharp.csproj
@ -4,10 +4,10 @@
				@@ -4,10 +4,10 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="NamespacesBase">
-      <HintPath>..\..\build\gen\NamespacesDerived\NamespacesBase.dll</HintPath>
+      <HintPath>..\..\..\build\gen\NamespacesDerived\NamespacesBase.dll</HintPath>
    </Reference>
    <Reference Include="NamespacesDerived">
-      <HintPath>..\..\build\gen\NamespacesDerived\NamespacesDerived.dll</HintPath>
+      <HintPath>..\..\..\build\gen\NamespacesDerived\NamespacesDerived.dll</HintPath>
    </Reference>
  </ItemGroup>
 </Project>
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.Tests.cs
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.Tests.cs
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.cpp
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.cpp
--- a/tests/dotnet/NamespacesDerived/NamespacesDerived.h
+++ b/tests/dotnet/NamespacesDerived/NamespacesDerived.h
--- a/tests/dotnet/NamespacesDerived/premake4.lua
+++ b/tests/dotnet/NamespacesDerived/premake4.lua
--- a/tests/dotnet/Native/AST.h
+++ b/tests/dotnet/Native/AST.h
--- a/tests/dotnet/Native/ASTExtensions.h
+++ b/tests/dotnet/Native/ASTExtensions.h
--- a/tests/dotnet/Native/Enums.h
+++ b/tests/dotnet/Native/Enums.h
--- a/tests/dotnet/Native/Passes.h
+++ b/tests/dotnet/Native/Passes.h
--- a/tests/dotnet/Native/Templates.h
+++ b/tests/dotnet/Native/Templates.h
--- a/tests/dotnet/Native/linux/libexpat.so.0
+++ b/tests/dotnet/Native/linux/libexpat.so.0
--- a/tests/dotnet/Native/macos/libexpat.dylib
+++ b/tests/dotnet/Native/macos/libexpat.dylib
--- a/tests/dotnet/Native/windows/libexpat.dll
+++ b/tests/dotnet/Native/windows/libexpat.dll
--- a/tests/dotnet/StandardLib/StandardLib.Gen.cs
+++ b/tests/dotnet/StandardLib/StandardLib.Gen.cs
--- a/tests/dotnet/StandardLib/StandardLib.Gen.csproj
+++ b/tests/dotnet/StandardLib/StandardLib.Gen.csproj
--- a/tests/dotnet/StandardLib/StandardLib.Tests.CLI.csproj
+++ b/tests/dotnet/StandardLib/StandardLib.Tests.CLI.csproj
--- a/tests/dotnet/StandardLib/StandardLib.Tests.cs
+++ b/tests/dotnet/StandardLib/StandardLib.Tests.cs
--- a/tests/dotnet/StandardLib/StandardLib.cpp
+++ b/tests/dotnet/StandardLib/StandardLib.cpp
--- a/tests/dotnet/StandardLib/StandardLib.h
+++ b/tests/dotnet/StandardLib/StandardLib.h
--- a/tests/dotnet/StandardLib/premake4.lua
+++ b/tests/dotnet/StandardLib/premake4.lua
--- a/tests/dotnet/Test.Bindings.props
+++ b/tests/dotnet/Test.Bindings.props
--- a/tests/dotnet/Test.Common.props
+++ b/tests/dotnet/Test.Common.props
--- a/tests/dotnet/Test.Generator.props
+++ b/tests/dotnet/Test.Generator.props
--- a/tests/dotnet/Test.props
+++ b/tests/dotnet/Test.props
--- a/tests/dotnet/Tests.h
+++ b/tests/dotnet/Tests.h
--- a/tests/dotnet/VTables/VTables.CSharp.csproj
+++ b/tests/dotnet/VTables/VTables.CSharp.csproj
--- a/tests/dotnet/VTables/VTables.Gen.cs
+++ b/tests/dotnet/VTables/VTables.Gen.cs
--- a/tests/dotnet/VTables/VTables.Gen.csproj
+++ b/tests/dotnet/VTables/VTables.Gen.csproj
--- a/tests/dotnet/VTables/VTables.Tests.CSharp.csproj
+++ b/tests/dotnet/VTables/VTables.Tests.CSharp.csproj
--- a/tests/dotnet/VTables/VTables.Tests.cs
+++ b/tests/dotnet/VTables/VTables.Tests.cs
--- a/Show More
+++ b/Show More