From 5a19f801b30af012404656e8ecbce8c8c6e07c7a Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Mon, 3 Dec 2018 20:11:07 +0100 Subject: [PATCH] Created some unit tests for idgenrator package. --- src/opensesim/util/idgenerator/Id.java | 3 +- .../util/idgenerator/IDGeneratorTest.java | 2 +- test/opensesim/util/idgenerator/IdTest.java | 125 ++++++++++++++++++ .../util/idgenerator/IdgeneratorSuite.java | 59 +++++++++ 4 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 test/opensesim/util/idgenerator/IdTest.java create mode 100644 test/opensesim/util/idgenerator/IdgeneratorSuite.java diff --git a/src/opensesim/util/idgenerator/Id.java b/src/opensesim/util/idgenerator/Id.java index d1f7cd2..1294f88 100644 --- a/src/opensesim/util/idgenerator/Id.java +++ b/src/opensesim/util/idgenerator/Id.java @@ -30,6 +30,7 @@ import java.util.Objects; /** * * @author 7u83 <7u83@mail.ru> + * @param */ public class Id implements Comparable { @@ -61,7 +62,7 @@ public class Id implements Comparable { @Override public int compareTo(Id o) { - return value.compareTo(o); + return value.compareTo(o.value); } } diff --git a/test/opensesim/util/idgenerator/IDGeneratorTest.java b/test/opensesim/util/idgenerator/IDGeneratorTest.java index b5ceec3..93a871c 100644 --- a/test/opensesim/util/idgenerator/IDGeneratorTest.java +++ b/test/opensesim/util/idgenerator/IDGeneratorTest.java @@ -77,7 +77,7 @@ public class IDGeneratorTest { System.out.println("getNext"); IDGenerator instance = new IDGenerator(7L); - Id expResult = new Id(0L); + Id expResult = new Id(7L); Id result = instance.getNext(); assertEquals(expResult, result); // TODO review the generated test code and remove the default call to fail. diff --git a/test/opensesim/util/idgenerator/IdTest.java b/test/opensesim/util/idgenerator/IdTest.java new file mode 100644 index 0000000..6414d85 --- /dev/null +++ b/test/opensesim/util/idgenerator/IdTest.java @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2018, 7u83 <7u83@mail.ru> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package opensesim.util.idgenerator; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.junit.Assert.*; + +/** + * + * @author 7u83 <7u83@mail.ru> + */ +public class IdTest { + + public IdTest() { + } + + @BeforeClass + public static void setUpClass() { + } + + @AfterClass + public static void tearDownClass() { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of equals method, of class Id. + */ + @Test + public void testEquals() { + System.out.println("equals"); + Id o = new Id<>(17L); + Id instance = new Id<>(7L); + boolean expResult = false; + boolean result = instance.equals(o); + assertEquals(expResult, result); + } + + /** + * Test of hashCode method, of class Id. + */ + @Test + public void testHashCode() { + System.out.println("hashCode"); + Id instance = new Id(31L); + int expResult = 0; + int result = instance.hashCode(); + //assertEquals(expResult, result); + // TODO review the generated test code and remove the default call to fail. + //fail("The test case is a prototype."); + } + + /** + * Test of toString method, of class Id. + */ + @Test + public void testToString() { + System.out.println("toString"); + Id instance = new Id(18L); + String expResult = "18"; + String result = instance.toString(); + assertEquals(expResult, result); + + } + + /** + * Test of compareTo method, of class Id. + */ + @Test + public void testCompareTo() { + System.out.println("compareTo"); + Id o = new Id(17L); + Id instance = new Id(13L); + int expResult = -1; + int result = instance.compareTo(o); + + o = new Id(172L); + instance = new Id(193L); + expResult = 1; + result = instance.compareTo(o); + assertEquals(expResult, result); + + o = new Id(11L); + instance = new Id(11L); + expResult = 0; + result = instance.compareTo(o); + assertEquals(expResult, result); + + } + +} diff --git a/test/opensesim/util/idgenerator/IdgeneratorSuite.java b/test/opensesim/util/idgenerator/IdgeneratorSuite.java new file mode 100644 index 0000000..0ca9d0c --- /dev/null +++ b/test/opensesim/util/idgenerator/IdgeneratorSuite.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018, 7u83 <7u83@mail.ru> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package opensesim.util.idgenerator; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * + * @author 7u83 <7u83@mail.ru> + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({opensesim.util.idgenerator.IdTest.class, opensesim.util.idgenerator.IDGeneratorTest.class}) +public class IdgeneratorSuite { + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + +}