Repository: geode Updated Branches: refs/heads/feature/GEM-1483 c2ac3b7c9 -> 1504e0f28 (forced update)
http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java index 04dadeb..ae4e4da 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java @@ -14,11 +14,11 @@ */ package org.apache.geode.serialization.codec; +import java.nio.ByteBuffer; + import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; -import java.nio.ByteBuffer; - public class IntCodec implements TypeCodec<Integer> { @Override public Integer decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java index 9b064a7..7691db2 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java @@ -14,11 +14,11 @@ */ package org.apache.geode.serialization.codec; +import java.nio.ByteBuffer; + import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; -import java.nio.ByteBuffer; - public class LongCodec implements TypeCodec<Long> { @Override public Long decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java index 8d7b1d4..e927b11 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java @@ -14,11 +14,11 @@ */ package org.apache.geode.serialization.codec; +import java.nio.ByteBuffer; + import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; -import java.nio.ByteBuffer; - public class ShortCodec implements TypeCodec<Short> { @Override public Short decode(byte[] incoming) { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java index cc7904b..b137ad5 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java @@ -14,11 +14,11 @@ */ package org.apache.geode.serialization.codec; +import java.nio.charset.Charset; + import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; -import java.nio.charset.Charset; - public class StringCodec implements TypeCodec<String> { private static final Charset UTF8 = Charset.forName("UTF-8"); http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java index 2c88306..ec93a72 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java +++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/registry/SerializationCodecRegistry.java @@ -14,14 +14,14 @@ */ package org.apache.geode.serialization.registry; +import java.util.HashMap; +import java.util.ServiceLoader; + import org.apache.geode.serialization.SerializationType; import org.apache.geode.serialization.TypeCodec; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -import java.util.HashMap; -import java.util.ServiceLoader; - public class SerializationCodecRegistry { private HashMap<SerializationType, TypeCodec> codecRegistry = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/IntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/IntegrationJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/IntegrationJUnitTest.java index 3c484cb..7b8689b 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/IntegrationJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/IntegrationJUnitTest.java @@ -14,10 +14,28 @@ */ package org.apache.geode.protocol; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + import com.google.protobuf.ByteString; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; -import org.apache.geode.protocol.protobuf.*; +import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.EncodingTypeTranslator; +import org.apache.geode.protocol.protobuf.ProtobufStreamProcessor; +import org.apache.geode.protocol.protobuf.RegionAPI; import org.apache.geode.serialization.codec.StringCodec; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.SerializationCodecRegistry; @@ -25,16 +43,6 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.*; @Category(UnitTest.class) public class IntegrationJUnitTest { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java index b650f3b..4798fd5 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java @@ -14,7 +14,9 @@ */ package org.apache.geode.protocol; -import org.apache.geode.protocol.protobuf.*; +import org.apache.geode.protocol.protobuf.BasicTypes; +import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; @@ -55,7 +57,7 @@ public class MessageUtil { ClientProtocol.Request request = ProtobufRequestUtilities.createPutRequest(requestRegion, entry); - return ProtobufUtilities.createProtobufRequest(header, request); + return ProtobufUtilities.createProtobufMessage(header, request); } public static ClientProtocol.Message makeGetRequestMessage( @@ -64,7 +66,7 @@ public class MessageUtil { UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { ClientProtocol.Request request = ProtobufRequestUtilities.createGetRequest(requestRegion, ProtobufUtilities.createEncodedValue(serializationService, requestKey)); - return ProtobufUtilities.createProtobufRequest(header, request); + return ProtobufUtilities.createProtobufMessage(header, request); } private static ClientProtocol.Request.Builder getRequestBuilder() { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java index 07cde79..78f7ee0 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java @@ -15,6 +15,34 @@ package org.apache.geode.protocol; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE; +import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.Socket; +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.DataPolicy; @@ -41,33 +69,6 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.util.test.TestUtil; -import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.experimental.categories.Category; -import org.junit.rules.TestName; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.Socket; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE; -import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; /** * Test that switching on the header byte makes instances of @@ -180,7 +181,7 @@ public class RoundTripCacheConnectionJUnitTest { TEST_MULTIOP_VALUE2)); putEntries.add(ProtobufUtilities.createEntry(serializationService, TEST_MULTIOP_KEY3, TEST_MULTIOP_VALUE3)); - ClientProtocol.Message putAllMessage = ProtobufUtilities.createProtobufRequest( + ClientProtocol.Message putAllMessage = ProtobufUtilities.createProtobufMessage( ProtobufUtilities.createMessageHeader(TEST_PUT_CORRELATION_ID), ProtobufRequestUtilities.createPutAllRequest(TEST_REGION, putEntries)); protobufProtocolSerializer.serialize(putAllMessage, outputStream); @@ -191,9 +192,13 @@ public class RoundTripCacheConnectionJUnitTest { getEntries.add(ProtobufUtilities.createEncodedValue(serializationService, TEST_MULTIOP_KEY1)); getEntries.add(ProtobufUtilities.createEncodedValue(serializationService, TEST_MULTIOP_KEY2)); getEntries.add(ProtobufUtilities.createEncodedValue(serializationService, TEST_MULTIOP_KEY3)); - ClientProtocol.Message getAllMessage = ProtobufUtilities.createProtobufRequest( + + RegionAPI.GetAllRequest getAllRequest = + ProtobufRequestUtilities.createGetAllRequest(TEST_REGION, getEntries); + + ClientProtocol.Message getAllMessage = ProtobufUtilities.createProtobufMessage( ProtobufUtilities.createMessageHeader(TEST_GET_CORRELATION_ID), - ProtobufRequestUtilities.createGetAllRequest(TEST_REGION, getEntries)); + ProtobufUtilities.createProtobufRequestWithGetAllRequest(getAllRequest)); protobufProtocolSerializer.serialize(getAllMessage, outputStream); validateGetAllResponse(socket, protobufProtocolSerializer); } @@ -219,7 +224,7 @@ public class RoundTripCacheConnectionJUnitTest { TEST_MULTIOP_VALUE2)); putEntries.add(ProtobufUtilities.createEntry(serializationService, TEST_MULTIOP_KEY3, TEST_MULTIOP_VALUE3)); - ClientProtocol.Message putAllMessage = ProtobufUtilities.createProtobufRequest( + ClientProtocol.Message putAllMessage = ProtobufUtilities.createProtobufMessage( ProtobufUtilities.createMessageHeader(TEST_PUT_CORRELATION_ID), ProtobufRequestUtilities.createPutAllRequest(regionName, putEntries)); protobufProtocolSerializer.serialize(putAllMessage, outputStream); @@ -231,7 +236,7 @@ public class RoundTripCacheConnectionJUnitTest { protobufProtocolSerializer.serialize(getMessage, outputStream); validateGetResponse(socket, protobufProtocolSerializer, TEST_MULTIOP_VALUE1); - ClientProtocol.Message removeMessage = ProtobufUtilities.createProtobufRequest( + ClientProtocol.Message removeMessage = ProtobufUtilities.createProtobufMessage( ProtobufUtilities.createMessageHeader(TEST_REMOVE_CORRELATION_ID), ProtobufRequestUtilities.createRemoveRequest(TEST_REGION, ProtobufUtilities.createEncodedValue(serializationService, TEST_KEY))); @@ -268,9 +273,12 @@ public class RoundTripCacheConnectionJUnitTest { int correlationId = TEST_GET_CORRELATION_ID; // reuse this value for this test ProtobufProtocolSerializer protobufProtocolSerializer = new ProtobufProtocolSerializer(); - ClientProtocol.Message getRegionsMessage = ProtobufUtilities.createProtobufRequest( + RegionAPI.GetRegionNamesRequest getRegionNamesRequest = + ProtobufRequestUtilities.createGetRegionNamesRequest(); + + ClientProtocol.Message getRegionsMessage = ProtobufUtilities.createProtobufMessage( ProtobufUtilities.createMessageHeader(correlationId), - ProtobufRequestUtilities.createGetRegionNamesRequest()); + ProtobufUtilities.createProtobufRequestWithGetRegionNamesRequest(getRegionNamesRequest)); protobufProtocolSerializer.serialize(getRegionsMessage, outputStream); validateGetRegionNamesResponse(socket, correlationId, protobufProtocolSerializer); } @@ -289,12 +297,10 @@ public class RoundTripCacheConnectionJUnitTest { OutputStream outputStream = socket.getOutputStream(); outputStream.write(110); - ProtobufProtocolSerializer protobufProtocolSerializer = new ProtobufProtocolSerializer(); ClientProtocol.Message getRegionMessage = MessageUtil.makeGetRegionRequestMessage(TEST_REGION, ClientProtocol.MessageHeader.newBuilder().build()); protobufProtocolSerializer.serialize(getRegionMessage, outputStream); - ClientProtocol.Message message = protobufProtocolSerializer.deserialize(socket.getInputStream()); assertEquals(ClientProtocol.Message.MessageTypeCase.RESPONSE, message.getMessageTypeCase()); @@ -311,7 +317,6 @@ public class RoundTripCacheConnectionJUnitTest { assertEquals("", region.getKeyConstraint()); assertEquals("", region.getValueConstraint()); assertEquals(Scope.DISTRIBUTED_NO_ACK, Scope.fromString(region.getScope())); - } private void validatePutResponse(Socket socket, http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/operations/registry/OperationsHandlerRegistryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/operations/registry/OperationsHandlerRegistryJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/operations/registry/OperationsHandlerRegistryJUnitTest.java deleted file mode 100644 index def54b5..0000000 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/operations/registry/OperationsHandlerRegistryJUnitTest.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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.protocol.operations.registry; - -import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.operations.registry.exception.OperationHandlerAlreadyRegisteredException; -import org.apache.geode.protocol.operations.registry.exception.OperationHandlerNotRegisteredException; -import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static io.codearte.catchexception.shade.mockito.Mockito.mock; -import static org.junit.Assert.*; - -@Category(UnitTest.class) -public class OperationsHandlerRegistryJUnitTest { - public static final int DUMMY_OPERATION_CODE = 999; - private OperationsHandlerRegistry operationsHandlerRegistry; - - @Before - public void setup() throws OperationHandlerAlreadyRegisteredException { - operationsHandlerRegistry = new OperationsHandlerRegistry(); - } - - @Test - public void testAddOperationsHandlerForOperationType() - throws OperationHandlerAlreadyRegisteredException { - int initialHandlerCount = operationsHandlerRegistry.getRegisteredOperationHandlersCount(); - operationsHandlerRegistry.registerOperationHandlerForOperationId(DUMMY_OPERATION_CODE, - mock(OperationHandler.class)); - assertEquals(initialHandlerCount + 1, - operationsHandlerRegistry.getRegisteredOperationHandlersCount()); - } - - @Test - public void testAddingDuplicateOperationsHandlerForOperationType_ThrowsException() - throws OperationHandlerAlreadyRegisteredException, OperationHandlerNotRegisteredException { - OperationHandler expectedOperationHandler = mock(OperationHandler.class); - OperationHandler unexpectedOperationHandler = mock(OperationHandler.class); - operationsHandlerRegistry.registerOperationHandlerForOperationId(DUMMY_OPERATION_CODE, - expectedOperationHandler); - int initialHandlerCount = operationsHandlerRegistry.getRegisteredOperationHandlersCount(); - boolean exceptionCaught = false; - try { - operationsHandlerRegistry.registerOperationHandlerForOperationId(DUMMY_OPERATION_CODE, - unexpectedOperationHandler); - } catch (OperationHandlerAlreadyRegisteredException e) { - exceptionCaught = true; - } - assertTrue(exceptionCaught); - assertEquals(initialHandlerCount, - operationsHandlerRegistry.getRegisteredOperationHandlersCount()); - assertSame(expectedOperationHandler, - operationsHandlerRegistry.getOperationHandlerForOperationId(DUMMY_OPERATION_CODE)); - } - - @Test - public void testGetOperationsHandlerForOperationType() - throws OperationHandlerAlreadyRegisteredException, OperationHandlerNotRegisteredException { - OperationHandler expectedOperationHandler = mock(OperationHandler.class); - - operationsHandlerRegistry.registerOperationHandlerForOperationId(DUMMY_OPERATION_CODE, - expectedOperationHandler); - OperationHandler operationHandler = - operationsHandlerRegistry.getOperationHandlerForOperationId(DUMMY_OPERATION_CODE); - assertSame(expectedOperationHandler, operationHandler); - } - - @Test - public void testGetOperationsHandlerForMissingOperationType_ThrowsException() { - boolean exceptionCaught = false; - try { - operationsHandlerRegistry.getOperationHandlerForOperationId(DUMMY_OPERATION_CODE); - } catch (OperationHandlerNotRegisteredException e) { - exceptionCaught = true; - } - assertTrue(exceptionCaught); - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java index 782701f..a4c6c70 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java @@ -14,13 +14,14 @@ */ package org.apache.geode.protocol.protobuf; -import org.apache.geode.serialization.SerializationType; -import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; -import org.apache.geode.test.junit.categories.UnitTest; +import static org.junit.Assert.assertSame; + import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.assertSame; +import org.apache.geode.serialization.SerializationType; +import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; +import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) public class EncodingTypeToSerializationTypeTranslatorJUnitTest { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessorJUnitTest.java deleted file mode 100644 index f2a76b9..0000000 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessorJUnitTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.protocol.protobuf; - - -import org.apache.geode.cache.Cache; -import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.operations.OperationHandler; -import org.apache.geode.protocol.operations.registry.OperationsHandlerRegistry; -import org.apache.geode.protocol.operations.registry.exception.OperationHandlerNotRegisteredException; -import org.apache.geode.serialization.SerializationService; -import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@Category(UnitTest.class) -public class ProtobufOpsProcessorJUnitTest { - @Test - public void testOpsProcessor() - throws OperationHandlerNotRegisteredException, InvalidProtocolMessageException { - OperationsHandlerRegistry opsHandlerRegistryStub = mock(OperationsHandlerRegistry.class); - OperationHandler operationHandlerStub = mock(OperationHandler.class); - SerializationService serializationServiceStub = mock(SerializationService.class); - Cache dummyCache = mock(Cache.class); - int operationID = ClientProtocol.Request.RequestAPICase.GETREQUEST.getNumber(); - - ClientProtocol.Request messageRequest = ClientProtocol.Request.newBuilder() - .setGetRequest(RegionAPI.GetRequest.newBuilder()).build(); - - ClientProtocol.Response expectedResponse = ClientProtocol.Response.newBuilder() - .setGetResponse((RegionAPI.GetResponse.newBuilder())).build(); - - when(opsHandlerRegistryStub.getOperationHandlerForOperationId(operationID)) - .thenReturn(operationHandlerStub); - when(operationHandlerStub.process(serializationServiceStub, messageRequest, dummyCache)) - .thenReturn(expectedResponse); - - ProtobufOpsProcessor processor = - new ProtobufOpsProcessor(opsHandlerRegistryStub, serializationServiceStub); - ClientProtocol.Response response = processor.process(messageRequest, dummyCache); - Assert.assertEquals(expectedResponse, response); - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java index ba13fb3..87bfd52 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java @@ -16,17 +16,18 @@ package org.apache.geode.protocol.protobuf; import static org.mockito.Mockito.mock; -import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.InputStream; import java.io.OutputStream; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.test.junit.categories.UnitTest; + @Category(UnitTest.class) public class ProtobufStreamProcessorTest { @Test(expected = EOFException.class) http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java index e1c5972..706eebd 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java @@ -14,11 +14,24 @@ */ package org.apache.geode.protocol.protobuf.operations; -import org.apache.geode.cache.Cache; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; @@ -28,15 +41,6 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; -import java.util.*; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; @Category(UnitTest.class) public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -95,16 +99,16 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni public void processReturnsExpectedValuesForValidKeys() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(true); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); + Result<RegionAPI.GetAllResponse> result = + operationHandler.process(serializationServiceStub, generateTestRequest(true), cacheStub); + + Assert.assertTrue(result instanceof Success); + + RegionAPI.GetAllResponse response = result.getMessage(); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETALLRESPONSE, - response.getResponseAPICase()); - RegionAPI.GetAllResponse getAllResponse = response.getGetAllResponse(); - Assert.assertEquals(3, getAllResponse.getEntriesCount()); + Assert.assertEquals(3, response.getEntriesCount()); - List<BasicTypes.Entry> entriesList = getAllResponse.getEntriesList(); + List<BasicTypes.Entry> entriesList = response.getEntriesList(); Map<String, String> responseEntries = convertEntryListToMap(entriesList); Assert.assertEquals(TEST_VALUE1, responseEntries.get(TEST_KEY1)); @@ -115,20 +119,17 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni @Test public void processReturnsNoEntriesForNoKeysRequested() throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); + Result<RegionAPI.GetAllResponse> result = + operationHandler.process(serializationServiceStub, generateTestRequest(false), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETALLRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Success); - RegionAPI.GetAllResponse getAllResponse = response.getGetAllResponse(); - List<BasicTypes.Entry> entriesList = getAllResponse.getEntriesList(); + List<BasicTypes.Entry> entriesList = result.getMessage().getEntriesList(); Map<String, String> responseEntries = convertEntryListToMap(entriesList); Assert.assertEquals(0, responseEntries.size()); } - private ClientProtocol.Request generateTestRequest(boolean addKeys) + private RegionAPI.GetAllRequest generateTestRequest(boolean addKeys) throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { HashSet<BasicTypes.EncodedValue> testKeys = new HashSet<>(); if (addKeys) { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java index 2d9cc72..1ae5eb6 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java @@ -14,29 +14,30 @@ */ package org.apache.geode.protocol.protobuf.operations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; -import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.RegionAPI; -import org.apache.geode.serialization.SerializationService; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; +import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; @Category(UnitTest.class) public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -70,13 +71,12 @@ public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHan @Test public void processReturnsCacheRegions() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Response response = - (ClientProtocol.Response) operationHandler.process(serializationServiceStub, + Result<RegionAPI.GetRegionNamesResponse> result = + operationHandler.process(serializationServiceStub, ProtobufRequestUtilities.createGetRegionNamesRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETREGIONNAMESRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Success); - RegionAPI.GetRegionNamesResponse getRegionsResponse = response.getGetRegionNamesResponse(); + RegionAPI.GetRegionNamesResponse getRegionsResponse = result.getMessage(); Assert.assertEquals(3, getRegionsResponse.getRegionsCount()); // There's no guarantee for what order we receive the regions in from the response @@ -96,13 +96,12 @@ public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHan Cache emptyCache = mock(Cache.class);; when(emptyCache.rootRegions()) .thenReturn(Collections.unmodifiableSet(new HashSet<Region<String, String>>())); - ClientProtocol.Response response = - (ClientProtocol.Response) operationHandler.process(serializationServiceStub, + Result<RegionAPI.GetRegionNamesResponse> result = + operationHandler.process(serializationServiceStub, ProtobufRequestUtilities.createGetRegionNamesRequest(), emptyCache); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETREGIONNAMESRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Success); - RegionAPI.GetRegionNamesResponse getRegionsResponse = response.getGetRegionNamesResponse(); + RegionAPI.GetRegionNamesResponse getRegionsResponse = result.getMessage(); Assert.assertEquals(0, getRegionsResponse.getRegionsCount()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java index 24e1215..7423326 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java @@ -17,6 +17,14 @@ package org.apache.geode.protocol.protobuf.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.nio.charset.Charset; +import java.util.Collections; +import java.util.HashSet; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; @@ -25,20 +33,14 @@ import org.apache.geode.cache.Scope; import org.apache.geode.protocol.MessageUtil; import org.apache.geode.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; @Category(UnitTest.class) public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -72,10 +74,11 @@ public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJ when(regionAttributesStub.getValueConstraint()).thenReturn(Integer.class); when(regionAttributesStub.getScope()).thenReturn(Scope.DISTRIBUTED_ACK); - ClientProtocol.Response response = - (ClientProtocol.Response) operationHandler.process(serializationServiceStub, - createRequestMessage(MessageUtil.makeGetRegionRequest(TEST_REGION1)), cacheStub); - BasicTypes.Region region = response.getGetRegionResponse().getRegion(); + + Result<RegionAPI.GetRegionResponse> result = operationHandler.process(serializationServiceStub, + MessageUtil.makeGetRegionRequest(TEST_REGION1), cacheStub); + RegionAPI.GetRegionResponse response = result.getMessage(); + BasicTypes.Region region = response.getRegion(); Assert.assertEquals(TEST_REGION1, region.getName()); Assert.assertEquals(String.class.toString(), region.getKeyConstraint()); Assert.assertEquals(Scope.DISTRIBUTED_ACK.toString(), region.getScope()); @@ -96,13 +99,10 @@ public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJ when(emptyCache.rootRegions()) .thenReturn(Collections.unmodifiableSet(new HashSet<Region<String, String>>())); String unknownRegionName = "UNKNOWN_REGION"; - ClientProtocol.Response response = - (ClientProtocol.Response) operationHandler.process(serializationServiceStub, - createRequestMessage(MessageUtil.makeGetRegionRequest(unknownRegionName)), emptyCache); - - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE.getNumber(), - response.getResponseAPICase().getNumber()); + Result<RegionAPI.GetRegionResponse> result = operationHandler.process(serializationServiceStub, + MessageUtil.makeGetRegionRequest(unknownRegionName), emptyCache); + Assert.assertTrue(result instanceof Failure); Assert.assertEquals("No region exists for name: " + unknownRegionName, - response.getErrorResponse().getMessage()); + result.getErrorMessage().getMessage()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java index 2d3fbb6..95a3893 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java @@ -17,25 +17,26 @@ package org.apache.geode.protocol.protobuf.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Cache; +import java.nio.charset.Charset; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.codec.StringCodec; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; @Category(UnitTest.class) public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -83,15 +84,15 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe public void processReturnsTheEncodedValueFromTheRegion() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(false, false, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); - - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETRESPONSE, - response.getResponseAPICase()); - RegionAPI.GetResponse getResponse = response.getGetResponse(); - Assert.assertEquals(BasicTypes.EncodingType.STRING, getResponse.getResult().getEncodingType()); - String actualValue = stringDecoder.decode(getResponse.getResult().getValue().toByteArray()); + RegionAPI.GetRequest getRequest = generateTestRequest(false, false, false); + Result<RegionAPI.GetResponse> result = + operationHandler.process(serializationServiceStub, getRequest, cacheStub); + + Assert.assertTrue(result instanceof Success); + Assert.assertEquals(BasicTypes.EncodingType.STRING, + result.getMessage().getResult().getEncodingType()); + String actualValue = + stringDecoder.decode(result.getMessage().getResult().getValue().toByteArray()); Assert.assertEquals(TEST_VALUE, actualValue); } @@ -99,40 +100,34 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe public void processReturnsUnsucessfulResponseForInvalidRegion() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(true, false, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); + RegionAPI.GetRequest getRequest = generateTestRequest(true, false, false); + Result<RegionAPI.GetResponse> response = + operationHandler.process(serializationServiceStub, getRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(response instanceof Failure); + Assert.assertEquals("Region not found", response.getErrorMessage().getMessage()); } @Test public void processReturnsKeyNotFoundWhenKeyIsNotFound() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(false, true, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); - - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETRESPONSE, - response.getResponseAPICase()); - RegionAPI.GetResponse getResponse = response.getGetResponse(); - Assert.assertFalse(getResponse.hasResult()); + RegionAPI.GetRequest getRequest = generateTestRequest(false, true, false); + Result<RegionAPI.GetResponse> response = + operationHandler.process(serializationServiceStub, getRequest, cacheStub); + + Assert.assertTrue(response instanceof Success); } @Test public void processReturnsLookupFailureWhenKeyFoundWithNoValue() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request getRequest = generateTestRequest(false, false, true); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); - - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.GETRESPONSE, - response.getResponseAPICase()); - RegionAPI.GetResponse getResponse = response.getGetResponse(); - Assert.assertFalse(getResponse.hasResult()); + RegionAPI.GetRequest getRequest = generateTestRequest(false, false, true); + Result<RegionAPI.GetResponse> response = + operationHandler.process(serializationServiceStub, getRequest, cacheStub); + + Assert.assertTrue(response instanceof Success); } @Test @@ -144,21 +139,22 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe when(serializationServiceStub.decode(BasicTypes.EncodingType.STRING, TEST_KEY.getBytes(Charset.forName("UTF-8")))).thenThrow(exception); - ClientProtocol.Request getRequest = generateTestRequest(false, false, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, getRequest, cacheStub); + RegionAPI.GetRequest getRequest = generateTestRequest(false, false, false); + Result<RegionAPI.GetResponse> response = + operationHandler.process(serializationServiceStub, getRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(response instanceof Failure); + Assert.assertEquals("Codec error in protobuf deserialization.", + response.getErrorMessage().getMessage()); } - private ClientProtocol.Request generateTestRequest(boolean missingRegion, boolean missingKey, + private RegionAPI.GetRequest generateTestRequest(boolean missingRegion, boolean missingKey, boolean nulledKey) throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { String region = missingRegion ? MISSING_REGION : TEST_REGION; String key = missingKey ? MISSING_KEY : (nulledKey ? NULLED_KEY : TEST_KEY); BasicTypes.EncodedValue testKey = ProtobufUtilities.createEncodedValue(serializationServiceStub, key); - return ProtobufRequestUtilities.createGetRequest(region, testKey); + return ProtobufRequestUtilities.createGetRequest(region, testKey).getGetRequest(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/OperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/OperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/OperationHandlerJUnitTest.java index c739db9..f0a2f80 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/OperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/OperationHandlerJUnitTest.java @@ -16,12 +16,13 @@ package org.apache.geode.protocol.protobuf.operations; import static org.mockito.Mockito.mock; +import org.junit.Before; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Cache; import org.apache.geode.protocol.operations.OperationHandler; import org.apache.geode.serialization.SerializationService; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.experimental.categories.Category; @Category(UnitTest.class) public class OperationHandlerJUnitTest { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java index ac13bdc..d0736de 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java @@ -14,6 +14,7 @@ */ package org.apache.geode.protocol.protobuf.operations; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.doThrow; @@ -22,30 +23,34 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Cache; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.hamcrest.CoreMatchers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mockito.ArgumentMatcher; + import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.Failure; +import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.hamcrest.CoreMatchers; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.mockito.ArgumentMatcher; - -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; @Category(UnitTest.class) public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -105,11 +110,10 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException { PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler(); - ClientProtocol.Response response = operationHandler.process(serializationServiceStub, + Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(false, true), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.PUTALLRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Success); HashMap<Object, Object> expectedValues = new HashMap<>(); expectedValues.put(TEST_KEY1, TEST_VALUE1); @@ -123,13 +127,12 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni public void processWithInvalidEntryReturnsError() throws Exception { PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler(); - ClientProtocol.Response response = operationHandler.process(serializationServiceStub, + Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(true, true), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); - Assert.assertThat(response.getErrorResponse().getMessage(), - CoreMatchers.containsString(EXCEPTION_TEXT)); + assertTrue(result instanceof Failure); + ClientProtocol.ErrorResponse errorMessage = result.getErrorMessage(); + Assert.assertThat(errorMessage.getMessage(), CoreMatchers.containsString(EXCEPTION_TEXT)); // can't verify anything about put keys because we make no guarantees. } @@ -137,16 +140,15 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni public void processWithNoEntriesPasses() throws Exception { PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler(); - ClientProtocol.Response response = operationHandler.process(serializationServiceStub, + Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(false, false), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.PUTALLRESPONSE, - response.getResponseAPICase()); + assertTrue(result instanceof Success); verify(regionMock, times(0)).put(any(), any()); } - private ClientProtocol.Request generateTestRequest(boolean addInvalidKey, boolean addValidKeys) + private RegionAPI.PutAllRequest generateTestRequest(boolean addInvalidKey, boolean addValidKeys) throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { Set<BasicTypes.Entry> entries = new HashSet<>(); if (addInvalidKey) { @@ -165,6 +167,6 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni ProtobufUtilities.createEncodedValue(serializationServiceStub, TEST_KEY3), ProtobufUtilities.createEncodedValue(serializationServiceStub, TEST_VALUE3))); } - return ProtobufRequestUtilities.createPutAllRequest(TEST_REGION, entries); + return ProtobufRequestUtilities.createPutAllRequest(TEST_REGION, entries).getPutAllRequest(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java index a861854..f628d4e 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java @@ -14,25 +14,33 @@ */ package org.apache.geode.protocol.protobuf.operations; -import org.apache.geode.cache.Cache; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.nio.charset.Charset; + +import org.hamcrest.CoreMatchers; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; -import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.Failure; +import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; - -import static org.mockito.Mockito.*; @Category(UnitTest.class) public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -64,11 +72,10 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe public void test_puttingTheEncodedEntryIntoRegion() throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException { PutRequestOperationHandler operationHandler = new PutRequestOperationHandler(); - ClientProtocol.Response response = + Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.PUTRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Success); verify(regionMock).put(TEST_KEY, TEST_VALUE); verify(regionMock, times(1)).put(anyString(), anyString()); @@ -77,33 +84,36 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe @Test public void test_invalidEncodingType() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { + String exceptionText = "unsupported type!"; UnsupportedEncodingTypeException exception = - new UnsupportedEncodingTypeException("unsupported type!"); + new UnsupportedEncodingTypeException(exceptionText); when(serializationServiceStub.decode(BasicTypes.EncodingType.STRING, TEST_KEY.getBytes(Charset.forName("UTF-8")))).thenThrow(exception); PutRequestOperationHandler operationHandler = new PutRequestOperationHandler(); - ClientProtocol.Response response = + Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Failure); + org.junit.Assert.assertEquals(exceptionText, result.getErrorMessage().getMessage()); } @Test public void test_codecNotRegistered() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { + String exceptionMessage = "error finding codec for type"; CodecNotRegisteredForTypeException exception = - new CodecNotRegisteredForTypeException("error finding codec for type"); + new CodecNotRegisteredForTypeException(exceptionMessage); when(serializationServiceStub.decode(BasicTypes.EncodingType.STRING, TEST_KEY.getBytes(Charset.forName("UTF-8")))).thenThrow(exception); PutRequestOperationHandler operationHandler = new PutRequestOperationHandler(); - ClientProtocol.Response response = + Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Failure); + org.junit.Assert.assertThat(result.getErrorMessage().getMessage(), + CoreMatchers.containsString(exceptionMessage)); } @Test @@ -111,11 +121,12 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { when(cacheStub.getRegion(TEST_REGION)).thenReturn(null); PutRequestOperationHandler operationHandler = new PutRequestOperationHandler(); - ClientProtocol.Response response = + Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Failure); + org.junit.Assert.assertEquals("Region passed by client did not exist: test region", + result.getErrorMessage().getMessage()); } @Test @@ -124,20 +135,21 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe when(regionMock.put(any(), any())).thenThrow(ClassCastException.class); PutRequestOperationHandler operationHandler = new PutRequestOperationHandler(); - ClientProtocol.Response response = + Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub, generateTestRequest(), cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + Assert.assertTrue(result instanceof Failure); + org.junit.Assert.assertThat(result.getErrorMessage().getMessage(), + CoreMatchers.containsString("invalid key or value type")); } - private ClientProtocol.Request generateTestRequest() + private RegionAPI.PutRequest generateTestRequest() throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { BasicTypes.EncodedValue testKey = ProtobufUtilities.createEncodedValue(serializationServiceStub, TEST_KEY); BasicTypes.EncodedValue testValue = ProtobufUtilities.createEncodedValue(serializationServiceStub, TEST_VALUE); BasicTypes.Entry testEntry = ProtobufUtilities.createEntry(testKey, testValue); - return ProtobufRequestUtilities.createPutRequest(TEST_REGION, testEntry); + return ProtobufRequestUtilities.createPutRequest(TEST_REGION, testEntry).getPutRequest(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java index 47f9bad..cf434c2 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java @@ -14,29 +14,32 @@ */ package org.apache.geode.protocol.protobuf.operations; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.Cache; +import java.nio.charset.Charset; + +import org.hamcrest.CoreMatchers; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.Region; import org.apache.geode.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.RegionAPI; +import org.apache.geode.protocol.protobuf.Result; +import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.serialization.SerializationService; import org.apache.geode.serialization.codec.StringCodec; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -import org.apache.geode.test.dunit.Assert; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.nio.charset.Charset; @Category(UnitTest.class) public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest { @@ -75,13 +78,11 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni public void processValidKeyRemovesTheEntryAndReturnSuccess() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request removeRequest = generateTestRequest(false, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, removeRequest, cacheStub); + RegionAPI.RemoveRequest removeRequest = generateTestRequest(false, false).getRemoveRequest(); + Result<RegionAPI.RemoveResponse> result = + operationHandler.process(serializationServiceStub, removeRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.REMOVERESPONSE, - response.getResponseAPICase()); - RegionAPI.RemoveResponse removeResponse = response.getRemoveResponse(); + assertTrue(result instanceof Success); verify(regionStub).remove(TEST_KEY); } @@ -89,25 +90,24 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni public void processReturnsUnsucessfulResponseForInvalidRegion() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request removeRequest = generateTestRequest(true, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, removeRequest, cacheStub); + RegionAPI.RemoveRequest removeRequest = generateTestRequest(true, false).getRemoveRequest(); + Result<RegionAPI.RemoveResponse> result = + operationHandler.process(serializationServiceStub, removeRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + assertTrue(result instanceof Failure); + org.junit.Assert.assertThat(result.getErrorMessage().getMessage(), + CoreMatchers.containsString("Region")); } @Test - public void processReturnsKeyNotFoundWhenKeyIsNotFound() + public void processReturnsSuccessWhenKeyIsNotFound() throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException { - ClientProtocol.Request removeRequest = generateTestRequest(false, true); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, removeRequest, cacheStub); + RegionAPI.RemoveRequest removeRequest = generateTestRequest(false, true).getRemoveRequest(); + Result<RegionAPI.RemoveResponse> result = + operationHandler.process(serializationServiceStub, removeRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.REMOVERESPONSE, - response.getResponseAPICase()); - RegionAPI.RemoveResponse removeResponse = response.getRemoveResponse(); + assertTrue(result instanceof Success); } @Test @@ -119,12 +119,13 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni when(serializationServiceStub.decode(BasicTypes.EncodingType.STRING, TEST_KEY.getBytes(Charset.forName("UTF-8")))).thenThrow(exception); - ClientProtocol.Request removeRequest = generateTestRequest(false, false); - ClientProtocol.Response response = (ClientProtocol.Response) operationHandler - .process(serializationServiceStub, removeRequest, cacheStub); + RegionAPI.RemoveRequest removeRequest = generateTestRequest(false, false).getRemoveRequest(); + Result<RegionAPI.RemoveResponse> result = + operationHandler.process(serializationServiceStub, removeRequest, cacheStub); - Assert.assertEquals(ClientProtocol.Response.ResponseAPICase.ERRORRESPONSE, - response.getResponseAPICase()); + assertTrue(result instanceof Failure); + org.junit.Assert.assertEquals("Codec error in protobuf deserialization.", + result.getErrorMessage().getMessage()); } private ClientProtocol.Request generateTestRequest(boolean missingRegion, boolean missingKey) http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java index c389cc2..0f6435a 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java @@ -14,22 +14,23 @@ */ package org.apache.geode.protocol.serializer; -import org.apache.geode.protocol.MessageUtil; -import org.apache.geode.protocol.exception.InvalidProtocolMessageException; -import org.apache.geode.protocol.protobuf.ClientProtocol; -import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; -import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ServiceLoader; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.protocol.MessageUtil; +import org.apache.geode.protocol.exception.InvalidProtocolMessageException; +import org.apache.geode.protocol.protobuf.ClientProtocol; +import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer; +import org.apache.geode.test.junit.categories.UnitTest; + @Category(UnitTest.class) public class ProtobufProtocolSerializerJUnitTest { private ProtocolSerializer<ClientProtocol.Message> protocolSerializer; http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/serialization/ProtobufSerializationServiceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/ProtobufSerializationServiceJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/ProtobufSerializationServiceJUnitTest.java index 122c8bc..efee577 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/serialization/ProtobufSerializationServiceJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/ProtobufSerializationServiceJUnitTest.java @@ -14,16 +14,17 @@ */ package org.apache.geode.serialization; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.protocol.protobuf.BasicTypes; import org.apache.geode.protocol.protobuf.ProtobufSerializationService; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; import org.apache.geode.test.junit.categories.UnitTest; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; @Category(UnitTest.class) public class ProtobufSerializationServiceJUnitTest { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java index 9821803..4d749ab 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java @@ -14,14 +14,17 @@ */ package org.apache.geode.serialization.codec; -import org.apache.geode.test.junit.categories.UnitTest; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import java.nio.charset.Charset; + import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.nio.charset.Charset; - -import static org.junit.Assert.*; +import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) public class BinaryFormatJUnitTest { http://git-wip-us.apache.org/repos/asf/geode/blob/64eab455/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java index 1d038f5..578d263 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java @@ -14,11 +14,6 @@ */ package org.apache.geode.serialization.registry; -import org.apache.geode.serialization.SerializationType; -import org.apache.geode.serialization.TypeCodec; -import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; -import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -import org.apache.geode.test.junit.categories.UnitTest; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -30,6 +25,12 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import org.apache.geode.serialization.SerializationType; +import org.apache.geode.serialization.TypeCodec; +import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; +import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; +import org.apache.geode.test.junit.categories.UnitTest; + @Category(UnitTest.class) @RunWith(PowerMockRunner.class) @PowerMockIgnore("*.UnitTest")
