DonalEvans commented on a change in pull request #5905:
URL: https://github.com/apache/geode/pull/5905#discussion_r561376768
##########
File path:
geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BaseCommandJUnitTest.java
##########
@@ -27,18 +27,13 @@
import org.junit.runner.RunWith;
import
org.apache.geode.internal.cache.execute.ServerToClientFunctionResultSender;
-import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunction61;
-import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunction65;
import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunction66;
@RunWith(JUnitParamsRunner.class)
public class BaseCommandJUnitTest {
public BaseCommand[] getCommands() {
- return new BaseCommand[] {(BaseCommand)
ExecuteRegionFunction61.getCommand(),
- (BaseCommand) ExecuteRegionFunction65
- .getCommand(),
- (BaseCommand) ExecuteRegionFunction66.getCommand()};
+ return new BaseCommand[] {(BaseCommand)
ExecuteRegionFunction66.getCommand()};
Review comment:
As this method now returns a single-element array, this class no longer
needs to be parameterized and this method can be removed.
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
##########
@@ -391,34 +381,34 @@ private byte write(DataOutputStream dos, DataInputStream
dis, CommunicationMode
hdos.writeByte(replyCode);
if (ports != null) {
hdos.writeInt(ports.size());
- for (int i = 0; i < ports.size(); i++) {
- hdos.writeInt(Integer.parseInt((String) ports.get(i)));
+ for (String port : ports) {
+ hdos.writeInt(Integer.parseInt(port));
}
} else {
hdos.writeInt(readTimeout);
}
// we do not know the receiver's version at this point, but the on-wire
// form of InternalDistributedMember changed in 9.0, so we must serialize
// it using the previous version
- DataOutput idOut = new VersionedDataOutputStream(hdos,
KnownVersion.GFE_82);
- DataSerializer.writeObject(this.id, idOut);
+ DataOutput idOut = new VersionedDataOutputStream(hdos,
KnownVersion.GFE_81);
+ DataSerializer.writeObject(id, idOut);
if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) {
Review comment:
Is this check needed, if the oldest supported version is now GFE_81?
##########
File path:
geode-cq/src/integrationTest/java/org/apache/geode/cache/query/cq/internal/CqServiceFactoryImplTest.java
##########
@@ -0,0 +1,66 @@
+/*
+ * 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.cache.query.cq.internal;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
+import org.apache.geode.internal.cache.tier.sockets.CommandRegistry;
+import org.apache.geode.internal.serialization.KnownVersion;
+
+public class CqServiceFactoryImplTest {
+ @Test
+ public void initialize() {
Review comment:
This test name doesn't really convey what the test is doing, since the
`initialize()` method is a no-op, and it's the `create()` method that's
actually doing the work that's being tested.
##########
File path:
geode-cq/src/test/java/org/apache/geode/cache/query/cq/internal/CqServiceFactoryImplTest.java
##########
@@ -0,0 +1,75 @@
+/*
+ * 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.cache.query.cq.internal;
+
+import static java.util.Collections.singletonMap;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.cache.query.cq.internal.command.CloseCQ;
+import org.apache.geode.cache.query.cq.internal.command.ExecuteCQ61;
+import org.apache.geode.cache.query.cq.internal.command.GetCQStats;
+import org.apache.geode.cache.query.cq.internal.command.GetDurableCQs;
+import org.apache.geode.cache.query.cq.internal.command.MonitorCQ;
+import org.apache.geode.cache.query.cq.internal.command.StopCQ;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.CommandRegistry;
+import org.apache.geode.internal.serialization.KnownVersion;
+
+public class CqServiceFactoryImplTest {
+
+ @Test
+ public void initialize() {
Review comment:
This test name doesn't really convey what the test is doing, since the
`initialize()` method is a no-op, and it's the `create()` method that's
actually doing the work that's being tested.
##########
File path:
geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerTest.java
##########
@@ -0,0 +1,227 @@
+/*
+ * 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.internal.cache.tier.sockets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import org.apache.geode.internal.cache.tier.Command;
+import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.cache.tier.sockets.command.AddPdxEnum;
+import org.apache.geode.internal.cache.tier.sockets.command.AddPdxType;
+import org.apache.geode.internal.cache.tier.sockets.command.ClearRegion;
+import org.apache.geode.internal.cache.tier.sockets.command.ClientReady;
+import org.apache.geode.internal.cache.tier.sockets.command.CloseConnection;
+import org.apache.geode.internal.cache.tier.sockets.command.CommitCommand;
+import org.apache.geode.internal.cache.tier.sockets.command.ContainsKey66;
+import org.apache.geode.internal.cache.tier.sockets.command.CreateRegion;
+import org.apache.geode.internal.cache.tier.sockets.command.Destroy70;
+import org.apache.geode.internal.cache.tier.sockets.command.DestroyRegion;
+import org.apache.geode.internal.cache.tier.sockets.command.ExecuteFunction70;
+import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunction66;
+import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunctionGeode18;
+import
org.apache.geode.internal.cache.tier.sockets.command.ExecuteRegionFunctionSingleHop;
+import
org.apache.geode.internal.cache.tier.sockets.command.GatewayReceiverCommand;
+import org.apache.geode.internal.cache.tier.sockets.command.Get70;
+import org.apache.geode.internal.cache.tier.sockets.command.GetAll70;
+import org.apache.geode.internal.cache.tier.sockets.command.GetAllWithCallback;
+import
org.apache.geode.internal.cache.tier.sockets.command.GetClientPRMetadataCommand66;
+import
org.apache.geode.internal.cache.tier.sockets.command.GetClientPartitionAttributesCommand66;
+import org.apache.geode.internal.cache.tier.sockets.command.GetEntry70;
+import
org.apache.geode.internal.cache.tier.sockets.command.GetFunctionAttribute;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPDXEnumById;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPDXIdForEnum;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPDXIdForType;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPDXTypeById;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPdxEnums70;
+import org.apache.geode.internal.cache.tier.sockets.command.GetPdxTypes70;
+import org.apache.geode.internal.cache.tier.sockets.command.Invalid;
+import org.apache.geode.internal.cache.tier.sockets.command.Invalidate70;
+import org.apache.geode.internal.cache.tier.sockets.command.KeySet;
+import org.apache.geode.internal.cache.tier.sockets.command.MakePrimary;
+import org.apache.geode.internal.cache.tier.sockets.command.PeriodicAck;
+import org.apache.geode.internal.cache.tier.sockets.command.Ping;
+import org.apache.geode.internal.cache.tier.sockets.command.Put70;
+import org.apache.geode.internal.cache.tier.sockets.command.PutAll80;
+import org.apache.geode.internal.cache.tier.sockets.command.PutAllWithCallback;
+import org.apache.geode.internal.cache.tier.sockets.command.PutUserCredentials;
+import org.apache.geode.internal.cache.tier.sockets.command.Query651;
+import org.apache.geode.internal.cache.tier.sockets.command.QueryGeode10;
+import
org.apache.geode.internal.cache.tier.sockets.command.QueryWithParametersGeode10;
+import
org.apache.geode.internal.cache.tier.sockets.command.RegisterDataSerializers;
+import
org.apache.geode.internal.cache.tier.sockets.command.RegisterInstantiators;
+import org.apache.geode.internal.cache.tier.sockets.command.RegisterInterest61;
+import
org.apache.geode.internal.cache.tier.sockets.command.RegisterInterestList66;
+import org.apache.geode.internal.cache.tier.sockets.command.RemoveAll;
+import org.apache.geode.internal.cache.tier.sockets.command.RemoveUserAuth;
+import org.apache.geode.internal.cache.tier.sockets.command.RequestEventValue;
+import org.apache.geode.internal.cache.tier.sockets.command.RollbackCommand;
+import org.apache.geode.internal.cache.tier.sockets.command.Size;
+import org.apache.geode.internal.cache.tier.sockets.command.TXFailoverCommand;
+import
org.apache.geode.internal.cache.tier.sockets.command.TXSynchronizationCommand;
+import org.apache.geode.internal.cache.tier.sockets.command.UnregisterInterest;
+import
org.apache.geode.internal.cache.tier.sockets.command.UnregisterInterestList;
+import
org.apache.geode.internal.cache.tier.sockets.command.UpdateClientNotification;
+import org.apache.geode.internal.serialization.KnownVersion;
+
+public class CommandInitializerTest {
+
+ @Test
+ public void testCommandMapContainsAllVersions() {
+ for (KnownVersion version : KnownVersion.getAllVersions()) {
+ if (version.isNotOlderThan(KnownVersion.OLDEST)) {
+ org.junit.Assert.assertNotNull(
+ "Please add a command set for " + version + " of Geode to
CommandInitializer",
+ CommandInitializer.getDefaultInstance().get(version));
+ }
+ }
+ }
+
+ @Test
+ public void initializeGeode18Commands() {
+ @SuppressWarnings("unchecked")
+ final Map<Integer, Command> commands = mock(Map.class);
Review comment:
Rather than using a mock here and verifying based on methods called,
might it be better to use an actual map and verify the contents using
`assertThat(commands).containsExactlyInAnyOrderEntriesOf(*map of expected
commands*)`? Likewise for the other initialize* tests.
##########
File path:
geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java
##########
@@ -125,23 +123,23 @@ public static void setVersionForTesting(short ver) {
}
private void setOverrides() {
- this.clientConflation = determineClientConflation();
+ clientConflation = determineClientConflation();
// As of May 2009 ( GFE 6.0 ):
// Note that this.clientVersion is used by server side for accepting
// handshakes.
// Client side handshake code uses this.currentClientVersion which can be
// set via tests.
if (currentClientVersion.isNotOlderThan(KnownVersion.GFE_603)) {
Review comment:
Is this check necessary, if GFE_81 is the oldest supported client?
##########
File path:
geode-serialization/src/test/java/org/apache/geode/internal/serialization/KnownVersionJUnitTest.java
##########
@@ -44,18 +39,21 @@ public void testKnownVersionClass() throws Exception {
compare(KnownVersion.GEODE_1_10_0, KnownVersion.GEODE_1_9_0);
compare(KnownVersion.GEODE_1_11_0, KnownVersion.GEODE_1_10_0);
compare(KnownVersion.GEODE_1_12_0, KnownVersion.GEODE_1_11_0);
- compare(KnownVersion.GEODE_1_13_0, KnownVersion.GEODE_1_12_0);
- compare(KnownVersion.GEODE_1_14_0, KnownVersion.GEODE_1_13_0);
+ compare(KnownVersion.GEODE_1_12_1, KnownVersion.GEODE_1_12_0);
+ compare(KnownVersion.GEODE_1_13_0, KnownVersion.GEODE_1_12_1);
+ compare(KnownVersion.GEODE_1_13_1, KnownVersion.GEODE_1_13_0);
+ compare(KnownVersion.GEODE_1_14_0, KnownVersion.GEODE_1_13_1);
}
private void compare(KnownVersion later, KnownVersion earlier) {
assertTrue(later.compareTo(earlier) > 0);
- assertTrue(later.equals(later));
- assertTrue(later.compareTo(later) == 0);
+ assertEquals(later, later);
+ // noinspection EqualsWithItself for testing
+ assertEquals(0, later.compareTo(later));
assertTrue(earlier.compareTo(later) < 0);
assertTrue(later.compareTo(Versioning.getVersion(earlier.ordinal())) > 0);
- assertTrue(later.compareTo(Versioning.getVersion(later.ordinal())) == 0);
+ assertEquals(0, later.compareTo(Versioning.getVersion(later.ordinal())));
assertTrue(earlier.compareTo(Versioning.getVersion(later.ordinal())) < 0);
Review comment:
Instead of `assertTrue()`, might it be better to use
`assertThat().isGreaterThan()` and `assertThat().isLessThan()` for these checks?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
