You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2020/07/03 15:25:52 UTC
[lucenenet] 03/05: Lucene.Net.Tests: Combined T-Z into a single
project
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 a74ce6cafbd5a38c6abdc4f2d7fbf8be713cedef
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Fri Jul 3 20:43:05 2020 +0700
Lucene.Net.Tests: Combined T-Z into a single project
---
Lucene.Net.sln | 20 +++----
.../publish-test-results-for-test-projects.yml | 11 +---
.../Lucene.Net.TestFramework.csproj | 3 +-
.../Lucene.Net.Tests._T-Z.csproj} | 21 ++++---
.../Lucene.Net.Tests._U-Z.csproj | 69 ----------------------
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 10 ----
src/Lucene.Net/Lucene.Net.csproj | 3 +-
7 files changed, 24 insertions(+), 113 deletions(-)
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index b11d8e5..9c6c592 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -178,9 +178,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests._E-I", "sr
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-U", "src\Lucene.Net.Tests._T-U\Lucene.Net.Tests._T-U.csproj", "{DF60E276-91AD-4386-A5B5-13EB24E335E6}"
-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}"
+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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.TestFramework", "src\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj", "{845F8491-348C-4242-A58A-1979E8338B5D}"
EndProject
@@ -414,18 +412,18 @@ Global
{8251BB22-EDA9-4850-A9B7-259C5B171040}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8251BB22-EDA9-4850-A9B7-259C5B171040}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8251BB22-EDA9-4850-A9B7-259C5B171040}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1FD12FC1-BE00-4EA3-8377-2043A6D6E6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1FD12FC1-BE00-4EA3-8377-2043A6D6E6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1FD12FC1-BE00-4EA3-8377-2043A6D6E6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1FD12FC1-BE00-4EA3-8377-2043A6D6E6E6}.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
- {DF60E276-91AD-4386-A5B5-13EB24E335E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DF60E276-91AD-4386-A5B5-13EB24E335E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DF60E276-91AD-4386-A5B5-13EB24E335E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DF60E276-91AD-4386-A5B5-13EB24E335E6}.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
+ {2C6C2EDE-C4B6-45D3-8E86-CDAE0A629FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2C6C2EDE-C4B6-45D3-8E86-CDAE0A629FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2C6C2EDE-C4B6-45D3-8E86-CDAE0A629FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2C6C2EDE-C4B6-45D3-8E86-CDAE0A629FD6}.Release|Any CPU.Build.0 = Release|Any CPU
{845F8491-348C-4242-A58A-1979E8338B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{845F8491-348C-4242-A58A-1979E8338B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{845F8491-348C-4242-A58A-1979E8338B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
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 04f6eb3..b40f02c 100644
--- a/build/azure-templates/publish-test-results-for-test-projects.yml
+++ b/build/azure-templates/publish-test-results-for-test-projects.yml
@@ -135,16 +135,7 @@ steps:
- template: publish-test-results.yml
parameters:
- testProjectName: 'Lucene.Net.Tests._T-U'
- 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._U-Z'
+ testProjectName: 'Lucene.Net.Tests._T-Z'
osName: '${{ parameters.osName }}'
framework: '${{ parameters.framework }}'
testResultsFormat: '${{ parameters.testResultsFormat }}'
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index 5dfda54..0739bcb 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -94,8 +94,7 @@
<InternalsVisibleTo Include="Lucene.Net.Tests._A-D" />
<InternalsVisibleTo Include="Lucene.Net.Tests._E-I" />
<InternalsVisibleTo Include="Lucene.Net.Tests._J-S" />
- <InternalsVisibleTo Include="Lucene.Net.Tests._T-U" />
- <InternalsVisibleTo Include="Lucene.Net.Tests._U-Z" />
+ <InternalsVisibleTo Include="Lucene.Net.Tests._T-Z" />
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Common" />
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Kuromoji" />
diff --git a/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj b/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj
similarity index 80%
rename from src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj
rename to src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj
index 6a45a77..dcf546a 100644
--- a/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj
+++ b/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj
@@ -26,15 +26,14 @@
<PropertyGroup>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <AssemblyTitle>Lucene.Net.Tests._T-U</AssemblyTitle>
+ <AssemblyTitle>Lucene.Net.Tests._T-Z</AssemblyTitle>
<RootNamespace>Lucene.Net</RootNamespace>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\Lucene.Net.Tests\Util\*.cs" LinkBase="Util" />
- <Compile Remove="..\Lucene.Net.Tests\Util\TestOfflineSorter.cs" Link="Util\TestOfflineSorter.cs" />
+ <Compile Include="..\Lucene.Net.Tests\Util\**\*.cs" LinkBase="Util" />
<Compile Remove="..\Lucene.Net.Tests\Util\JunitCompat\**\*;..\Lucene.Net.Tests\Util\TestMaxFailuresRule.cs" />
</ItemGroup>
@@ -45,15 +44,19 @@
<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>
+ <Import Project="$(SolutionDir)build/TestReferences.Common.targets" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
- <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)"/>
+ <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+ <Compile Remove="..\Lucene.Net.Tests\Support\TestCase.cs" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+ <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
diff --git a/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj b/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj
deleted file mode 100644
index 10f2307..0000000
--- a/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<Project Sdk="Microsoft.NET.Sdk">
-
- <Import Project="$(SolutionDir)TestTargetFramework.props" />
-
- <PropertyGroup>
- <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-
- <AssemblyTitle>Lucene.Net.Tests._U-Z</AssemblyTitle>
- <RootNamespace>Lucene.Net</RootNamespace>
- <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
- <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
- </PropertyGroup>
-
- <ItemGroup>
- <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" />
- <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
- <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>
-
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
- <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)"/>
- </ItemGroup>
-
- <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
- <ItemGroup>
- <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
index 7f83222..03e4af5 100644
--- a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
+++ b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
@@ -28,8 +28,6 @@ namespace Lucene.Net.Util
public class TestNumericUtils : LuceneTestCase
{
-#if FEATURE_UTIL_TESTS
-
[Test]
public virtual void TestLongConversionAndOrdering()
{
@@ -190,8 +188,6 @@ namespace Lucene.Net.Util
}
}
-#endif
-
public static readonly double[] DOUBLE_NANs = new double[] {
double.NaN,
J2N.BitConversion.Int64BitsToDouble(0x7ff0000000000001L),
@@ -200,8 +196,6 @@ namespace Lucene.Net.Util
J2N.BitConversion.Int64BitsToDouble(unchecked((long)0xffffffffffffffffL))
};
-#if FEATURE_UTIL_TESTS
-
[Test]
public virtual void TestSortableDoubleNaN()
{
@@ -233,7 +227,6 @@ namespace Lucene.Net.Util
Assert.IsTrue(intVals[i - 1] < intVals[i], "check sort order");
}
}
-#endif
public static readonly float[] FLOAT_NANs = new float[] {
float.NaN,
@@ -243,8 +236,6 @@ namespace Lucene.Net.Util
J2N.BitConversion.Int32BitsToSingle(unchecked((int)0xffffffff))
};
-#if FEATURE_UTIL_TESTS
-
[Test]
public virtual void TestSortableFloatNaN()
{
@@ -558,6 +549,5 @@ namespace Lucene.Net.Util
// a 0-length range should reproduce the range itself
AssertIntRangeSplit(9500, 9500, 4, false, new int[] { unchecked((int)0x8000251c), unchecked((int)0x8000251c) }, new int[] { 0 });
}
-#endif
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index b15c14e..c83e3bb 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -117,8 +117,7 @@
<InternalsVisibleTo Include="Lucene.Net.Tests._A-D" />
<InternalsVisibleTo Include="Lucene.Net.Tests._E-I" />
<InternalsVisibleTo Include="Lucene.Net.Tests._J-S" />
- <InternalsVisibleTo Include="Lucene.Net.Tests._T-U" />
- <InternalsVisibleTo Include="Lucene.Net.Tests._U-Z" />
+ <InternalsVisibleTo Include="Lucene.Net.Tests._T-Z" />
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Common" />
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Kuromoji" />