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 2019/09/06 09:01:27 UTC
[lucenenet] 17/21:
Lucene.Net.Tests.Analysis.Common.Analysis.Synonym,
Lucene.Net.Tests.Grouping: Fixed some issues with string/number conversions
(set to invariant culture)
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 8b44368c4a3a14ccf2bbb761473f14b19f76ba5e
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Sep 4 00:02:36 2019 +0700
Lucene.Net.Tests.Analysis.Common.Analysis.Synonym, Lucene.Net.Tests.Grouping: Fixed some issues with string/number conversions (set to invariant culture)
---
.../Analysis/Synonym/TestSlowSynonymFilter.cs | 7 ++++---
.../Analysis/Synonym/TestSynonymMapFilter.cs | 7 ++++---
src/Lucene.Net.Tests.Grouping/TestGrouping.cs | 5 +++--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
index c2cf39b..696dec8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Util;
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.IO;
using System.Text;
using NUnit.Framework;
@@ -290,7 +291,7 @@ namespace Lucene.Net.Analysis.Synonym
if (@params.Length > 1)
{
- posInc = int.Parse(@params[1]);
+ posInc = int.Parse(@params[1], CultureInfo.InvariantCulture);
}
else
{
@@ -299,7 +300,7 @@ namespace Lucene.Net.Analysis.Synonym
if (@params.Length > 2)
{
- start = int.Parse(@params[2]);
+ start = int.Parse(@params[2], CultureInfo.InvariantCulture);
}
else
{
@@ -308,7 +309,7 @@ namespace Lucene.Net.Analysis.Synonym
if (@params.Length > 3)
{
- end = int.Parse(@params[3]);
+ end = int.Parse(@params[3], CultureInfo.InvariantCulture);
}
else
{
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
index 173b86a..7dd932d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.Globalization;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
@@ -120,12 +121,12 @@ namespace Lucene.Net.Analysis.Synonym
expectedToken = expectedAtPos[atPos].Substring(0, colonIndex - 0);
if (underbarIndex != -1)
{
- expectedEndOffset = int.Parse(expectedAtPos[atPos].Substring(1 + colonIndex, underbarIndex - (1 + colonIndex)));
- expectedPosLen = int.Parse(expectedAtPos[atPos].Substring(1 + underbarIndex));
+ expectedEndOffset = int.Parse(expectedAtPos[atPos].Substring(1 + colonIndex, underbarIndex - (1 + colonIndex)), CultureInfo.InvariantCulture);
+ expectedPosLen = int.Parse(expectedAtPos[atPos].Substring(1 + underbarIndex), CultureInfo.InvariantCulture);
}
else
{
- expectedEndOffset = int.Parse(expectedAtPos[atPos].Substring(1 + colonIndex));
+ expectedEndOffset = int.Parse(expectedAtPos[atPos].Substring(1 + colonIndex), CultureInfo.InvariantCulture);
expectedPosLen = 1;
}
}
diff --git a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
index 25e21c3..16881aa 100644
--- a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
+++ b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
@@ -34,6 +34,7 @@ using NUnit.Framework;
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Text;
@@ -1387,7 +1388,7 @@ namespace Lucene.Net.Search.Grouping
if (groupDocsHits.GroupSortValues != null)
{
//Console.WriteLine("remap " + groupDocsHits.groupSortValues[groupSortIDX] + " to " + termScoreMap.get(groupDocsHits.groupSortValues[groupSortIDX]));
- groupDocsHits.GroupSortValues[groupSortIDX] = termScoreMap[Convert.ToSingle(groupDocsHits.GroupSortValues[groupSortIDX])];
+ groupDocsHits.GroupSortValues[groupSortIDX] = termScoreMap[Convert.ToSingle(groupDocsHits.GroupSortValues[groupSortIDX], CultureInfo.InvariantCulture)];
assertNotNull(groupDocsHits.GroupSortValues[groupSortIDX]);
}
}
@@ -1406,7 +1407,7 @@ namespace Lucene.Net.Search.Grouping
FieldDoc hit = (FieldDoc)_hit;
if (hit.Fields != null)
{
- hit.Fields[docSortIDX] = termScoreMap[Convert.ToSingle(hit.Fields[docSortIDX])];
+ hit.Fields[docSortIDX] = termScoreMap[Convert.ToSingle(hit.Fields[docSortIDX], CultureInfo.InvariantCulture)];
assertNotNull(hit.Fields[docSortIDX]);
}
}