svn commit: r1378341 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

[mb...@apache.org]

Author: mbautin
Date: Tue Aug 28 21:00:18 2012
New Revision: 1378341

URL: http://svn.apache.org/viewvc?rev=1378341&view=rev
Log:
[HBASE-6590] [0.89-fb] Fix TestStoreFile.

Author: aaiyer

Summary:
fix TestStoreFile to reflect the fact that bulk load
can also have sequence id

Test Plan: run the unit test

Reviewers: kannan, kranganathan

Reviewed By: kannan

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D554005

Blame Revision: https://reviews.facebook.net/D3789

Task ID: 1405145

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java?rev=1378341&r1=1378340&r2=1378341&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java Tue Aug 28 21:00:18 2012
@@ -608,13 +608,14 @@ public class TestStoreFile extends HBase
     fs.delete(f, true);
   }
 
-  public void testFlushTimeComparator() {
+  public void testSeqIdComparator() {
     assertOrdering(StoreFile.Comparators.SEQ_ID,
         mockStoreFile(true, 1000, -1, "/foo/123"),
         mockStoreFile(true, 1000, -1, "/foo/126"),
         mockStoreFile(true, 2000, -1, "/foo/126"),
         mockStoreFile(false, -1, 1, "/foo/1"),
         mockStoreFile(false, -1, 3, "/foo/2"),
+        mockStoreFile(true, 2000, 4, "/foo/126"),
         mockStoreFile(false, -1, 5, "/foo/2"),
         mockStoreFile(false, -1, 5, "/foo/3"));
   }
@@ -640,13 +641,7 @@ public class TestStoreFile extends HBase
     StoreFile mock = Mockito.mock(StoreFile.class);
     Mockito.doReturn(bulkLoad).when(mock).isBulkLoadResult();
     Mockito.doReturn(bulkTimestamp).when(mock).getBulkLoadTimestamp();
-    if (bulkLoad) {
-      // Bulk load files will throw if you ask for their sequence ID
-      Mockito.doThrow(new IllegalAccessError("bulk load"))
-        .when(mock).getMaxSequenceId();
-    } else {
-      Mockito.doReturn(seqId).when(mock).getMaxSequenceId();
-    }
+    Mockito.doReturn(seqId).when(mock).getMaxSequenceId();
     Mockito.doReturn(new Path(path)).when(mock).getPath();
     String name = "mock storefile, bulkLoad=" + bulkLoad +
       " bulkTimestamp=" + bulkTimestamp +
@@ -928,4 +923,4 @@ public class TestStoreFile extends HBase
   public static List<StoreFile> getStoreFiles(Store s) {
     return s.getStorefiles();
   }
-}
\ No newline at end of file
+}