Repository: geode-examples Updated Branches: refs/heads/feature/GEODE-2231 7e4fb3fa3 -> 67d7b0986
GEODE-2231: Add EmployeeData class test and apply spotless changes. Project: http://git-wip-us.apache.org/repos/asf/geode-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-examples/commit/67d7b098 Tree: http://git-wip-us.apache.org/repos/asf/geode-examples/tree/67d7b098 Diff: http://git-wip-us.apache.org/repos/asf/geode-examples/diff/67d7b098 Branch: refs/heads/feature/GEODE-2231 Commit: 67d7b0986e2e4fb6e411868a48e6eda5f8f9243a Parents: 7e4fb3f Author: Karen Miller <kmil...@pivotal.io> Authored: Tue Jan 31 10:27:45 2017 -0800 Committer: Karen Miller <kmil...@pivotal.io> Committed: Tue Jan 31 10:27:45 2017 -0800 ---------------------------------------------------------------------- .../geode/examples/partitioned/Consumer.java | 2 +- .../examples/partitioned/EmployeeData.java | 7 +-- .../examples/partitioned/EmployeeDataTest.java | 56 ++++++++++++++++++++ .../examples/partitioned/EmployeeKeyTest.java | 2 +- 4 files changed, 60 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-examples/blob/67d7b098/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java index 352e695..bf7f852 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/Consumer.java @@ -47,7 +47,7 @@ public class Consumer extends BaseClient { } logger.info("Region contents:"); for (EmployeeKey key : setOfKeys) { - if (this.getRegion().getEntry(key) == null ) { + if (this.getRegion().getEntry(key) == null) { logger.info("getEntry returned null"); } logger.info(this.getRegion().getEntry(key).toString()); http://git-wip-us.apache.org/repos/asf/geode-examples/blob/67d7b098/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java ---------------------------------------------------------------------- diff --git a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java index 6225e7a..0b4a534 100644 --- a/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java +++ b/partitioned/src/main/java/org/apache/geode/examples/partitioned/EmployeeData.java @@ -53,11 +53,8 @@ public class EmployeeData implements Serializable { } public String toString() { - return ("bogus EmployeeData string"); - /* - * return (this.nameAndNumber.toString() + " salary=" + this.salary + " hoursPerWeek=" + - * this.hoursPerWeek); - */ + return (this.nameAndNumber.toString() + " salary=" + this.salary + " hoursPerWeek=" + + this.hoursPerWeek); } } http://git-wip-us.apache.org/repos/asf/geode-examples/blob/67d7b098/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeDataTest.java ---------------------------------------------------------------------- diff --git a/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeDataTest.java b/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeDataTest.java new file mode 100644 index 0000000..21b96ad --- /dev/null +++ b/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeDataTest.java @@ -0,0 +1,56 @@ +package org.apache.geode.examples.partitioned; + +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +/** + * Created by kmiller on 1/31/17. + */ +public class EmployeeDataTest { + private EmployeeData d; + + @Rule + public ExpectedException expectedException = ExpectedException.none(); + + @Before + public void setup() { + EmployeeKey k = new EmployeeKey("First Last", 3001); + d = new EmployeeData(k, 40000, 38); + } + + @Test + public void testGetNameAndNumber() { + assertEquals("First Last", d.getNameAndNumber().getName()); + assertEquals(3001, d.getNameAndNumber().getEmplNumber()); + } + + @Test + public void testGetSalary() { + assertEquals(40000, d.getSalary()); + } + + @Test + public void testGetHoursPerWeek() { + assertEquals(38, d.getHoursPerWeek()); + } + + @Test + public void testEquals() { + EmployeeKey otherKey = new EmployeeKey("First Last", 3001); + EmployeeData otherData = new EmployeeData(otherKey, 40000, 38); + assertTrue(d.equals(otherData)); + EmployeeKey nonMatchingKey = new EmployeeKey("Othername", 1); + EmployeeData nonMatchingData = new EmployeeData(nonMatchingKey, 39999, 40); + assertFalse(d.equals(nonMatchingData)); + } + + @Test + public void testToString() { + assertEquals(d.getNameAndNumber().toString() + " salary=40000 hoursPerWeek=38", d.toString()); + } + +} http://git-wip-us.apache.org/repos/asf/geode-examples/blob/67d7b098/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeKeyTest.java ---------------------------------------------------------------------- diff --git a/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeKeyTest.java b/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeKeyTest.java index 5001f8a..85bc1b2 100644 --- a/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeKeyTest.java +++ b/partitioned/src/test/java/org/apache/geode/examples/partitioned/EmployeeKeyTest.java @@ -49,4 +49,4 @@ public class EmployeeKeyTest { public void testToString() { assertEquals("Name: First Last Employee Number: 3001", k.toString()); } -} \ No newline at end of file +}
