From 62574ee0ec36dcf8a6cd781fb58a17892cea5a3b Mon Sep 17 00:00:00 2001 From: Rogiel Sulzbach Date: Mon, 22 Mar 2021 16:10:44 -0300 Subject: [PATCH] Fixed test-smells --- .../l2jserver/model/id/allocator/BitSetIDAllocatorTest.java | 6 +++--- .../model/id/provider/CharacterIDProviderTest.java | 5 +++-- .../com/l2jserver/service/world/WorldServiceImplTest.java | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java b/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java index 70916cd78..eec6f08ce 100644 --- a/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java +++ b/l2jserver2-common/src/test/java/com/l2jserver/model/id/allocator/BitSetIDAllocatorTest.java @@ -52,9 +52,9 @@ public void tearUp() { public void testAllocate() { final int id1 = allocator.allocate(); final int id2 = allocator.allocate(); - assertFalse(id1 == id2); - assertEquals(IDAllocator.FIRST_ID, id1); - assertEquals(IDAllocator.FIRST_ID + 1, id2); + assertFalse("IDs must not be equal", id1 == id2); + assertEquals("First allocated ID must be equal to the first allocatable ID", IDAllocator.FIRST_ID, id1); + assertEquals("IDs must increment sequentially", IDAllocator.FIRST_ID + 1, id2); } /** diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java index 2bddba19a..64e27c9a2 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/model/id/provider/CharacterIDProviderTest.java @@ -70,8 +70,8 @@ public void tearUp() throws ServiceStartException { public void testCreateID() { final ID id1 = charIdFactory.createID(); final ID id2 = charIdFactory.createID(); - Assert.assertNotNull(id1); - Assert.assertFalse(id1.equals(id2)); + Assert.assertNotNull("Must return a valid ID.", id1); + Assert.assertFalse("Must allocate unique IDs.", id1.equals(id2)); } /** @@ -82,6 +82,7 @@ public void testDestroy() { final CharacterID id1 = charIdFactory.createID(); Assert.assertNotNull(id1); charIdFactory.destroy(id1); + Assert.assertNull(charIdFactory.resolveID(id1.getID())); } /** diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java index 6a87bf876..d028031bc 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldServiceImplTest.java @@ -78,8 +78,7 @@ public void testAdd() { */ @Test(expected = NullPointerException.class) public void testAddNullId() { - final L2Character character = new L2Character(null); - world.add(character); + world.add(null); } /**