Skip to content

Commit bd6475c

Browse files
shishkoviljashishkovilja
committed
IGNITE-26728 Add EnumMessage
1 parent 6ccb40d commit bd6475c

File tree

3 files changed

+73
-28
lines changed

3 files changed

+73
-28
lines changed

‎modules/core/src/test/java/org/apache/ignite/internal/managers/communication/CacheWriteSynchronizationModeMessageTest.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
import org.apache.ignite.internal.util.typedef.F;
2222
import org.junit.Test;
2323

24+
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
25+
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
26+
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
2427
import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
2528
import static org.junit.Assert.assertEquals;
29+
import static org.junit.Assert.assertFalse;
2630
import static org.junit.Assert.assertNull;
2731
import static org.junit.Assert.assertSame;
2832
import static org.junit.Assert.assertTrue;
@@ -33,9 +37,9 @@ public class CacheWriteSynchronizationModeMessageTest {
3337
@Test
3438
public void testCacheWriteSynchronizationCode() {
3539
assertEquals(-1, new CacheWriteSynchronizationModeMessage(null).code());
36-
assertEquals(0, new CacheWriteSynchronizationModeMessage(CacheWriteSynchronizationMode.FULL_SYNC).code());
37-
assertEquals(1, new CacheWriteSynchronizationModeMessage(CacheWriteSynchronizationMode.FULL_ASYNC).code());
38-
assertEquals(2, new CacheWriteSynchronizationModeMessage(CacheWriteSynchronizationMode.PRIMARY_SYNC).code());
40+
assertEquals(0, new CacheWriteSynchronizationModeMessage(FULL_SYNC).code());
41+
assertEquals(1, new CacheWriteSynchronizationModeMessage(FULL_ASYNC).code());
42+
assertEquals(2, new CacheWriteSynchronizationModeMessage(PRIMARY_SYNC).code());
3943

4044
for (CacheWriteSynchronizationMode op : CacheWriteSynchronizationMode.values()) {
4145
assertTrue(new CacheWriteSynchronizationModeMessage(op).code() >= 0);
@@ -52,13 +56,13 @@ public void testCacheWriteSynchronizationFromCode() {
5256
assertNull(msg.value());
5357

5458
msg.code((byte)0);
55-
assertSame(CacheWriteSynchronizationMode.FULL_SYNC, msg.value());
59+
assertSame(FULL_SYNC, msg.value());
5660

5761
msg.code((byte)1);
58-
assertSame(CacheWriteSynchronizationMode.FULL_ASYNC, msg.value());
62+
assertSame(FULL_ASYNC, msg.value());
5963

6064
msg.code((byte)2);
61-
assertSame(CacheWriteSynchronizationMode.PRIMARY_SYNC, msg.value());
65+
assertSame(PRIMARY_SYNC, msg.value());
6266

6367
Throwable t = assertThrowsWithCause(() -> msg.code((byte)3), IllegalArgumentException.class);
6468
assertEquals("Unknown cache write synchronization mode code: 3", t.getMessage());
@@ -78,4 +82,13 @@ public void testConversionConsistency() {
7882
assertEquals(msg.value(), newMsg.value());
7983
}
8084
}
85+
86+
/** */
87+
@Test
88+
public void testIs() {
89+
assertTrue(new CacheWriteSynchronizationModeMessage().is(null));
90+
assertTrue(new CacheWriteSynchronizationModeMessage(null).is(null));
91+
assertTrue(new CacheWriteSynchronizationModeMessage(FULL_SYNC).is(FULL_SYNC));
92+
assertFalse(new CacheWriteSynchronizationModeMessage(FULL_SYNC).is(PRIMARY_SYNC));
93+
}
8194
}

‎modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCacheOperationModeMessageTest.java‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,16 @@
2121
import org.apache.ignite.internal.util.typedef.F;
2222
import org.junit.Test;
2323

24+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
25+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
26+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
27+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
28+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.RELOAD;
29+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
30+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPDATE;
2431
import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
2532
import static org.junit.Assert.assertEquals;
33+
import static org.junit.Assert.assertFalse;
2634
import static org.junit.Assert.assertNull;
2735
import static org.junit.Assert.assertSame;
2836
import static org.junit.Assert.assertTrue;
@@ -33,13 +41,13 @@ public class GridCacheOperationModeMessageTest {
3341
@Test
3442
public void testCacheOperationModeCode() {
3543
assertEquals(-1, new GridCacheOperationMessage(null).code());
36-
assertEquals(0, new GridCacheOperationMessage(GridCacheOperation.READ).code());
37-
assertEquals(1, new GridCacheOperationMessage(GridCacheOperation.CREATE).code());
38-
assertEquals(2, new GridCacheOperationMessage(GridCacheOperation.UPDATE).code());
39-
assertEquals(3, new GridCacheOperationMessage(GridCacheOperation.DELETE).code());
40-
assertEquals(4, new GridCacheOperationMessage(GridCacheOperation.TRANSFORM).code());
41-
assertEquals(5, new GridCacheOperationMessage(GridCacheOperation.RELOAD).code());
42-
assertEquals(6, new GridCacheOperationMessage(GridCacheOperation.NOOP).code());
44+
assertEquals(0, new GridCacheOperationMessage(READ).code());
45+
assertEquals(1, new GridCacheOperationMessage(CREATE).code());
46+
assertEquals(2, new GridCacheOperationMessage(UPDATE).code());
47+
assertEquals(3, new GridCacheOperationMessage(DELETE).code());
48+
assertEquals(4, new GridCacheOperationMessage(TRANSFORM).code());
49+
assertEquals(5, new GridCacheOperationMessage(RELOAD).code());
50+
assertEquals(6, new GridCacheOperationMessage(NOOP).code());
4351

4452
for (GridCacheOperation op : GridCacheOperation.values()) {
4553
assertTrue(new GridCacheOperationMessage(op).code() >= 0);
@@ -56,25 +64,25 @@ public void testCacheOperationModeFromCode() {
5664
assertNull(msg.value());
5765

5866
msg.code((byte)0);
59-
assertSame(GridCacheOperation.READ, msg.value());
67+
assertSame(READ, msg.value());
6068

6169
msg.code((byte)1);
62-
assertSame(GridCacheOperation.CREATE, msg.value());
70+
assertSame(CREATE, msg.value());
6371

6472
msg.code((byte)2);
65-
assertSame(GridCacheOperation.UPDATE, msg.value());
73+
assertSame(UPDATE, msg.value());
6674

6775
msg.code((byte)3);
68-
assertSame(GridCacheOperation.DELETE, msg.value());
76+
assertSame(DELETE, msg.value());
6977

7078
msg.code((byte)4);
71-
assertSame(GridCacheOperation.TRANSFORM, msg.value());
79+
assertSame(TRANSFORM, msg.value());
7280

7381
msg.code((byte)5);
74-
assertSame(GridCacheOperation.RELOAD, msg.value());
82+
assertSame(RELOAD, msg.value());
7583

7684
msg.code((byte)6);
77-
assertSame(GridCacheOperation.NOOP, msg.value());
85+
assertSame(NOOP, msg.value());
7886

7987
Throwable t = assertThrowsWithCause(() -> msg.code((byte)7), IllegalArgumentException.class);
8088
assertEquals("Unknown cache operation code: 7", t.getMessage());
@@ -94,4 +102,13 @@ public void testConversionConsistency() {
94102
assertEquals(msg.value(), newMsg.value());
95103
}
96104
}
105+
106+
/** */
107+
@Test
108+
public void testIs() {
109+
assertTrue(new GridCacheOperationMessage().is(null));
110+
assertTrue(new GridCacheOperationMessage(null).is(null));
111+
assertTrue(new GridCacheOperationMessage(READ).is(READ));
112+
assertFalse(new GridCacheOperationMessage(READ).is(DELETE));
113+
}
97114
}

‎modules/core/src/test/java/org/apache/ignite/internal/managers/communication/TransactionIsolationMessageTest.java‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
import org.junit.Test;
2323

2424
import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
25+
import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
26+
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
27+
import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
2528
import static org.junit.Assert.assertEquals;
29+
import static org.junit.Assert.assertFalse;
2630
import static org.junit.Assert.assertNull;
2731
import static org.junit.Assert.assertSame;
2832
import static org.junit.Assert.assertTrue;
@@ -33,12 +37,14 @@ public class TransactionIsolationMessageTest {
3337
@Test
3438
public void testTransactionIsolationCode() {
3539
assertEquals(-1, new TransactionIsolationMessage(null).code());
36-
assertEquals(0, new TransactionIsolationMessage(TransactionIsolation.READ_COMMITTED).code());
37-
assertEquals(1, new TransactionIsolationMessage(TransactionIsolation.REPEATABLE_READ).code());
38-
assertEquals(2, new TransactionIsolationMessage(TransactionIsolation.SERIALIZABLE).code());
40+
assertEquals(0, new TransactionIsolationMessage(READ_COMMITTED).code());
41+
assertEquals(1, new TransactionIsolationMessage(REPEATABLE_READ).code());
42+
assertEquals(2, new TransactionIsolationMessage(SERIALIZABLE).code());
3943

40-
for (TransactionIsolation isolation : TransactionIsolation.values())
41-
assertTrue(new TransactionIsolationMessage(isolation).code() != -1);
44+
for (TransactionIsolation isolation : TransactionIsolation.values()) {
45+
assertTrue(new TransactionIsolationMessage(isolation).code() >= 0);
46+
assertTrue(new TransactionIsolationMessage(isolation).code() < 3);
47+
}
4248
}
4349

4450
/** */
@@ -50,13 +56,13 @@ public void testTransactionIsolationFromCode() {
5056
assertNull(msg.value());
5157

5258
msg.code((byte)0);
53-
assertSame(TransactionIsolation.READ_COMMITTED, msg.value());
59+
assertSame(READ_COMMITTED, msg.value());
5460

5561
msg.code((byte)1);
56-
assertSame(TransactionIsolation.REPEATABLE_READ, msg.value());
62+
assertSame(REPEATABLE_READ, msg.value());
5763

5864
msg.code((byte)2);
59-
assertSame(TransactionIsolation.SERIALIZABLE, msg.value());
65+
assertSame(SERIALIZABLE, msg.value());
6066

6167
Throwable t = assertThrowsWithCause(() -> msg.code((byte)3), IllegalArgumentException.class);
6268
assertEquals("Unknown transaction isolation code: 3", t.getMessage());
@@ -76,4 +82,13 @@ public void testConversionConsistency() {
7682
assertEquals(msg.value(), newMsg.value());
7783
}
7884
}
85+
86+
/** */
87+
@Test
88+
public void testIs() {
89+
assertTrue(new TransactionIsolationMessage().is(null));
90+
assertTrue(new TransactionIsolationMessage(null).is(null));
91+
assertTrue(new TransactionIsolationMessage(READ_COMMITTED).is(READ_COMMITTED));
92+
assertFalse(new TransactionIsolationMessage(READ_COMMITTED).is(SERIALIZABLE));
93+
}
7994
}

0 commit comments

Comments
 (0)