diff --git a/a1/src/edu/wmich/cs3310/a1/DataStructures/CharList.java b/a1/src/edu/wmich/cs3310/a1/DataStructures/CharList.java index 65f20e5ee4fe859eb0e8556ae10141ca2690a5af..b908333d88fa205b8ab52b7c729c7e749c4d6802 100644 --- a/a1/src/edu/wmich/cs3310/a1/DataStructures/CharList.java +++ b/a1/src/edu/wmich/cs3310/a1/DataStructures/CharList.java @@ -8,8 +8,8 @@ public class CharList { //region Variables - private CharNode firstNode; - private CharNode lastNode; + protected CharNode firstNode; + protected CharNode lastNode; //endregion Variables @@ -17,6 +17,9 @@ public class CharList { //region Controllers + /** + * Base constructor. + */ public CharList() { } @@ -31,7 +34,7 @@ public class CharList { * Getter for first node in list. * @return First node of list. */ - public CharNode getFirstNode() { + public CharNode firstNode() { return firstNode; } @@ -40,7 +43,7 @@ public class CharList { * Getter for last node in list. * @return Last node of list. */ - public CharNode getLastNode() { + public CharNode lastNode() { return lastNode; } @@ -78,7 +81,7 @@ public class CharList { /** - * Insert new new node at given index in linked list. + * Inserts new new node at given index in linked list. * @param character Character for node to hold. * @param index Index of new node. * @return True on success or false on failure. @@ -128,7 +131,7 @@ public class CharList { /** - * Delete node with given index. + * Deletes node with given index. * @param index Index of node to delete. * @return Deleted node or null on failure. */ @@ -168,7 +171,7 @@ public class CharList { /** - * Delete node with given character. + * Deletes node with given character. * @param character Character to delete. * @return Deleted node or null on failure. */ diff --git a/a1/tests/CharListTests.java b/a1/tests/CharListTests.java index 6dff47d738f32dfba8157f394802b102a38b091c..465aff1e299092ad79eaa4b0d93dc6370d6956e5 100644 --- a/a1/tests/CharListTests.java +++ b/a1/tests/CharListTests.java @@ -33,63 +33,63 @@ public class CharListTests { @Test public void Test_Insert_Success_OnlyFirst() { // Test inserting with 0 nodes. - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); // Test inserting with 1 node. Assert.assertTrue(aList.Insert('a', 0)); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode()); // Test inserting with 2 nodes. Assert.assertTrue(aList.Insert('b', 0)); - Assert.assertEquals('b', aList.getFirstNode().myData()); - Assert.assertEquals('a', aList.getLastNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getLastNode(), aList.getFirstNode().nextNode()); + Assert.assertEquals('b', aList.firstNode().myData()); + Assert.assertEquals('a', aList.lastNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.lastNode(), aList.firstNode().nextNode()); // Test inserting with 3 nodes. Assert.assertTrue(aList.Insert('c', 0)); - Assert.assertEquals('c', aList.getFirstNode().myData()); - Assert.assertEquals('b', aList.getFirstNode().nextNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode().prevNode()); - Assert.assertEquals(aList.getFirstNode().nextNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getFirstNode().nextNode().nextNode(), aList.getLastNode()); + Assert.assertEquals('c', aList.firstNode().myData()); + Assert.assertEquals('b', aList.firstNode().nextNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode().prevNode()); + Assert.assertEquals(aList.firstNode().nextNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.firstNode().nextNode().nextNode(), aList.lastNode()); } @Test public void Test_Insert_Success_OnlyLast() { // Test inserting with 0 nodes. - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); // Test inserting with 1 node. Assert.assertTrue(aList.Insert('a', 0)); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode()); // Test inserting with 2 nodes. Assert.assertTrue(aList.Insert('b', 1)); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals('b', aList.getLastNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getLastNode(), aList.getFirstNode().nextNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals('b', aList.lastNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.lastNode(), aList.firstNode().nextNode()); // Test inserting with 3 nodes. Assert.assertTrue(aList.Insert('c', 2)); - Assert.assertEquals('c', aList.getLastNode().myData()); - Assert.assertEquals('b', aList.getLastNode().prevNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode().prevNode()); - Assert.assertEquals(aList.getFirstNode().nextNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getFirstNode().nextNode().nextNode(), aList.getLastNode()); + Assert.assertEquals('c', aList.lastNode().myData()); + Assert.assertEquals('b', aList.lastNode().prevNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode().prevNode()); + Assert.assertEquals(aList.firstNode().nextNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.firstNode().nextNode().nextNode(), aList.lastNode()); } @Test public void Test_Insert_Fail_BadIndex() { - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); Assert.assertFalse(aList.Insert('a', -1)); Assert.assertFalse(aList.Insert('a', 1)); @@ -115,10 +115,10 @@ public class CharListTests { Assert.assertEquals('a', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('b', aList.getFirstNode().myData()); - Assert.assertEquals('c', aList.getLastNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getLastNode(), aList.getFirstNode().nextNode()); + Assert.assertEquals('b', aList.firstNode().myData()); + Assert.assertEquals('c', aList.lastNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.lastNode(), aList.firstNode().nextNode()); // Test deleting with 2 nodes. aNode = aList.Delete(0); @@ -126,8 +126,8 @@ public class CharListTests { Assert.assertEquals('b', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('c', aList.getFirstNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode()); + Assert.assertEquals('c', aList.firstNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode()); // Test deleting with 1 nodes. aNode = aList.Delete(0); @@ -135,8 +135,8 @@ public class CharListTests { Assert.assertEquals('c', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); } @@ -152,10 +152,10 @@ public class CharListTests { Assert.assertEquals('c', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals('b', aList.getLastNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getLastNode(), aList.getFirstNode().nextNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals('b', aList.lastNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.lastNode(), aList.firstNode().nextNode()); // Test deleting with 2 nodes. aNode = aList.Delete(1); @@ -163,8 +163,8 @@ public class CharListTests { Assert.assertEquals('b', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode()); // Test deleting with 1 nodes. aNode = aList.Delete(0); @@ -172,8 +172,8 @@ public class CharListTests { Assert.assertEquals('a', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); } @@ -206,10 +206,10 @@ public class CharListTests { Assert.assertEquals('c', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals('b', aList.getLastNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode().prevNode()); - Assert.assertEquals(aList.getLastNode(), aList.getFirstNode().nextNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals('b', aList.lastNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode().prevNode()); + Assert.assertEquals(aList.lastNode(), aList.firstNode().nextNode()); // Test deleting with 2 nodes. aNode = aList.Delete('b'); @@ -217,8 +217,8 @@ public class CharListTests { Assert.assertEquals('b', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertEquals('a', aList.getFirstNode().myData()); - Assert.assertEquals(aList.getFirstNode(), aList.getLastNode()); + Assert.assertEquals('a', aList.firstNode().myData()); + Assert.assertEquals(aList.firstNode(), aList.lastNode()); // Test deleting with 1 nodes. @@ -227,8 +227,8 @@ public class CharListTests { Assert.assertEquals('a', aNode.myData()); Assert.assertNull(aNode.nextNode()); Assert.assertNull(aNode.prevNode()); - Assert.assertNull(aList.getFirstNode()); - Assert.assertNull(aList.getLastNode()); + Assert.assertNull(aList.firstNode()); + Assert.assertNull(aList.lastNode()); }