Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-21242 [amv2] Miscellaneous minor log and assign procedure create improvements; ADDENDUM Fix TestHRegionInfo AND TestRegionInfoDisplay

This commit is contained in:
Michael Stack 2018-10-12 16:09:37 -07:00
parent 5762f879d2
commit 7f3ca4643d
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestRegionInfoDisplay.java
View File

@ -34,6 +34,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.rules.TestName; import org.junit.rules.TestName;
import static org.junit.Assert.assertTrue;
@Category({MasterTests.class, SmallTests.class}) @Category({MasterTests.class, SmallTests.class})
public class TestRegionInfoDisplay { public class TestRegionInfoDisplay {
@ -92,7 +94,16 @@ public class TestRegionInfoDisplay {
origDesc.indexOf(Bytes.toStringBinary(startKey)) + origDesc.indexOf(Bytes.toStringBinary(startKey)) +
Bytes.toStringBinary(startKey).length()); Bytes.toStringBinary(startKey).length());
assert(firstPart.equals(firstPartOrig)); assert(firstPart.equals(firstPartOrig));
assert(secondPart.equals(secondPartOrig)); // The elapsed time may be different in the two Strings since they were calculated at different
// times... so, don't include that portion when we compare. It starts with a '('.
// Second part looks like this:
// ",1539385518431.9d15487c60247dc3876b8b2a842929ed. state=OPEN,
// ts=Fri Oct 12 16:05:18 PDT 2018 (PT0S ago), server=null"
int indexOfElapsedTime = secondPart.indexOf("(");
assertTrue(indexOfElapsedTime > 0);
assertTrue(secondPart + " " + secondPartOrig,
secondPart.substring(0, indexOfElapsedTime).equals(secondPartOrig.
substring(0, indexOfElapsedTime)));
} }
private void checkEquality(RegionInfo ri, Configuration conf) throws IOException { private void checkEquality(RegionInfo ri, Configuration conf) throws IOException {

3
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
View File

@ -296,6 +296,7 @@ public class TestHRegionInfo {
assertEquals(expectedHri, convertedHri); assertEquals(expectedHri, convertedHri);
} }
<<<<<<< Updated upstream
@Test @Test
public void testRegionDetailsForDisplay() throws IOException { public void testRegionDetailsForDisplay() throws IOException {
byte[] startKey = new byte[] {0x01, 0x01, 0x02, 0x03}; byte[] startKey = new byte[] {0x01, 0x01, 0x02, 0x03};
@ -362,5 +363,7 @@ public class TestHRegionInfo {
} }
} }
} }
=======
>>>>>>> Stashed changes
} }