more testing, changed controller methods

src/main/java/com/example/bakerylab/controllers/BakerController.java

@@ -10,11 +10,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.Null;
+
 @RestController
 public class BakerController {
 
+    private final BakerRepository bakerRepository;
+
     @Autowired
-    private BakerRepository bakerRepository;
+    public BakerController(BakerRepository bakerRepository) {
+        this.bakerRepository = bakerRepository;
+    }
 
     @RequestMapping(value = "/bakers", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Baker>> index() {
@@ -23,7 +29,7 @@ public class BakerController {
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.GET)
     public ResponseEntity<Baker> show(@PathVariable Long id) {
-        return new ResponseEntity<>(this.bakerRepository.findById(id).get(), HttpStatus.OK);
+        return verfiyBaker(id);
     }
 
     @RequestMapping(value = "/bakers", method = RequestMethod.POST)
@@ -33,17 +39,31 @@ public class BakerController {
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.PUT)
     public ResponseEntity<Baker> update(@PathVariable Long id, Baker baker) {
-        Baker foundBaker = bakerRepository.findById(id).get();
 
-        foundBaker.setName(baker.getName());
-        foundBaker.setSpecialty(baker.getSpecialty());
+        if (verfiyBaker(id).getStatusCode().value() != HttpStatus.NOT_FOUND.value()) {
+            Baker foundBaker = bakerRepository.findById(id).get();
+            foundBaker.setName(baker.getName());
+            foundBaker.setSpecialty(baker.getSpecialty());
 
-        return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
+            return new ResponseEntity<>(this.bakerRepository.save(foundBaker), HttpStatus.OK);
+        } else {
+            return verfiyBaker(id);
+        }
     }
 
     @RequestMapping(value = "/bakers/{id}", method = RequestMethod.DELETE)
     public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
+        verfiyBaker(id);
         this.bakerRepository.delete(bakerRepository.findById(id).get());
         return new ResponseEntity<>(true, HttpStatus.OK);
     }
+
+    public ResponseEntity<Baker> verfiyBaker(Long id) {
+        try {
+            bakerRepository.findById(id).get().getId();
+        } catch (NullPointerException npe) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+        return new ResponseEntity<>(bakerRepository.findById(id).get(), HttpStatus.OK);
+    }
 }

src/main/java/com/example/bakerylab/controllers/MuffinController.java

@@ -13,8 +13,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class MuffinController {
 
+    private final MuffinRepository muffinRepository;
+
     @Autowired
-    private MuffinRepository muffinRepository;
+    public MuffinController(MuffinRepository muffinRepository) {
+        this.muffinRepository = muffinRepository;
+    }
 
     @RequestMapping(value = "/muffins", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Muffin>> index() {

src/test/java/com/example/bakerylab/controllers/BakerControllerTest.java

@@ -10,27 +10,32 @@ import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+import java.util.ArrayList;
 import java.util.Optional;
 
 import static com.example.bakerylab.JsonUtil.asJsonString;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
 @RunWith(SpringRunner.class)
 @WebMvcTest(BakerController.class)
 public class BakerControllerTest {
+
     // === Instance Variables === //
     private Baker froilan;
     private final String GOOD_URL = "/bakers";
+    private final String BAD_URL = "/bakers500";
 
     @Autowired
     MockMvc mvc;
@@ -50,7 +55,6 @@ public class BakerControllerTest {
                 .build();
 
         froilan = new Baker("Froilan", "Master Baker", "Croissants");
-
     }
 
     // ================= Create Baker ================= //
@@ -70,15 +74,13 @@ public class BakerControllerTest {
     @Test
     public void testCreateBakerFail() throws Exception {
         Baker b = new Baker ("Seth", "froilans prepper", "muffins");
-        String badUrl = "/bakers500";
         given(bakerRepository.save(b)).willReturn(b);
 
-        mvc.perform(post(badUrl)
+        mvc.perform(post(BAD_URL)
                 .content(asJsonString(froilan))
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON))
                 .andExpect(status().isNotFound());
-
     }
 
     // ================= Get Baker ================= //
@@ -89,22 +91,80 @@ public class BakerControllerTest {
 
         given(bakerRepository.findById(bakerId)).willReturn(Optional.of(froilan));
 
-        MvcResult response = mvc.perform(get(GOOD_URL)
+        mvc.perform(get(GOOD_URL)
                 .accept(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andReturn();
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void getBakerIdFail() throws Exception {
+        Long bakerId = 500L;
 
-        System.out.println(response.getResponse().getContentAsString());
-//        response.getResponse().getContentAsString();
+        given(bakerRepository.findById(bakerId)).willReturn(null);
 
+        mvc.perform(get(GOOD_URL + "/{id}", bakerId)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isNotFound());
     }
 
-
     // ================= Get Bakers ================= //
 
+    @Test
+    public void getAllBakersSuccess() throws Exception {
+        ArrayList<Baker> bakers = new ArrayList<>();
+        bakers.add(froilan);
+        given(bakerRepository.findAll()).willReturn(bakers);
+
+        mvc.perform(get(GOOD_URL))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void getAllBakersFail() throws Exception {
+
+        given(bakerRepository.findAll()).willReturn(null);
+
+        mvc.perform(get(BAD_URL))
+                .andExpect(status().isNotFound());
+    }
+
     // ================= Update Baker ================= //
 
+    @Test
+    public void updateBakerSuccess() throws Exception {
+        froilan.setId(500L);
+        given(bakerRepository.findById(froilan.getId())).willReturn(Optional.ofNullable(froilan));
+
+
+        mvc.perform(put("/bakers/{id}", froilan.getId())
+                .content(asJsonString(froilan))
+                .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void updateBakerFail() throws Exception {
+        froilan.setId(500L);
+
+        given(bakerRepository.findById(froilan.getId())).willReturn(null);
+
+
+        mvc.perform(put("/bakers/{id}", froilan.getId())
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(asJsonString(froilan)))
+                .andExpect(status().isNotFound());
+    }
+
     // ================= Delete Baker ================= //
 
 
+    @Test
+    public void deleteBakerSuccess() {
+
+    }
+
+    @Test
+    public void deleteBakerFail() {
+
+    }
 }