This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 09ba0768b1 IGNITE-18357 Move classes from fixtures to tests (#4122)
09ba0768b1 is described below
commit 09ba0768b188d0058ea29f12fb186980c6948e01
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Tue Jul 23 11:54:04 2024 +0300
IGNITE-18357 Move classes from fixtures to tests (#4122)
---
.../org/apache/ignite/raft/jraft/core/MockStateMachine.java | 0
.../java/org/apache/ignite/raft/jraft/core/TestCluster.java | 0
.../ignite/raft/jraft/core/TestJRaftServiceFactory.java | 0
.../apache/ignite/raft/server/counter/GetValueCommand.java | 7 ++-----
.../ignite/raft/server/counter/IncrementAndGetCommand.java | 7 ++-----
.../raft/server/counter/IntegrationTestMessageGroup.java} | 11 +++--------
.../org/apache/ignite/raft/messages/TestMessageGroup.java | 7 -------
7 files changed, 7 insertions(+), 25 deletions(-)
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/MockStateMachine.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/MockStateMachine.java
similarity index 100%
rename from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/MockStateMachine.java
rename to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/MockStateMachine.java
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/TestCluster.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/TestCluster.java
similarity index 100%
rename from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/TestCluster.java
rename to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/TestCluster.java
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/TestJRaftServiceFactory.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/TestJRaftServiceFactory.java
similarity index 100%
rename from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/core/TestJRaftServiceFactory.java
rename to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/jraft/core/TestJRaftServiceFactory.java
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
similarity index 76%
rename from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
rename to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
index f533698886..1b698c6dc0 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/GetValueCommand.java
@@ -19,16 +19,13 @@ package org.apache.ignite.raft.server.counter;
import org.apache.ignite.internal.network.annotations.Transferable;
import org.apache.ignite.internal.raft.ReadCommand;
-import org.apache.ignite.raft.messages.TestMessageGroup;
-import org.apache.ignite.raft.messages.TestRaftMessagesFactory;
/**
* Get a value command.
*/
-// TODO IGNITE-18357 Move to integration test directory when Maven build is
not supported anymore.
-@Transferable(TestMessageGroup.GET_VALUE_COMMAND)
+@Transferable(IntegrationTestMessageGroup.GET_VALUE_COMMAND)
public interface GetValueCommand extends ReadCommand {
static GetValueCommand getValueCommand() {
- return new TestRaftMessagesFactory().getValueCommand().build();
+ return new
IngtegrationTestRaftMessagesFactory().getValueCommand().build();
}
}
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
similarity index 76%
rename from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
rename to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
index 99bdf7413f..d184438112 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IncrementAndGetCommand.java
@@ -19,14 +19,11 @@ package org.apache.ignite.raft.server.counter;
import org.apache.ignite.internal.network.annotations.Transferable;
import org.apache.ignite.internal.raft.WriteCommand;
-import org.apache.ignite.raft.messages.TestMessageGroup;
-import org.apache.ignite.raft.messages.TestRaftMessagesFactory;
/**
* Increment and get command.
*/
-// TODO IGNITE-18357 Move to integration test directory when Maven build is
not supported anymore.
-@Transferable(TestMessageGroup.INCREMENT_AND_GET_COMMAND)
+@Transferable(IntegrationTestMessageGroup.INCREMENT_AND_GET_COMMAND)
public interface IncrementAndGetCommand extends WriteCommand {
/**
* Returns the delta.
@@ -34,6 +31,6 @@ public interface IncrementAndGetCommand extends WriteCommand {
long delta();
static IncrementAndGetCommand incrementAndGetCommand(long delta) {
- return new
TestRaftMessagesFactory().incrementAndGetCommand().delta(delta).build();
+ return new
IngtegrationTestRaftMessagesFactory().incrementAndGetCommand().delta(delta).build();
}
}
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IntegrationTestMessageGroup.java
similarity index 77%
copy from
modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
copy to
modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IntegrationTestMessageGroup.java
index 1af396f240..17d0af2573 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/counter/IntegrationTestMessageGroup.java
@@ -15,17 +15,12 @@
* limitations under the License.
*/
-package org.apache.ignite.raft.messages;
+package org.apache.ignite.raft.server.counter;
import org.apache.ignite.internal.network.annotations.MessageGroup;
-import org.apache.ignite.raft.server.counter.GetValueCommand;
-import org.apache.ignite.raft.server.counter.IncrementAndGetCommand;
-/**
- * Message group for tests.
- */
-@MessageGroup(groupType = 444, groupName = "TestRaftMessages")
-public interface TestMessageGroup {
+@MessageGroup(groupType = 555, groupName = "IngtegrationTestRaftMessages")
+interface IntegrationTestMessageGroup {
/** Message type for {@link GetValueCommand}. */
short GET_VALUE_COMMAND = 1000;
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
b/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
index 1af396f240..925a234e69 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
+++
b/modules/raft/src/testFixtures/java/org/apache/ignite/raft/messages/TestMessageGroup.java
@@ -18,17 +18,10 @@
package org.apache.ignite.raft.messages;
import org.apache.ignite.internal.network.annotations.MessageGroup;
-import org.apache.ignite.raft.server.counter.GetValueCommand;
-import org.apache.ignite.raft.server.counter.IncrementAndGetCommand;
/**
* Message group for tests.
*/
@MessageGroup(groupType = 444, groupName = "TestRaftMessages")
public interface TestMessageGroup {
- /** Message type for {@link GetValueCommand}. */
- short GET_VALUE_COMMAND = 1000;
-
- /** Message type for {@link IncrementAndGetCommand}. */
- short INCREMENT_AND_GET_COMMAND = 1001;
}
