|
39 | 39 | */ |
40 | 40 | public class TestMVStore extends TestBase { |
41 | 41 |
|
| 42 | + private static final int CURRENT_FORMAT = 3; |
| 43 | + |
42 | 44 | /** |
43 | 45 | * Run just this test. |
44 | 46 | * |
@@ -426,9 +428,9 @@ private void testNewerWriteVersion() { |
426 | 428 | open(); |
427 | 429 | s.setRetentionTime(Integer.MAX_VALUE); |
428 | 430 | Map<String, Object> header = s.getStoreHeader(); |
429 | | - assertEquals("2", header.get("format").toString()); |
430 | | - header.put("formatRead", "2"); |
431 | | - header.put("format", "3"); |
| 431 | + assertEquals(Integer.toString(CURRENT_FORMAT), header.get("format").toString()); |
| 432 | + header.put("formatRead", Integer.toString(CURRENT_FORMAT)); |
| 433 | + header.put("format", Integer.toString(CURRENT_FORMAT + 1)); |
432 | 434 | forceWriteStoreHeader(s); |
433 | 435 | MVMap<Integer, String> m = s.openMap("data"); |
434 | 436 | forceWriteStoreHeader(s); |
@@ -727,7 +729,7 @@ private void testFileFormatChange() { |
727 | 729 | m.put(1, 1); |
728 | 730 | Map<String, Object> header = s.getStoreHeader(); |
729 | 731 | int format = Integer.parseInt(header.get("format").toString()); |
730 | | - assertEquals(2, format); |
| 732 | + assertEquals(CURRENT_FORMAT, format); |
731 | 733 | header.put("format", Integer.toString(format + 1)); |
732 | 734 | forceWriteStoreHeader(s); |
733 | 735 | } |
@@ -849,7 +851,7 @@ private void testFileHeader() { |
849 | 851 | s.setRetentionTime(Integer.MAX_VALUE); |
850 | 852 | long time = System.currentTimeMillis(); |
851 | 853 | Map<String, Object> m = s.getStoreHeader(); |
852 | | - assertEquals("2", m.get("format").toString()); |
| 854 | + assertEquals(Integer.toString(CURRENT_FORMAT), m.get("format").toString()); |
853 | 855 | long creationTime = (Long) m.get("created"); |
854 | 856 | assertTrue(Math.abs(time - creationTime) < 100); |
855 | 857 | m.put("test", "123"); |
|
0 commit comments