Skip to content

Commit 307cb83

Browse files
committed
Revert global using change; fix TestRAMDirectory concurrency issue
1 parent 118c197 commit 307cb83

470 files changed

Lines changed: 470 additions & 27 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/GlobalTestUsings.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// alias Assert to Lucene.Net.TestFramework.Assert by default
2-
global using Assert = Lucene.Net.TestFramework.Assert;
3-
41
// add NUnit 3 compat shim with NUnit prefix
52
global using NUnitAssert = NUnit.Framework.Legacy.ClassicAssert;
63

src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using System.IO;
1515
using System.Text;
1616
using System.Threading;
17+
using Assert = Lucene.Net.TestFramework.Assert;
1718
using Attribute = Lucene.Net.Util.Attribute;
1819
using Directory = Lucene.Net.Store.Directory;
1920
using JCG = J2N.Collections.Generic;

src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Collections.Generic;
1010
using System.IO;
1111
using System.Text;
12+
using Assert = Lucene.Net.TestFramework.Assert;
1213
using Directory = Lucene.Net.Store.Directory;
1314

1415
namespace Lucene.Net.Analysis

src/Lucene.Net.TestFramework/Analysis/MockTokenizer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System;
88
using System.Globalization;
99
using System.IO;
10+
using Assert = Lucene.Net.TestFramework.Assert;
1011
using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton;
1112
using RegExp = Lucene.Net.Util.Automaton.RegExp;
1213

src/Lucene.Net.TestFramework/Analysis/VocabularyAssert.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System.IO.Compression;
55
using System.Text;
6+
using Assert = Lucene.Net.TestFramework.Assert;
67

78
namespace Lucene.Net.Analysis
89
{

src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Collections.Generic;
88
using RandomizedTesting.Generators;
99
using JCG = J2N.Collections.Generic;
10+
using Assert = Lucene.Net.TestFramework.Assert;
1011
using Test = NUnit.Framework.TestAttribute;
1112

1213
namespace Lucene.Net.Index

src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using System.Globalization;
1717
using System.Threading;
1818
using static Lucene.Net.Index.TermsEnum;
19+
using Assert = Lucene.Net.TestFramework.Assert;
1920
using JCG = J2N.Collections.Generic;
2021
using Test = NUnit.Framework.TestAttribute;
2122

src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Collections.Generic;
1313
using System.IO;
1414
using System.Linq;
15+
using Assert = Lucene.Net.TestFramework.Assert;
1516
using Directory = Lucene.Net.Store.Directory;
1617
using JCG = J2N.Collections.Generic;
1718
using Test = NUnit.Framework.TestAttribute;

src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using System.Runtime.ExceptionServices;
2222
using System.Text;
2323
using JCG = J2N.Collections.Generic;
24+
using Assert = Lucene.Net.TestFramework.Assert;
2425
using RandomInts = RandomizedTesting.Generators.RandomNumbers;
2526
using Number = J2N.Numerics.Number;
2627
using Double = J2N.Numerics.Double;

src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System.Collections.Generic;
1616
using System.Linq;
1717
using static Lucene.Net.Index.TermsEnum;
18+
using Assert = Lucene.Net.TestFramework.Assert;
1819
using Attribute = Lucene.Net.Util.Attribute;
1920
using JCG = J2N.Collections.Generic;
2021
using Test = NUnit.Framework.TestAttribute;

0 commit comments

Comments
 (0)