This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit de0209fe206bca879584d698eee622aeb5e59ab3 Author: Shad Storhaug <[email protected]> AuthorDate: Mon Jul 29 21:14:28 2019 +0700 Broke Lucene.Net.Tests project into Lucene.Net.Tests._A-I, Lucene.Net.Tests._J-U, and Lucene.Net.Tests._U-Z to cut the time it takes to run the tests in the project by about 2/3, running in parallel --- Lucene.Net.sln | 61 +++++++++++++++------- .../Properties/AssemblyInfo.cs | 4 +- .../Lucene.Net.Tests._A-I.csproj} | 41 ++++++++------- .../Lucene.Net.Tests._J-U.csproj} | 43 ++++++++------- .../Lucene.Net.Tests._U-Z.csproj} | 38 +++++++------- .../Index/TestIndexWriterReader.cs | 7 +++ src/Lucene.Net/Properties/AssemblyInfo.cs | 4 +- 7 files changed, 119 insertions(+), 79 deletions(-) diff --git a/Lucene.Net.sln b/Lucene.Net.sln index e450451..904843e 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -21,6 +21,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 15.0.26730.8 MinimumVisualStudioVersion = 15.0.26730.8 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-templates", "azure-templates", "{05CE3A39-40D4-452D-AFE0-E57E536A08C6}" + ProjectSection(SolutionItems) = preProject + build\azure-templates\publish-nuget-packages.yml = build\azure-templates\publish-nuget-packages.yml + build\azure-templates\publish-test-results-for-target-frameworks.yml = build\azure-templates\publish-test-results-for-target-frameworks.yml + build\azure-templates\publish-test-results-for-test-projects.yml = build\azure-templates\publish-test-results-for-test-projects.yml + build\azure-templates\publish-test-results.yml = build\azure-templates\publish-test-results.yml + build\azure-templates\run-tests-on-os.yml = build\azure-templates\run-tests-on-os.yml + build\azure-templates\show-all-environment-variables.yml = build\azure-templates\show-all-environment-variables.yml + build\azure-templates\show-all-files.yml = build\azure-templates\show-all-files.yml + EndProjectSection +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{8CA61D33-3590-4024-A304-7B1F75B50653}" ProjectSection(SolutionItems) = preProject src\dotnet\Directory.Build.props = src\dotnet\Directory.Build.props @@ -41,6 +52,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4DF7EACE src\dotnet\tools\Directory.Build.props = src\dotnet\tools\Directory.Build.props EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apidocs", "apidocs", "{58FD6E39-F30F-4566-90E5-B7C9D6BC0660}" + ProjectSection(SolutionItems) = preProject + apidocs\docfx.filter.yml = apidocs\docfx.filter.yml + apidocs\docfx.json = apidocs\docfx.json + apidocs\docs.ps1 = apidocs\docs.ps1 + apidocs\index.md = apidocs\index.md + apidocs\toc.yml = apidocs\toc.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4DF0A2A1-B9C7-4EE5-BAF0-BEEF53E34220}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + EndProjectSection +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net", "src\Lucene.Net\Lucene.Net.csproj", "{3A0AA37E-2B7B-4416-B528-DA4E0E6A6706}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Analysis.Common", "src\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj", "{3D0366A8-515D-44F0-835F-4118853CFA14}" @@ -87,8 +112,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Suggest", "src\L EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.TestFramework", "src\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj", "{AA0B6851-A597-47B5-A2F8-2A3E28C2B5A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests", "src\Lucene.Net.Tests\Lucene.Net.Tests.csproj", "{0922288F-57EE-43D2-B8E9-2692289D6DBC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Analysis.Common", "src\Lucene.Net.Tests.Analysis.Common\Lucene.Net.Tests.Analysis.Common.csproj", "{258BB6A8-A23A-42CE-A3C2-2B577CEC3F5A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Analysis.Kuromoji", "src\Lucene.Net.Tests.Analysis.Kuromoji\Lucene.Net.Tests.Analysis.Kuromoji.csproj", "{8DA818F6-1E5E-4DCF-B152-A0E0A817A42C}" @@ -119,15 +142,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Join", "sr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Memory", "src\Lucene.Net.Tests.Memory\Lucene.Net.Tests.Memory.csproj", "{3BE7B6EA-8DBC-45E2-947C-1CA7E63B5603}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apidocs", "apidocs", "{58FD6E39-F30F-4566-90E5-B7C9D6BC0660}" - ProjectSection(SolutionItems) = preProject - apidocs\docfx.filter.yml = apidocs\docfx.filter.yml - apidocs\docfx.json = apidocs\docfx.json - apidocs\docs.ps1 = apidocs\docs.ps1 - apidocs\index.md = apidocs\index.md - apidocs\toc.yml = apidocs\toc.yml - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Misc", "src\Lucene.Net.Tests.Misc\Lucene.Net.Tests.Misc.csproj", "{F8DDC5B7-A621-4B67-AB4B-BBE083C05BB8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Queries", "src\Lucene.Net.Tests.Queries\Lucene.Net.Tests.Queries.csproj", "{AC750DC0-05A3-4F96-8CC5-CFC8FD01D4CF}" @@ -154,10 +168,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.ICU", "src EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Cli", "src\dotnet\tools\Lucene.Net.Tests.Cli\Lucene.Net.Tests.Cli.csproj", "{1F5574FE-19F7-4F10-9B88-76A938621F5B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4DF0A2A1-B9C7-4EE5-BAF0-BEEF53E34220}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._A-I", "src\Lucene.Net.Tests._A-I\Lucene.Net.Tests._A-I.csproj", "{86FADACC-57EC-4AA3-8BBE-C6ED526EE596}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._J-S", "src\Lucene.Net.Tests._J-U\Lucene.Net.Tests._J-U.csproj", "{5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._U-Z", "src\Lucene.Net.Tests._U-Z\Lucene.Net.Tests._U-Z.csproj", "{083EEC05-D092-4F84-8004-41F0C7192ABD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -257,10 +272,6 @@ Global {AA0B6851-A597-47B5-A2F8-2A3E28C2B5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA0B6851-A597-47B5-A2F8-2A3E28C2B5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {AA0B6851-A597-47B5-A2F8-2A3E28C2B5A2}.Release|Any CPU.Build.0 = Release|Any CPU - {0922288F-57EE-43D2-B8E9-2692289D6DBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0922288F-57EE-43D2-B8E9-2692289D6DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0922288F-57EE-43D2-B8E9-2692289D6DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0922288F-57EE-43D2-B8E9-2692289D6DBC}.Release|Any CPU.Build.0 = Release|Any CPU {258BB6A8-A23A-42CE-A3C2-2B577CEC3F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {258BB6A8-A23A-42CE-A3C2-2B577CEC3F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU {258BB6A8-A23A-42CE-A3C2-2B577CEC3F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -373,6 +384,18 @@ Global {1F5574FE-19F7-4F10-9B88-76A938621F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F5574FE-19F7-4F10-9B88-76A938621F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F5574FE-19F7-4F10-9B88-76A938621F5B}.Release|Any CPU.Build.0 = Release|Any CPU + {86FADACC-57EC-4AA3-8BBE-C6ED526EE596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86FADACC-57EC-4AA3-8BBE-C6ED526EE596}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86FADACC-57EC-4AA3-8BBE-C6ED526EE596}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86FADACC-57EC-4AA3-8BBE-C6ED526EE596}.Release|Any CPU.Build.0 = Release|Any CPU + {5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}.Release|Any CPU.Build.0 = Release|Any CPU + {083EEC05-D092-4F84-8004-41F0C7192ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {083EEC05-D092-4F84-8004-41F0C7192ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {083EEC05-D092-4F84-8004-41F0C7192ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {083EEC05-D092-4F84-8004-41F0C7192ABD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs index 030a905..059d12a 100644 --- a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs @@ -41,7 +41,9 @@ using System.Runtime.InteropServices; // We need InternalsVisibleTo in order to prevent making everything public just for the sake of testing. // This has broad implications, though because many methods are marked "protected internal", which means other assemblies // must update overridden methods to match. -[assembly: InternalsVisibleTo("Lucene.Net.Tests, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._A-I, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._J-U, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._U-Z, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.Misc, PublicKey=" + AssemblyKeys.PublicKey)] diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests._A-I/Lucene.Net.Tests._A-I.csproj similarity index 62% copy from src/Lucene.Net.Tests/Lucene.Net.Tests.csproj copy to src/Lucene.Net.Tests._A-I/Lucene.Net.Tests._A-I.csproj index fa3504d..4d99dab 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests._A-I/Lucene.Net.Tests._A-I.csproj @@ -22,22 +22,24 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.props" /> - + <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> - - <AssemblyTitle>Lucene.Net.Tests</AssemblyTitle> + + <AssemblyTitle>Lucene.Net.Tests._A-I</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> </PropertyGroup> - + <ItemGroup> - <Compile Remove="Util\JunitCompat\**\*;Util\TestMaxFailuresRule.cs" /> - <!--<Compile Exclude="Util\TestMaxFailuresRule.cs" />--> - <EmbeddedResource Include="Index\bogus24.upgraded.to.36.zip;Index\index.30.cfs.zip;Index\index.30.nocfs.zip;Index\index.31.cfs.zip;Index\index.31.nocfs.zip;Index\index.31.optimized.cfs.zip;Index\index.31.optimized.nocfs.zip;Index\index.32.cfs.zip;Index\index.32.nocfs.zip;Index\index.34.cfs.zip;Index\index.34.nocfs.zip;Index\index.36.surrogates.zip;Index\index.40.cfs.zip;Index\index.40.nocfs.zip;Index\index.40.optimized.cfs.zip;Index\index.40.optimized.nocfs.zip;Index\index.41.cfs.zip [...] - <None Include="App.config" /> + <Compile Include="..\Lucene.Net.Tests\*.cs" /> + <Compile Include="..\Lucene.Net.Tests\Analysis\**\*.cs" LinkBase="Analysis" /> + <Compile Include="..\Lucene.Net.Tests\Codecs\**\*.cs" LinkBase="Codecs" /> + <Compile Include="..\Lucene.Net.Tests\Document\**\*.cs" LinkBase="Document" /> + <Compile Include="..\Lucene.Net.Tests\Index\**\*.cs" LinkBase="Index" /> + <EmbeddedResource Include="..\Lucene.Net.Tests\Index\*.zip" LinkBase="Index" /> </ItemGroup> - + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Codecs\Lucene.Net.Codecs.csproj" /> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" /> @@ -45,9 +47,13 @@ <ProjectReference Include="..\Lucene.Net.QueryParser\Lucene.Net.QueryParser.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> - + + <PropertyGroup> + <DefineConstants>$(DefineConstants);FEATURE_INDEXWRITER_TESTS</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> <DebugType>portable</DebugType> @@ -57,23 +63,18 @@ <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> - - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <Compile Remove="Util\JunitCompat\**\*;Support\TestCase.cs;Util\TestMaxFailuresRule.cs" /> - </ItemGroup> - + <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' "> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE;FEATURE_SERIALIZABLE_EXCEPTIONS</DefineConstants> <DebugType>full</DebugType> </PropertyGroup> - + <ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> - + <ItemGroup> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - -</Project> +</Project> \ No newline at end of file diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests._J-U/Lucene.Net.Tests._J-U.csproj similarity index 63% copy from src/Lucene.Net.Tests/Lucene.Net.Tests.csproj copy to src/Lucene.Net.Tests._J-U/Lucene.Net.Tests._J-U.csproj index fa3504d..d16ad7f 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests._J-U/Lucene.Net.Tests._J-U.csproj @@ -22,22 +22,28 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.props" /> - + <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> - - <AssemblyTitle>Lucene.Net.Tests</AssemblyTitle> + + <AssemblyTitle>Lucene.Net.Tests._J-U</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> </PropertyGroup> - + <ItemGroup> - <Compile Remove="Util\JunitCompat\**\*;Util\TestMaxFailuresRule.cs" /> - <!--<Compile Exclude="Util\TestMaxFailuresRule.cs" />--> - <EmbeddedResource Include="Index\bogus24.upgraded.to.36.zip;Index\index.30.cfs.zip;Index\index.30.nocfs.zip;Index\index.31.cfs.zip;Index\index.31.nocfs.zip;Index\index.31.optimized.cfs.zip;Index\index.31.optimized.nocfs.zip;Index\index.32.cfs.zip;Index\index.32.nocfs.zip;Index\index.34.cfs.zip;Index\index.34.nocfs.zip;Index\index.36.surrogates.zip;Index\index.40.cfs.zip;Index\index.40.nocfs.zip;Index\index.40.optimized.cfs.zip;Index\index.40.optimized.nocfs.zip;Index\index.41.cfs.zip [...] - <None Include="App.config" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestIndexWriterReader.cs" Link="Index\TestIndexWriterReader.cs" /> + <Compile Include="..\Lucene.Net.Tests\Search\**\*.cs" LinkBase="Search" /> + <Compile Include="..\Lucene.Net.Tests\Store\**\*.cs" LinkBase="Store" /> + <Compile Include="..\Lucene.Net.Tests\Support\**\*.cs" LinkBase="Support" /> + <Compile Include="..\Lucene.Net.Tests\Util\*.cs" LinkBase="Util" /> + <Compile Remove="..\Lucene.Net.Tests\Util\TestOfflineSorter.cs" Link="Util\TestOfflineSorter.cs" /> + <Compile Remove="..\Lucene.Net.Tests\Util\JunitCompat\**\*;..\Lucene.Net.Tests\Util\TestMaxFailuresRule.cs" /> + <EmbeddedResource Include="..\Lucene.Net.Tests\Store\LUCENENET521.zip" Link="Store\LUCENENET521.zip" /> + <EmbeddedResource Include="..\Lucene.Net.Tests\Support\IO\ReadFully.txt" Link="Support\IO\ReadFully.txt" /> + <EmbeddedResource Include="..\Lucene.Net.Tests\Support\hyts_PropertiesTest.properties" Link="Support\hyts_PropertiesTest.properties" /> </ItemGroup> - + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Codecs\Lucene.Net.Codecs.csproj" /> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" /> @@ -45,9 +51,9 @@ <ProjectReference Include="..\Lucene.Net.QueryParser\Lucene.Net.QueryParser.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> - + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> <DebugType>portable</DebugType> @@ -57,23 +63,22 @@ <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> - - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <Compile Remove="Util\JunitCompat\**\*;Support\TestCase.cs;Util\TestMaxFailuresRule.cs" /> - </ItemGroup> - + <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' "> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE;FEATURE_SERIALIZABLE_EXCEPTIONS</DefineConstants> <DebugType>full</DebugType> </PropertyGroup> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <Compile Remove="..\Lucene.Net.Tests\Support\TestCase.cs" /> + </ItemGroup> + <ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> - + <ItemGroup> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - -</Project> +</Project> \ No newline at end of file diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj similarity index 62% rename from src/Lucene.Net.Tests/Lucene.Net.Tests.csproj rename to src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj index fa3504d..3f87e3c 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj @@ -22,22 +22,23 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.props" /> - + <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> - - <AssemblyTitle>Lucene.Net.Tests</AssemblyTitle> + + <AssemblyTitle>Lucene.Net.Tests._U-Z</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> </PropertyGroup> - + <ItemGroup> - <Compile Remove="Util\JunitCompat\**\*;Util\TestMaxFailuresRule.cs" /> - <!--<Compile Exclude="Util\TestMaxFailuresRule.cs" />--> - <EmbeddedResource Include="Index\bogus24.upgraded.to.36.zip;Index\index.30.cfs.zip;Index\index.30.nocfs.zip;Index\index.31.cfs.zip;Index\index.31.nocfs.zip;Index\index.31.optimized.cfs.zip;Index\index.31.optimized.nocfs.zip;Index\index.32.cfs.zip;Index\index.32.nocfs.zip;Index\index.34.cfs.zip;Index\index.34.nocfs.zip;Index\index.36.surrogates.zip;Index\index.40.cfs.zip;Index\index.40.nocfs.zip;Index\index.40.optimized.cfs.zip;Index\index.40.optimized.nocfs.zip;Index\index.41.cfs.zip [...] - <None Include="App.config" /> + <Compile Include="..\Lucene.Net.Tests\Util\TestOfflineSorter.cs" Link="Util\TestOfflineSorter.cs" /> + <Compile Include="..\Lucene.Net.Tests\Util\Automaton\**\*.cs" LinkBase="Util\Automaton" /> + <Compile Include="..\Lucene.Net.Tests\Util\Fst\**\*.cs" LinkBase="Util\Fst" /> + <Compile Include="..\Lucene.Net.Tests\Util\Packed\**\*.cs" LinkBase="Util\Packed" /> + <Compile Remove="..\Lucene.Net.Tests\Util\JunitCompat\**\*;..\Lucene.Net.Tests\Util\TestMaxFailuresRule.cs" /> </ItemGroup> - + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Codecs\Lucene.Net.Codecs.csproj" /> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" /> @@ -45,9 +46,13 @@ <ProjectReference Include="..\Lucene.Net.QueryParser\Lucene.Net.QueryParser.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> + <PropertyGroup> + <DefineConstants>$(DefineConstants);FEATURE_UTIL_TESTS</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> <DebugType>portable</DebugType> @@ -57,23 +62,18 @@ <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> - - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <Compile Remove="Util\JunitCompat\**\*;Support\TestCase.cs;Util\TestMaxFailuresRule.cs" /> - </ItemGroup> - + <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' "> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE;FEATURE_SERIALIZABLE_EXCEPTIONS</DefineConstants> <DebugType>full</DebugType> </PropertyGroup> - + <ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> - + <ItemGroup> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> - -</Project> +</Project> \ No newline at end of file diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs index c99c487..5d1177b 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs @@ -72,6 +72,8 @@ namespace Lucene.Net.Index return count; } +#if FEATURE_INDEXWRITER_TESTS + [Test] public virtual void TestAddCloseOpen() { @@ -697,6 +699,8 @@ namespace Lucene.Net.Index dir1.Dispose(); } +#endif + /* * Delete a document by term and return the doc id * @@ -732,6 +736,8 @@ namespace Lucene.Net.Index } } +#if FEATURE_INDEXWRITER_TESTS + private class MyWarmer : IndexWriter.IndexReaderWarmer { internal int WarmCount; @@ -1422,5 +1428,6 @@ namespace Lucene.Net.Index w.Dispose(); dir.Dispose(); } +#endif } } \ No newline at end of file diff --git a/src/Lucene.Net/Properties/AssemblyInfo.cs b/src/Lucene.Net/Properties/AssemblyInfo.cs index 23ff800..a67a512 100644 --- a/src/Lucene.Net/Properties/AssemblyInfo.cs +++ b/src/Lucene.Net/Properties/AssemblyInfo.cs @@ -33,7 +33,9 @@ using System.Runtime.CompilerServices; // We need InternalsVisibleTo in order to prevent making everything public just for the sake of testing. // This has broad implications because many methods are marked "protected internal", which means other assemblies // must update overridden methods to match. -[assembly: InternalsVisibleTo("Lucene.Net.Tests, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._A-I, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._J-U, PublicKey=" + AssemblyKeys.PublicKey)] +[assembly: InternalsVisibleTo("Lucene.Net.Tests._U-Z, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.TestFramework, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Misc, PublicKey=" + AssemblyKeys.PublicKey)] [assembly: InternalsVisibleTo("Lucene.Net.Tests.ICU, PublicKey=" + AssemblyKeys.PublicKey)] // For Analysis.Util.TestSegmentingTokenizerBase
