From 6e29ed1c8a59003fec4f590820613a98c722c2c0 Mon Sep 17 00:00:00 2001 From: michellexchen Date: Thu, 7 Apr 2016 15:59:52 -0400 Subject: [PATCH 1/3] part 1 --- .classpath | 7 ++++ src/tdd/Sheet.java | 35 +++++++++++++++++ src/tdd/TestSheet.java | 85 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 .classpath create mode 100644 src/tdd/Sheet.java create mode 100644 src/tdd/TestSheet.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..3e0fb27 --- /dev/null +++ b/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/tdd/Sheet.java b/src/tdd/Sheet.java new file mode 100644 index 0000000..d97f321 --- /dev/null +++ b/src/tdd/Sheet.java @@ -0,0 +1,35 @@ +package tdd; + +import java.util.HashMap; + +public class Sheet { + + private HashMap myCells = new HashMap(); + + public String get(String string) { + if(myCells.get(string)!=null){ + try{ + Integer.parseInt(myCells.get(string).trim()); + return myCells.get(string).trim(); + } + catch(Exception e){ + return myCells.get(string); + } + } + return ""; + + + } + + public void put(String cell, String value) { + myCells.put(cell,value); + } + + public String getLiteral(String theCell) { + if(myCells.get(theCell)!=null){ + return myCells.get(theCell); + } + return ""; + } + +} diff --git a/src/tdd/TestSheet.java b/src/tdd/TestSheet.java new file mode 100644 index 0000000..20f1102 --- /dev/null +++ b/src/tdd/TestSheet.java @@ -0,0 +1,85 @@ +package tdd; + +import static org.junit.Assert.*; + +import org.junit.Test; + + +public class TestSheet { + + @Test + public void test() { + Sheet sheet = new Sheet(); + assertEquals("", sheet.get("A1")); + assertEquals("", sheet.get("ZX347")); + } + + @Test + public void testThatTextCellsAreStored() { + Sheet sheet = new Sheet(); + String theCell = "A21"; + + sheet.put(theCell, "A string"); + assertEquals("A string", sheet.get(theCell)); + + sheet.put(theCell, "A different string"); + assertEquals("A different string", sheet.get(theCell)); + + sheet.put(theCell, ""); + assertEquals("", sheet.get(theCell)); + } + + @Test + public void testThatManyCellsExist() { + Sheet sheet = new Sheet(); + sheet.put("A1", "First"); + sheet.put("X27", "Second"); + sheet.put("ZX901", "Third"); + + assertEquals("A1", "First", sheet.get("A1")); + assertEquals("X27", "Second", sheet.get("X27")); + assertEquals("ZX901", "Third", sheet.get("ZX901")); + + sheet.put("A1", "Fourth"); + assertEquals("A1 after", "Fourth", sheet.get("A1")); + assertEquals("X27 same", "Second", sheet.get("X27")); + assertEquals("ZX901 same", "Third", sheet.get("ZX901")); + } + + @Test + public void testThatNumericCellsAreIdentifiedAndStored() { + Sheet sheet = new Sheet(); + String theCell = "A21"; + + sheet.put(theCell, "X99"); // "Obvious" string + assertEquals("X99", sheet.get(theCell)); + + sheet.put(theCell, "14"); // "Obvious" number + assertEquals("14", sheet.get(theCell)); + + sheet.put(theCell, " 99 X"); // Whole string must be numeric + assertEquals(" 99 X", sheet.get(theCell)); + + sheet.put(theCell, " 1234 "); // Blanks ignored + assertEquals("1234", sheet.get(theCell)); + + sheet.put(theCell, " "); // Just a blank + assertEquals(" ", sheet.get(theCell)); + } + + @Test + public void testThatWeHaveAccessToCellLiteralValuesForEditing() { + Sheet sheet = new Sheet(); + String theCell = "A21"; + + sheet.put(theCell, "Some string"); + assertEquals("Some string", sheet.getLiteral(theCell)); + + sheet.put(theCell, " 1234 "); + assertEquals(" 1234 ", sheet.getLiteral(theCell)); + + sheet.put(theCell, "=7"); // Foreshadowing formulas:) + assertEquals("=7", sheet.getLiteral(theCell)); + } + +} From dd39e4be8ae07d137140ede7fb537734f60e79d5 Mon Sep 17 00:00:00 2001 From: michellexchen Date: Thu, 7 Apr 2016 16:54:55 -0400 Subject: [PATCH 2/3] part 2 --- src/debug/ContainerArray.java | 2 +- src/debug/ContainerArrayTest.java | 39 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/debug/ContainerArray.java b/src/debug/ContainerArray.java index 124ece6..76d68f5 100755 --- a/src/debug/ContainerArray.java +++ b/src/debug/ContainerArray.java @@ -2,7 +2,7 @@ public class ContainerArray { - private int initialCapacity = 10; + private int limit = 10; private int currentSize = 0; private Object[] internalArray; diff --git a/src/debug/ContainerArrayTest.java b/src/debug/ContainerArrayTest.java index c566d50..b3afa03 100755 --- a/src/debug/ContainerArrayTest.java +++ b/src/debug/ContainerArrayTest.java @@ -44,4 +44,43 @@ public void testObjectIsRemoved () { myContainer.remove("Bear"); assertEquals("Remove should be same reference", alligator, myContainer.get(0)); } + + // + @Test + public void testObjectIsRemoved2(){ + String dog = "Dog"; + myContainer.add(dog); + String cat = "Cat"; + myContainer.add(cat); + myContainer.remove(dog); + assertEquals("Remove should be same reference", cat, myContainer.get(0)); + } + + @Test + public void testAddPastCapacity(){ + myContainer.add("a"); + myContainer.add("b"); + myContainer.add("c"); + myContainer.add("d"); + myContainer.add("e"); + myContainer.add("f"); + myContainer.add("g"); + myContainer.add("h"); + myContainer.add("i"); + myContainer.add("j"); + myContainer.add("k"); + assertEquals(myContainer.size(), myContainer.get(10)); + + } + + @Test + public void testSizeChange(){ + String me = "Michelle"; + myContainer.add(me); + myContainer.add("Michael"); + //myContainer.remove("Michelle"); + assertEquals("My size", 1, myContainer.size()); + } + + //also the constructor size will always be 10--that's bad design } From ceff02957f6df74c25e68772047eaf866b99a994 Mon Sep 17 00:00:00 2001 From: michellexchen Date: Thu, 7 Apr 2016 17:44:25 -0400 Subject: [PATCH 3/3] part 3 --- .classpath | 1 + src/voogasalad/VoogaTests.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/voogasalad/VoogaTests.java diff --git a/.classpath b/.classpath index 3e0fb27..59ccfbe 100644 --- a/.classpath +++ b/.classpath @@ -3,5 +3,6 @@ + diff --git a/src/voogasalad/VoogaTests.java b/src/voogasalad/VoogaTests.java new file mode 100644 index 0000000..85cdf96 --- /dev/null +++ b/src/voogasalad/VoogaTests.java @@ -0,0 +1,14 @@ +package voogasalad; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class VoogaTests { + + @Test + public void test() { + fail("Not yet implemented"); + } + +}