You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/05/05 19:44:16 UTC

[1/3] lucenenet git commit: check for appropriate exception

Repository: lucenenet
Updated Branches:
  refs/heads/master 784eba7e8 -> 792dbad3e


check for appropriate exception


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1454e2bd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1454e2bd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1454e2bd

Branch: refs/heads/master
Commit: 1454e2bdccf05ff01095912989974e32d9728427
Parents: 784eba7
Author: Laimonas Simutis <la...@gmail.com>
Authored: Mon May 4 16:03:39 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Mon May 4 16:03:39 2015 -0400

----------------------------------------------------------------------
 src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1454e2bd/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 7eda017..a3d0c49 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -743,7 +743,7 @@ namespace Lucene.Net.Index
                 DirectoryReader.Open(dir);
                 Assert.Fail("did not hit expected exception");
             }
-            catch (IndexNotFoundException nsde)
+            catch (NoSuchDirectoryException nsde)
             {
                 // expected
             }


[3/3] lucenenet git commit: Merge remote-tracking branch 'laimis/nextrand_fix'

Posted by sy...@apache.org.
Merge remote-tracking branch 'laimis/nextrand_fix'


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/792dbad3
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/792dbad3
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/792dbad3

Branch: refs/heads/master
Commit: 792dbad3e873b8ef17418a439496901dbf1b8cf7
Parents: 1454e2b b22388e
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Tue May 5 20:43:58 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Tue May 5 20:43:58 2015 +0300

----------------------------------------------------------------------
 .../Index/BaseStoredFieldsFormatTestCase.cs               | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



[2/3] lucenenet git commit: use proper random.next

Posted by sy...@apache.org.
use proper random.next


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b22388e1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b22388e1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b22388e1

Branch: refs/heads/master
Commit: b22388e19134b1d263cf3aa702f63e7f35a62d8f
Parents: 784eba7
Author: Laimonas Simutis <la...@gmail.com>
Authored: Mon May 4 21:50:00 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Mon May 4 21:50:00 2015 -0400

----------------------------------------------------------------------
 .../Index/BaseStoredFieldsFormatTestCase.cs               | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b22388e1/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index 943bb86..6f202a5 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -475,7 +475,7 @@ namespace Lucene.Net.Index
             AtomicReference<Exception> ex = new AtomicReference<Exception>();
             for (int i = 0; i < concurrentReads; ++i)
             {
-                readThreads.Add(new ThreadAnonymousInnerClassHelper(this, numDocs, rd, searcher, readsPerThread, ex, i));
+                readThreads.Add(new ThreadAnonymousInnerClassHelper(numDocs, rd, searcher, readsPerThread, ex, i));
             }
             foreach (ThreadClass thread in readThreads)
             {
@@ -497,8 +497,6 @@ namespace Lucene.Net.Index
 
         private class ThreadAnonymousInnerClassHelper : ThreadClass
         {
-            private readonly BaseStoredFieldsFormatTestCase OuterInstance;
-
             private int NumDocs;
             private readonly DirectoryReader Rd;
             private readonly IndexSearcher Searcher;
@@ -507,9 +505,8 @@ namespace Lucene.Net.Index
             private int i;
             private readonly int[] queries;
 
-            public ThreadAnonymousInnerClassHelper(BaseStoredFieldsFormatTestCase outerInstance, int numDocs, DirectoryReader rd, IndexSearcher searcher, int readsPerThread, AtomicReference<Exception> ex, int i)
+            public ThreadAnonymousInnerClassHelper(int numDocs, DirectoryReader rd, IndexSearcher searcher, int readsPerThread, AtomicReference<Exception> ex, int i)
             {
-                this.OuterInstance = outerInstance;
                 this.NumDocs = numDocs;
                 this.Rd = rd;
                 this.Searcher = searcher;
@@ -520,7 +517,7 @@ namespace Lucene.Net.Index
                 queries = new int[ReadsPerThread];
                 for (int j = 0; j < queries.Length; ++j)
                 {
-                    queries[j] = Random().NextIntBetween(0, NumDocs);
+                    queries[j] = Random().Next(NumDocs);
                 }
             }
 
@@ -534,6 +531,7 @@ namespace Lucene.Net.Index
                         TopDocs topDocs = Searcher.Search(query, 1);
                         if (topDocs.TotalHits != 1)
                         {
+                            Console.WriteLine(query);
                             throw new InvalidOperationException("Expected 1 hit, got " + topDocs.TotalHits);
                         }
                         Document sdoc = Rd.Document(topDocs.ScoreDocs[0].Doc);