ringles commented on code in PR #7558: URL: https://github.com/apache/geode/pull/7558#discussion_r847422426
########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); Review Comment: Rechristened. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); + } + + @Test + @Parameters(method = "getDataTypeInstances") + @TestCaseName("{method}: redisDataType:{0}") + public void unsupportedDataTypesThrowException_forAddByteArrayDoublePairsDelta( + RedisData redisData) + throws IOException { + final DataInputStream dis = getDataInputStream(); + + assertThatThrownBy(() -> redisData.fromDelta(dis)).isInstanceOf( + IllegalStateException.class) + .hasMessageContaining("unexpected " + ADD_BYTE_ARRAY_DOUBLE_PAIRS); + } + + private DataInputStream getDataInputStream() throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + AddByteArrayDoublePairs source = new AddByteArrayDoublePairs(1); + double score = 3.0; + source.add(original, score); + source.serializeTo(dos); + + return new DataInputStream(new ByteArrayInputStream(baos.toByteArray())); + } + + @SuppressWarnings("unused") + private Object[] getDataTypeInstances() { + // Values are original, offset, expected result + return new Object[] { + new Object[] {makeRedisHash()}, + new Object[] {makeRedisList()}, + new Object[] {makeRedisSet()}, + new Object[] {new RedisString()} Review Comment: It wasn't necessary, but for consistency it makes sense. Created and propagated. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); + } + + @Test + @Parameters(method = "getDataTypeInstances") + @TestCaseName("{method}: redisDataType:{0}") + public void unsupportedDataTypesThrowException_forAddByteArrayDoublePairsDelta( + RedisData redisData) + throws IOException { + final DataInputStream dis = getDataInputStream(); + + assertThatThrownBy(() -> redisData.fromDelta(dis)).isInstanceOf( + IllegalStateException.class) + .hasMessageContaining("unexpected " + ADD_BYTE_ARRAY_DOUBLE_PAIRS); + } + + private DataInputStream getDataInputStream() throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + AddByteArrayDoublePairs source = new AddByteArrayDoublePairs(1); + double score = 3.0; + source.add(original, score); + source.serializeTo(dos); + + return new DataInputStream(new ByteArrayInputStream(baos.toByteArray())); + } + + @SuppressWarnings("unused") + private Object[] getDataTypeInstances() { + // Values are original, offset, expected result Review Comment: Early leftover, yanked. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); + } + + @Test + @Parameters(method = "getDataTypeInstances") + @TestCaseName("{method}: redisDataType:{0}") + public void unsupportedDataTypesThrowException_forAddByteArrayDoublePairsDelta( + RedisData redisData) + throws IOException { + final DataInputStream dis = getDataInputStream(); + + assertThatThrownBy(() -> redisData.fromDelta(dis)).isInstanceOf( + IllegalStateException.class) + .hasMessageContaining("unexpected " + ADD_BYTE_ARRAY_DOUBLE_PAIRS); Review Comment: Restricted. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); + } + + @Test + @Parameters(method = "getDataTypeInstances") + @TestCaseName("{method}: redisDataType:{0}") + public void unsupportedDataTypesThrowException_forAddByteArrayDoublePairsDelta( Review Comment: Removed where it appeared. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); + } + + @Test + @Parameters(method = "getDataTypeInstances") + @TestCaseName("{method}: redisDataType:{0}") + public void unsupportedDataTypesThrowException_forAddByteArrayDoublePairsDelta( + RedisData redisData) + throws IOException { + final DataInputStream dis = getDataInputStream(); + + assertThatThrownBy(() -> redisData.fromDelta(dis)).isInstanceOf( + IllegalStateException.class) + .hasMessageContaining("unexpected " + ADD_BYTE_ARRAY_DOUBLE_PAIRS); + } + + private DataInputStream getDataInputStream() throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + AddByteArrayDoublePairs source = new AddByteArrayDoublePairs(1); + double score = 3.0; + source.add(original, score); + source.serializeTo(dos); + + return new DataInputStream(new ByteArrayInputStream(baos.toByteArray())); + } + + @SuppressWarnings("unused") + private Object[] getDataTypeInstances() { Review Comment: Updated. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { Review Comment: Well, okay, though the methods all call the appropriate makeRedis*() in the body. Done. ########## geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/delta/AddByteArrayDoublePairsDeltaUnitTest.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.data.delta; + +import static org.apache.geode.redis.internal.data.delta.DeltaType.ADD_BYTE_ARRAY_DOUBLE_PAIRS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import junitparams.Parameters; +import junitparams.naming.TestCaseName; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisSortedSet; +import org.apache.geode.redis.internal.data.RedisString; +import org.apache.geode.test.junit.runners.GeodeParamsRunner; + +@RunWith(GeodeParamsRunner.class) +public class AddByteArrayDoublePairsDeltaUnitTest extends AbstractRedisDeltaUnitTest { + private final byte[] original = "omega".getBytes(); + + @Test + public void testAddByteArrayDoublePairsDelta() throws Exception { + DataInputStream dis = getDataInputStream(); + RedisSortedSet redisSortedSet = makeRedisSortedSet(); + redisSortedSet.fromDelta(dis); + + assertThat(redisSortedSet.zcard()).isEqualTo(4); + assertThat(redisSortedSet.zrank(original)).isEqualTo(2L); Review Comment: Done. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
