Skip to content

Commit

Permalink
Moved Tests.Fixtures to TestFixtures
Browse files Browse the repository at this point in the history
  • Loading branch information
sschmid committed Jan 12, 2018
1 parent 20d5a5a commit fd017dc
Show file tree
Hide file tree
Showing 105 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Entitas.sln
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Entitas.Blueprints", "Addon
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerformanceTests", "Tests\PerformanceTests\PerformanceTests.csproj", "{3F97DA95-DF04-49BF-BB3C-961A516680F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Fixtures", "Tests\Tests.Fixtures\Tests.Fixtures.csproj", "{6F01CC45-F951-43A5-923E-D3778F9DD435}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFixtures", "Tests\TestFixtures\TestFixtures.csproj", "{6F01CC45-F951-43A5-923E-D3778F9DD435}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests\Tests.csproj", "{E2247925-03D6-40FC-AFA4-D7DA01FA6F4E}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Entitas.CodeGeneration.CodeGenerator.PostProcessors = Entitas.CodeGeneration.Plu
Entitas.CodeGeneration.Plugins.UpdateCSProjPostProcessor, \
Entitas.CodeGeneration.Plugins.WriteToDiskPostProcessor

Entitas.CodeGeneration.Plugins.Assemblies = bin/Release/Tests.Fixtures.dll
Entitas.CodeGeneration.Plugins.Assemblies = bin/Release/TestFixtures.dll
Entitas.CodeGeneration.Plugins.Contexts = Game, \
Test, \
Test2

Entitas.CodeGeneration.Plugins.IgnoreNamespaces = false
Entitas.CodeGeneration.Plugins.ProjectPath = Tests.Fixtures.csproj
Entitas.CodeGeneration.Plugins.ProjectPath = TestFixtures.csproj
Entitas.CodeGeneration.Plugins.TargetDirectory = .
Entitas.CodeGeneration.CodeGenerator.CLI.Ignore.UnusedKeys = Entitas.VisualDebugging.Unity.Editor.SystemWarningThreshold, \
Entitas.VisualDebugging.Unity.Editor.DefaultInstanceCreatorFolderPath, \
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6F01CC45-F951-43A5-923E-D3778F9DD435}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Tests.Fixtures</RootNamespace>
<AssemblyName>Tests.Fixtures</AssemblyName>
<RootNamespace>TestFixtures</RootNamespace>
<AssemblyName>TestFixtures</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion>1.0.0</ReleaseVersion>
</PropertyGroup>
Expand Down
Empty file.
4 changes: 2 additions & 2 deletions Tests/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@
<Folder Include="Tests\Entitas\Extensions\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tests.Fixtures\Tests.Fixtures.csproj">
<ProjectReference Include="..\TestFixtures\TestFixtures.csproj">
<Project>{6F01CC45-F951-43A5-923E-D3778F9DD435}</Project>
<Name>Tests.Fixtures</Name>
<Name>TestFixtures</Name>
</ProjectReference>
<ProjectReference Include="..\..\Addons\Entitas.Blueprints.Unity\Entitas.Blueprints.Unity.csproj">
<Project>{026FFA2B-1F8D-4E05-A54D-67AB5B611985}</Project>
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/Tests/TestExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public static Dictionary<string, string> GetSourceFiles(string path) {
!p.Contains(dir("Generated")) &&
!p.Contains(dir("Libraries")) &&
!p.Contains(dir("Tests")) &&
!p.Contains(dir("Tests.Fixtures")) &&
!p.Contains(dir("Examples")) &&
!p.Contains(dir("Readme")) &&
!p.Contains(dir("Build")) &&
Expand Down
1 change: 0 additions & 1 deletion Tests/Tests/Tests/check_namespaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ void when_checking_namespaces() {
.Replace(dir(projectRoot), string.Empty)
.Replace(addonsDir, string.Empty);


string expectedNamespace;
expectedNamespace = Regex.Match(fileName, expectedNamespacePattern)
.ToString()
Expand Down

0 comments on commit fd017dc

Please sign in to comment.