Skip to content

Commit f61bac3

Browse files
authored
Fixed creation time tests to check kv versions
* Fixed creation time tests to check kv versions * Fixed changelog entry
1 parent 16afed7 commit f61bac3

File tree

2 files changed

+37
-14
lines changed

2 files changed

+37
-14
lines changed

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
1818
- Added row creation time support, new API: GetResult getCreationTime(),
1919
Put/Delete/Write/WriteMultiple Result getExistingCreationTime().
2020

21+
### Changed
22+
- Authentication calls for on premises login will now honor the request timeout
23+
rather than using a hard-coded 30s timeout
24+
2125
## [5.4.17] 2025-03-03
2226

2327
### Added
@@ -29,9 +33,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
2933

3034
### Changed
3135
- Update netty dependency to 4.1.118.Final
32-
- Authentication calls for on premises login will now honor the request timeout
33-
rather than using a hard-coded 30s timeout
34-
3536

3637
## [5.4.16] 2024-11-21
3738

driver/src/test/java/oracle/nosql/driver/BasicTest.java

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,17 @@ public void smokeTest() {
171171
if (proxySerialVersion <= V4) {
172172
assertNull(pr.getExistingVersion());
173173
assertNull(pr.getExistingValue());
174-
assertEquals(0, pr.getExistingCreationTime());
174+
if (checkKVVersion(25, 3, 1)) {
175+
assertEquals(0, pr.getExistingCreationTime());
176+
}
175177
assertEquals(0, pr.getExistingModificationTime());
176178
assertWriteKB(pr);
177179
} else {
178180
assertNotNull(pr.getExistingVersion());
179181
assertNotNull(pr.getExistingValue());
180-
assertTrue(pr.getExistingCreationTime() != 0);
182+
if (checkKVVersion(25, 3, 1)) {
183+
assertTrue(pr.getExistingCreationTime() != 0);
184+
}
181185
assertTrue(pr.getExistingModificationTime() != 0);
182186
assertReadKB(pr);
183187
assertWriteKB(pr);
@@ -188,7 +192,9 @@ public void smokeTest() {
188192
assertNull(pr.getVersion()); /* failure */
189193
assertNotNull(pr.getExistingVersion());
190194
assertNotNull(pr.getExistingValue());
191-
assertTrue(pr.getExistingCreationTime() != 0);
195+
if (checkKVVersion(25, 3, 1)) {
196+
assertTrue(pr.getExistingCreationTime() != 0);
197+
}
192198
assertTrue(pr.getExistingModificationTime() != 0);
193199
assertReadKB(pr);
194200

@@ -271,7 +277,9 @@ public void testSimpleThroughput() throws Exception {
271277
assertEquals(0, origRead);
272278
assertNull("Not expecting previous version", res.getExistingVersion());
273279
assertNull("Not expecting previous value", res.getExistingValue());
274-
assertEquals(0, res.getExistingCreationTime());
280+
if (checkKVVersion(25, 3, 1)) {
281+
assertEquals(0, res.getExistingCreationTime());
282+
}
275283
assertEquals(0, res.getExistingModificationTime());
276284

277285

@@ -286,7 +294,9 @@ public void testSimpleThroughput() throws Exception {
286294
assertEquals(0, newRead);
287295
assertNull("Not expecting previous version", res.getExistingVersion());
288296
assertNull("Not expecting previous value", res.getExistingValue());
289-
assertEquals(0, res.getExistingCreationTime());
297+
if (checkKVVersion(25, 3, 1)) {
298+
assertEquals(0, res.getExistingCreationTime());
299+
}
290300
assertEquals(0, res.getExistingModificationTime());
291301

292302
/* set return row and check */
@@ -300,14 +310,18 @@ public void testSimpleThroughput() throws Exception {
300310
assertEquals(0, newRead);
301311
assertNull("Not expecting previous version", res.getExistingVersion());
302312
assertNull("Not expecting previous value", res.getExistingValue());
303-
assertEquals(0, res.getExistingCreationTime());
313+
if (checkKVVersion(25, 3, 1)) {
314+
assertEquals(0, res.getExistingCreationTime());
315+
}
304316
assertEquals(0, res.getExistingModificationTime());
305317
} else {
306318
assertEquals(1, newRead);
307319
assertNotNull("Expecting previous version",
308320
res.getExistingVersion());
309321
assertNotNull("Expecting previous value", res.getExistingValue());
310-
assertTrue(res.getExistingCreationTime() != 0);
322+
if (checkKVVersion(25, 3, 1)) {
323+
assertTrue(res.getExistingCreationTime() != 0);
324+
}
311325
assertTrue(res.getExistingModificationTime() != 0);
312326
}
313327

@@ -327,7 +341,9 @@ public void testSimpleThroughput() throws Exception {
327341
assertNotNull("Expecting previous version",
328342
res.getExistingVersion());
329343
assertNotNull("Expecting previous value", res.getExistingValue());
330-
assertTrue(res.getExistingCreationTime() != 0);
344+
if (checkKVVersion(25, 3, 1)) {
345+
assertTrue(res.getExistingCreationTime() != 0);
346+
}
331347
assertTrue(res.getExistingModificationTime() != 0);
332348
}
333349

@@ -1683,7 +1699,9 @@ private void checkPutResult(PutRequest request,
16831699
checkExistingValueVersion(request, result, shouldSucceed, rowPresent,
16841700
expPrevValue, expPrevVersion);
16851701

1686-
checkRecentTime(result.getExistingCreationTime(), modTimeRecent);
1702+
if (checkKVVersion(25, 3, 1)) {
1703+
checkRecentTime(result.getExistingCreationTime(), modTimeRecent);
1704+
}
16871705
checkRecentTime(result.getExistingModificationTime(), modTimeRecent);
16881706
}
16891707

@@ -1700,7 +1718,9 @@ private void checkDeleteResult(DeleteRequest request,
17001718
shouldSucceed, result.getSuccess());
17011719
checkExistingValueVersion(request, result, shouldSucceed, rowPresent,
17021720
expPrevValue, expPrevVersion);
1703-
checkRecentTime(result.getExistingCreationTime(), modTimeRecent);
1721+
if (checkKVVersion(25, 3, 1)) {
1722+
checkRecentTime(result.getExistingCreationTime(), modTimeRecent);
1723+
}
17041724
checkRecentTime(result.getExistingModificationTime(), modTimeRecent);
17051725
}
17061726

@@ -1730,7 +1750,9 @@ private void checkGetResult(GetRequest request,
17301750
assertNull("Unexpected value", expValue);
17311751
assertNull("Unexpected version", result.getVersion());
17321752
}
1733-
checkRecentTime(result.getCreationTime(), modTimeRecent);
1753+
if (checkKVVersion(25, 3, 1)) {
1754+
checkRecentTime(result.getCreationTime(), modTimeRecent);
1755+
}
17341756
checkRecentTime(result.getModificationTime(), modTimeRecent);
17351757
}
17361758

0 commit comments

Comments
 (0)