Merge remote-tracking branch 'origin/master'

blackbeltcoder · blackbeltcoder · commit 915b7e876460 · 2016-12-29T12:53:22.000Z
diff --git a/src/main/java/com/sar/sandpit/ItemService.java b/src/main/java/com/sar/sandpit/ItemService.java
@@ -20,10 +20,7 @@ public boolean updateItem(Item item) {
 
     @Override
     public Item getItem(long id) {
-
-        itemStore.findOne(id);
-        return null;
-        //return new Item();
+        return itemStore.findOne(id);
     }
 
     public ItemService(ItemStorable itemStorable) {
diff --git a/src/test/java/com/sar/sandpit/ItemControllerTest.java b/src/test/java/com/sar/sandpit/ItemControllerTest.java
@@ -22,6 +22,9 @@ public void displayItem_StoreHasOneItem_Success() throws Exception {
 
         throw new NotImplementedException();
 
+        
 
     }
+
+
 }
diff --git a/src/test/java/com/sar/sandpit/ItemServiceTest.java b/src/test/java/com/sar/sandpit/ItemServiceTest.java
@@ -117,10 +117,23 @@ public void getItem_success() throws Exception {
     @Test
     public void getItem_success2() throws Exception {
 
+        long id =1L;
         //Arrange
-        when(itemStorable.findOne(1L)).thenReturn(new Item(1L));
-        Item res =itemService.getItem(1L);
+        when(itemStorable.findOne(id)).thenReturn(new Item(id));
+        Item res =itemService.getItem(id);
         assertThat("item not null", res, is(notNullValue()));
+        assertThat("item not equal to id ",id,is(equalTo(res.getId())));
+
+    }
+    @Test
+    public void getItem_success3() throws Exception {
+
+        long id =2L;
+        //Arrange
+        when(itemStorable.findOne(id)).thenReturn(new Item(id));
+        Item res =itemService.getItem(id);
+        assertThat("item not null", res, is(notNullValue()));
+        assertThat("item not equal to id ",id,is(equalTo(res.getId())));
 
     }
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ public void displayItem_StoreHasOneItem_Success() throws Exception {`
`22`	`22`
`23`	`23`	`throw new NotImplementedException();`
`24`	`24`
	`25`	`+`
`25`	`26`
`26`	`27`	`}`
	`28`	`+`
	`29`	`+`
`27`	`30`	`}`