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 c4acbd597a9b6700813b69a6e6c119e59611abae Author: Shad Storhaug <[email protected]> AuthorDate: Fri Jul 3 20:48:07 2020 +0700 Lucene.Net.Tests: Split E-I int E-I and I-J --- Lucene.Net.sln | 2 ++ .../publish-test-results-for-test-projects.yml | 9 ++++++ .../Lucene.Net.TestFramework.csproj | 1 + .../Lucene.Net.Tests._E-I.csproj | 22 ++++++++++---- .../Lucene.Net.Tests._I-J.csproj} | 35 +++++++++++++++------- .../Index/TestBinaryDocValuesUpdates.cs | 4 +++ src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 7 +++++ src/Lucene.Net/Lucene.Net.csproj | 1 + 8 files changed, 64 insertions(+), 17 deletions(-) diff --git a/Lucene.Net.sln b/Lucene.Net.sln index 9c6c592..389ea17 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -176,6 +176,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._A-D", "sr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._E-I", "src\Lucene.Net.Tests._E-I\Lucene.Net.Tests._E-I.csproj", "{8251BB22-EDA9-4850-A9B7-259C5B171040}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._I-J", "src\Lucene.Net.Tests._I-J\Lucene.Net.Tests._I-J.csproj", "{1FD12FC1-BE00-4EA3-8377-2043A6D6E6E6}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._J-S", "src\Lucene.Net.Tests._J-S\Lucene.Net.Tests._J-S.csproj", "{5BE1EBA7-876C-4E9D-A78C-46A0D6F588C9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._T-Z", "src\Lucene.Net.Tests._T-Z\Lucene.Net.Tests._T-Z.csproj", "{2C6C2EDE-C4B6-45D3-8E86-CDAE0A629FD6}" diff --git a/build/azure-templates/publish-test-results-for-test-projects.yml b/build/azure-templates/publish-test-results-for-test-projects.yml index b40f02c..038ec93 100644 --- a/build/azure-templates/publish-test-results-for-test-projects.yml +++ b/build/azure-templates/publish-test-results-for-test-projects.yml @@ -126,6 +126,15 @@ steps: - template: publish-test-results.yml parameters: + testProjectName: 'Lucene.Net.Tests._I-J' + osName: '${{ parameters.osName }}' + framework: '${{ parameters.framework }}' + testResultsFormat: '${{ parameters.testResultsFormat }}' + testResultsArtifactName: '${{ parameters.testResultsArtifactName }}' + testResultsFileName: '${{ parameters.testResultsFileName }}' + +- template: publish-test-results.yml + parameters: testProjectName: 'Lucene.Net.Tests._J-S' osName: '${{ parameters.osName }}' framework: '${{ parameters.framework }}' diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 0739bcb..18cca06 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -93,6 +93,7 @@ <InternalsVisibleTo Include="Lucene.Net.Tests._A-D" /> <InternalsVisibleTo Include="Lucene.Net.Tests._E-I" /> + <InternalsVisibleTo Include="Lucene.Net.Tests._I-J" /> <InternalsVisibleTo Include="Lucene.Net.Tests._J-S" /> <InternalsVisibleTo Include="Lucene.Net.Tests._T-Z" /> diff --git a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj index f0a702a..ecd0200 100644 --- a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj +++ b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj @@ -31,12 +31,22 @@ <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> </PropertyGroup> - + <ItemGroup> - <Compile Include="..\Lucene.Net.Tests\Index\**\*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\BinaryTokenStream.cs" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestA*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestB*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestC*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestD*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestE*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestF*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestG*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestH*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestI*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestJ*.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" /> @@ -44,13 +54,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> - + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)"/> </ItemGroup> diff --git a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj b/src/Lucene.Net.Tests._I-J/Lucene.Net.Tests._I-J.csproj similarity index 57% copy from src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj copy to src/Lucene.Net.Tests._I-J/Lucene.Net.Tests._I-J.csproj index f0a702a..66346fe 100644 --- a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj +++ b/src/Lucene.Net.Tests._I-J/Lucene.Net.Tests._I-J.csproj @@ -26,17 +26,34 @@ <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> - <AssemblyTitle>Lucene.Net.Tests._E-I</AssemblyTitle> + <AssemblyTitle>Lucene.Net.Tests._I-J</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> </PropertyGroup> - + <ItemGroup> - <Compile Include="..\Lucene.Net.Tests\Index\**\*.cs" LinkBase="Index" /> - <EmbeddedResource Include="..\Lucene.Net.Tests\Index\*.zip" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestBinaryDocValuesUpdates.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestIndexWriterReader.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestIndexWriter.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestK*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestL*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestM*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestN*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestO*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestP*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestQ*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestR*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestS*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestT*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestU*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestV*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestW*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestX*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestY*.cs" LinkBase="Index" /> + <Compile Include="..\Lucene.Net.Tests\Index\TestZ*.cs" LinkBase="Index" /> </ItemGroup> - + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Codecs\Lucene.Net.Codecs.csproj" /> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" /> @@ -44,15 +61,11 @@ <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> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' "> - <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)"/> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'net48' "> diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs index d266f9e..8e6ad4b 100644 --- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs @@ -105,6 +105,8 @@ namespace Lucene.Net.Index return doc; } +#if FEATURE_INDEXWRITER_TESTS + [Test] public virtual void TestUpdatesAreFlushed() { @@ -1856,6 +1858,8 @@ namespace Lucene.Net.Index } } +#endif + private FacetsConfig GetFacetConfig() { FacetsConfig facetConfig = new FacetsConfig(); diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 1101ce2..d3320e6 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -87,6 +87,8 @@ namespace Lucene.Net.Index { private static readonly FieldType StoredTextType = new FieldType(TextField.TYPE_NOT_STORED); +#if FEATURE_INDEXWRITER_TESTS + [Test] public virtual void TestDocCount() { @@ -178,6 +180,8 @@ namespace Lucene.Net.Index writer.AddDocument(doc); } +#endif + public static void AssertNoUnreferencedFiles(Directory dir, string message) { string[] startFiles = dir.ListAll(); @@ -207,6 +211,8 @@ namespace Lucene.Net.Index return s; } +#if FEATURE_INDEXWRITER_TESTS + // Make sure we can open an index for create even when a // reader holds it open (this fails pre lock-less // commits on windows): @@ -2945,5 +2951,6 @@ namespace Lucene.Net.Index r.Dispose(); dir.Dispose(); } +#endif } } \ No newline at end of file diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index c83e3bb..d8c21f1 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -116,6 +116,7 @@ <InternalsVisibleTo Include="Lucene.Net.Tests._A-D" /> <InternalsVisibleTo Include="Lucene.Net.Tests._E-I" /> + <InternalsVisibleTo Include="Lucene.Net.Tests._I-J" /> <InternalsVisibleTo Include="Lucene.Net.Tests._J-S" /> <InternalsVisibleTo Include="Lucene.Net.Tests._T-Z" />
