Skip to content

Commit b03bc2d

Browse files
christophstroblchristophstrobl
committed
Guard Tests
Make sure tests do not run when targeting older server versions.
1 parent c13c38e commit b03bc2d

File tree

5 files changed

+45
-2
lines changed

5 files changed

+45
-2
lines changed

‎src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,7 @@ public void hStrLenReturnsZeroWhenKeyDoesNotExist() {
10411041
}
10421042

10431043
@Test
1044+
@EnabledOnCommand("HEXPIRE")
10441045
public void hExpireReturnsSuccessAndSetsTTL() {
10451046
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10461047

@@ -1050,6 +1051,7 @@ public void hExpireReturnsSuccessAndSetsTTL() {
10501051
}
10511052

10521053
@Test
1054+
@EnabledOnCommand("HEXPIRE")
10531055
public void hExpireReturnsMinusTwoWhenFieldDoesNotExist() {
10541056
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10551057
// missing field
@@ -1059,13 +1061,15 @@ public void hExpireReturnsMinusTwoWhenFieldDoesNotExist() {
10591061
}
10601062

10611063
@Test
1064+
@EnabledOnCommand("HEXPIRE")
10621065
public void hExpireReturnsTwoWhenZeroProvided() {
10631066
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10641067

10651068
assertThat(clusterConnection.hashCommands().hExpire(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
10661069
}
10671070

10681071
@Test
1072+
@EnabledOnCommand("HEXPIRE")
10691073
public void hpExpireReturnsSuccessAndSetsTTL() {
10701074
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10711075

@@ -1075,6 +1079,7 @@ public void hpExpireReturnsSuccessAndSetsTTL() {
10751079
}
10761080

10771081
@Test
1082+
@EnabledOnCommand("HEXPIRE")
10781083
public void hpExpireReturnsMinusTwoWhenFieldDoesNotExist() {
10791084
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10801085
// missing field
@@ -1084,13 +1089,15 @@ public void hpExpireReturnsMinusTwoWhenFieldDoesNotExist() {
10841089
}
10851090

10861091
@Test
1092+
@EnabledOnCommand("HEXPIRE")
10871093
public void hpExpireReturnsTwoWhenZeroProvided() {
10881094
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10891095

10901096
assertThat(clusterConnection.hashCommands().hpExpire(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
10911097
}
10921098

10931099
@Test
1100+
@EnabledOnCommand("HEXPIRE")
10941101
public void hExpireAtReturnsSuccessAndSetsTTL() {
10951102
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
10961103
long inFiveSeconds = Instant.now().plusSeconds(5L).getEpochSecond();
@@ -1099,6 +1106,7 @@ public void hExpireAtReturnsSuccessAndSetsTTL() {
10991106
}
11001107

11011108
@Test
1109+
@EnabledOnCommand("HEXPIRE")
11021110
public void hExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11031111
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11041112
long inFiveSeconds = Instant.now().plusSeconds(5L).getEpochSecond();
@@ -1110,13 +1118,15 @@ public void hExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11101118
}
11111119

11121120
@Test
1121+
@EnabledOnCommand("HEXPIRE")
11131122
public void hExpireAdReturnsTwoWhenZeroProvided() {
11141123
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11151124

11161125
assertThat(clusterConnection.hashCommands().hExpireAt(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
11171126
}
11181127

11191128
@Test
1129+
@EnabledOnCommand("HEXPIRE")
11201130
public void hpExpireAtReturnsSuccessAndSetsTTL() {
11211131
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11221132
long inFiveSeconds = Instant.now().plusSeconds(5L).toEpochMilli();
@@ -1126,6 +1136,7 @@ public void hpExpireAtReturnsSuccessAndSetsTTL() {
11261136
}
11271137

11281138
@Test
1139+
@EnabledOnCommand("HEXPIRE")
11291140
public void hpExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11301141
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11311142
long inFiveSeconds = Instant.now().plusSeconds(5L).toEpochMilli();
@@ -1137,13 +1148,15 @@ public void hpExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11371148
}
11381149

11391150
@Test
1151+
@EnabledOnCommand("HEXPIRE")
11401152
public void hpExpireAdReturnsTwoWhenZeroProvided() {
11411153
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11421154

11431155
assertThat(clusterConnection.hashCommands().hpExpireAt(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
11441156
}
11451157

11461158
@Test
1159+
@EnabledOnCommand("HEXPIRE")
11471160
public void hPersistReturnsSuccessAndPersistsField() {
11481161
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11491162
assertThat(clusterConnection.hashCommands().hExpire(KEY_1_BYTES, 5L, KEY_2_BYTES)).contains(1L);
@@ -1152,12 +1165,14 @@ public void hPersistReturnsSuccessAndPersistsField() {
11521165
}
11531166

11541167
@Test
1168+
@EnabledOnCommand("HEXPIRE")
11551169
public void hPersistReturnsMinusOneWhenFieldDoesNotHaveExpiration() {
11561170
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11571171
assertThat(clusterConnection.hashCommands().hPersist(KEY_1_BYTES, KEY_2_BYTES)).contains(-1L);
11581172
}
11591173

11601174
@Test
1175+
@EnabledOnCommand("HEXPIRE")
11611176
public void hPersistReturnsMinusTwoWhenFieldOrKeyMissing() {
11621177
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11631178

@@ -1167,14 +1182,15 @@ public void hPersistReturnsMinusTwoWhenFieldOrKeyMissing() {
11671182
}
11681183

11691184
@Test
1185+
@EnabledOnCommand("HEXPIRE")
11701186
public void hTtlReturnsMinusOneWhenFieldHasNoExpiration() {
11711187
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11721188

11731189
assertThat(clusterConnection.hashCommands().hTtl(KEY_1_BYTES, KEY_2_BYTES)).contains(-1L);
1174-
11751190
}
11761191

11771192
@Test
1193+
@EnabledOnCommand("HEXPIRE")
11781194
public void hTtlReturnsMinusTwoWhenFieldOrKeyMissing() {
11791195

11801196
assertThat(clusterConnection.hashCommands().hTtl(KEY_1_BYTES, KEY_1_BYTES)).contains(-2L);

‎src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,7 @@ public void hStrLenReturnsZeroWhenKeyDoesNotExist() {
10981098
}
10991099

11001100
@Test
1101+
@EnabledOnCommand("HEXPIRE")
11011102
public void hExpireReturnsSuccessAndSetsTTL() {
11021103
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11031104

@@ -1106,6 +1107,7 @@ public void hExpireReturnsSuccessAndSetsTTL() {
11061107
}
11071108

11081109
@Test
1110+
@EnabledOnCommand("HEXPIRE")
11091111
public void hExpireReturnsMinusTwoWhenFieldDoesNotExist() {
11101112
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11111113
// missing field
@@ -1115,13 +1117,15 @@ public void hExpireReturnsMinusTwoWhenFieldDoesNotExist() {
11151117
}
11161118

11171119
@Test
1120+
@EnabledOnCommand("HEXPIRE")
11181121
public void hExpireReturnsTwoWhenZeroProvided() {
11191122
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11201123

11211124
assertThat(clusterConnection.hashCommands().hExpire(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
11221125
}
11231126

11241127
@Test
1128+
@EnabledOnCommand("HEXPIRE")
11251129
public void hpExpireReturnsSuccessAndSetsTTL() {
11261130
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11271131

@@ -1131,6 +1135,7 @@ public void hpExpireReturnsSuccessAndSetsTTL() {
11311135
}
11321136

11331137
@Test
1138+
@EnabledOnCommand("HEXPIRE")
11341139
public void hpExpireReturnsMinusTwoWhenFieldDoesNotExist() {
11351140
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11361141
// missing field
@@ -1140,13 +1145,15 @@ public void hpExpireReturnsMinusTwoWhenFieldDoesNotExist() {
11401145
}
11411146

11421147
@Test
1148+
@EnabledOnCommand("HEXPIRE")
11431149
public void hpExpireReturnsTwoWhenZeroProvided() {
11441150
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11451151

11461152
assertThat(clusterConnection.hashCommands().hpExpire(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
11471153
}
11481154

11491155
@Test
1156+
@EnabledOnCommand("HEXPIRE")
11501157
public void hExpireAtReturnsSuccessAndSetsTTL() {
11511158
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11521159
long inFiveSeconds = Instant.now().plusSeconds(5L).getEpochSecond();
@@ -1155,6 +1162,7 @@ public void hExpireAtReturnsSuccessAndSetsTTL() {
11551162
}
11561163

11571164
@Test
1165+
@EnabledOnCommand("HEXPIRE")
11581166
public void hExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11591167
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11601168
long inFiveSeconds = Instant.now().plusSeconds(5L).getEpochSecond();
@@ -1166,13 +1174,15 @@ public void hExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11661174
}
11671175

11681176
@Test
1177+
@EnabledOnCommand("HEXPIRE")
11691178
public void hExpireAdReturnsTwoWhenZeroProvided() {
11701179
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11711180

11721181
assertThat(clusterConnection.hashCommands().hExpireAt(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
11731182
}
11741183

11751184
@Test
1185+
@EnabledOnCommand("HEXPIRE")
11761186
public void hpExpireAtReturnsSuccessAndSetsTTL() {
11771187
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11781188
long inFiveSeconds = Instant.now().plusSeconds(5L).toEpochMilli();
@@ -1182,6 +1192,7 @@ public void hpExpireAtReturnsSuccessAndSetsTTL() {
11821192
}
11831193

11841194
@Test
1195+
@EnabledOnCommand("HEXPIRE")
11851196
public void hpExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11861197
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11871198
long inFiveSeconds = Instant.now().plusSeconds(5L).toEpochMilli();
@@ -1193,13 +1204,15 @@ public void hpExpireAtReturnsMinusTwoWhenFieldDoesNotExist() {
11931204
}
11941205

11951206
@Test
1207+
@EnabledOnCommand("HEXPIRE")
11961208
public void hpExpireAdReturnsTwoWhenZeroProvided() {
11971209
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
11981210

11991211
assertThat(clusterConnection.hashCommands().hpExpireAt(KEY_1_BYTES, 0L, KEY_2_BYTES)).contains(2L);
12001212
}
12011213

12021214
@Test
1215+
@EnabledOnCommand("HEXPIRE")
12031216
public void hPersistReturnsSuccessAndPersistsField() {
12041217
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
12051218
assertThat(clusterConnection.hashCommands().hExpire(KEY_1_BYTES, 5L, KEY_2_BYTES)).contains(1L);
@@ -1208,12 +1221,14 @@ public void hPersistReturnsSuccessAndPersistsField() {
12081221
}
12091222

12101223
@Test
1224+
@EnabledOnCommand("HEXPIRE")
12111225
public void hPersistReturnsMinusOneWhenFieldDoesNotHaveExpiration() {
12121226
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
12131227
assertThat(clusterConnection.hashCommands().hPersist(KEY_1_BYTES, KEY_2_BYTES)).contains(-1L);
12141228
}
12151229

12161230
@Test
1231+
@EnabledOnCommand("HEXPIRE")
12171232
public void hPersistReturnsMinusTwoWhenFieldOrKeyMissing() {
12181233
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
12191234

@@ -1223,6 +1238,7 @@ public void hPersistReturnsMinusTwoWhenFieldOrKeyMissing() {
12231238
}
12241239

12251240
@Test
1241+
@EnabledOnCommand("HEXPIRE")
12261242
public void hTtlReturnsMinusOneWhenFieldHasNoExpiration() {
12271243
nativeConnection.hset(KEY_1, KEY_2, VALUE_3);
12281244

@@ -1231,11 +1247,11 @@ public void hTtlReturnsMinusOneWhenFieldHasNoExpiration() {
12311247
}
12321248

12331249
@Test
1250+
@EnabledOnCommand("HEXPIRE")
12341251
public void hTtlReturnsMinusTwoWhenFieldOrKeyMissing() {
12351252

12361253
assertThat(clusterConnection.hashCommands().hTtl(KEY_1_BYTES, KEY_1_BYTES)).contains(-2L);
12371254
assertThat(clusterConnection.hashCommands().hTtl(KEY_3_BYTES,KEY_2_BYTES)).contains(-2L);
1238-
12391255
}
12401256

12411257
@Test // DATAREDIS-315

‎src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveHashCommandsIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20+
import org.springframework.data.redis.test.condition.EnabledOnCommand;
2021
import reactor.test.StepVerifier;
2122

2223
import java.nio.ByteBuffer;
@@ -293,6 +294,7 @@ void hStrLenReturnsZeroWhenKeyDoesNotExist() {
293294
}
294295

295296
@ParameterizedRedisTest
297+
@EnabledOnCommand("HEXPIRE")
296298
void hExpireShouldHandleMultipleParametersCorrectly() {
297299
assertThat(nativeCommands.hset(KEY_1, FIELD_1, VALUE_1)).isTrue();
298300
assertThat(nativeCommands.hset(KEY_1, FIELD_2, VALUE_2)).isTrue();
@@ -312,6 +314,7 @@ void hExpireShouldHandleMultipleParametersCorrectly() {
312314
}
313315

314316
@ParameterizedRedisTest
317+
@EnabledOnCommand("HEXPIRE")
315318
void hExpireAtShouldHandleMultipleParametersCorrectly() {
316319
assertThat(nativeCommands.hset(KEY_1, FIELD_1, VALUE_1)).isTrue();
317320
assertThat(nativeCommands.hset(KEY_1, FIELD_2, VALUE_2)).isTrue();
@@ -330,6 +333,7 @@ void hExpireAtShouldHandleMultipleParametersCorrectly() {
330333
}
331334

332335
@ParameterizedRedisTest
336+
@EnabledOnCommand("HEXPIRE")
333337
void hPersistShouldPersistFields() {
334338
assertThat(nativeCommands.hset(KEY_1, FIELD_1, VALUE_1)).isTrue();
335339
assertThat(nativeCommands.hset(KEY_1, FIELD_2, VALUE_2)).isTrue();

‎src/test/java/org/springframework/data/redis/core/DefaultHashOperationsIntegrationTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.data.redis.StringObjectFactory;
3535
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
3636
import org.springframework.data.redis.connection.jedis.extension.JedisConnectionFactoryExtension;
37+
import org.springframework.data.redis.test.condition.EnabledOnCommand;
3738
import org.springframework.data.redis.test.extension.RedisStanalone;
3839
import org.springframework.data.redis.test.extension.parametrized.MethodSource;
3940
import org.springframework.data.redis.test.extension.parametrized.ParameterizedRedisTest;
@@ -208,6 +209,7 @@ void randomValue() {
208209
assertThat(values).hasSize(2).containsEntry(key1, val1).containsEntry(key2, val2);
209210
}
210211

212+
@EnabledOnCommand("HEXPIRE")
211213
@ParameterizedRedisTest
212214
void testExpireAndGetExpireMillis() {
213215

@@ -227,6 +229,7 @@ void testExpireAndGetExpireMillis() {
227229
}
228230

229231
@ParameterizedRedisTest
232+
@EnabledOnCommand("HEXPIRE")
230233
void testExpireAndGetExpireSeconds() {
231234

232235
K key = keyFactory.instance();
@@ -245,6 +248,7 @@ void testExpireAndGetExpireSeconds() {
245248
}
246249

247250
@ParameterizedRedisTest
251+
@EnabledOnCommand("HEXPIRE")
248252
void testExpireAtAndGetExpireMillis() {
249253

250254
K key = keyFactory.instance();
@@ -263,6 +267,7 @@ void testExpireAtAndGetExpireMillis() {
263267
}
264268

265269
@ParameterizedRedisTest
270+
@EnabledOnCommand("HEXPIRE")
266271
void testPersistAndGetExpireMillis() {
267272

268273
K key = keyFactory.instance();

‎src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapIntegrationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ void testIncrement() {
195195
}
196196

197197
@ParameterizedRedisTest
198+
@EnabledOnCommand("HEXPIRE")
198199
void testExpire() {
199200
K k1 = getKey();
200201
V v1 = getValue();
@@ -209,6 +210,7 @@ void testExpire() {
209210
}
210211

211212
@ParameterizedRedisTest
213+
@EnabledOnCommand("HEXPIRE")
212214
void testExpireAt() {
213215
K k1 = getKey();
214216
V v1 = getValue();

0 commit comments

Comments
 (0)