code coverage increased.

Author: vishalmawani

Vishal Mawani/Sprint 1/HealthCareSystem/src/main/java/com/capgemini/healthcaresystem/dao/TestDao.java

@@ -3,11 +3,10 @@
 
 
 import com.capgemini.healthcaresystem.dto.DiagnosticTest;
+import com.capgemini.healthcaresystem.exception.NullCenterId;
 import com.capgemini.healthcaresystem.util.TestRepository;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 
 public class TestDao {
@@ -16,6 +15,7 @@ public class TestDao {
 
 public String addTestDao(String cId,DiagnosticTest diagnosticTest){
 
+
  for (Entry<String, List<DiagnosticTest>> entry : TestRepository.getCenterIdTestListMap().entrySet()) {
  String key = entry.getKey();
 
@@ -26,8 +26,9 @@ public String addTestDao(String cId,DiagnosticTest diagnosticTest){
 
  }
 
+ 
  }
- System.out.println(TestRepository.getCenterIdTestListMap());
+
 
 return "added successfully";
 }
@@ -41,29 +42,13 @@ public String removeTestDao(String cid,DiagnosticTest diagnosticTest) {
  List<DiagnosticTest> values = entry.getValue();
  values.remove(diagnosticTest);
  TestRepository.getCenterIdTestListMap().put(key, values);
+ 
  }
  }
  return "removed successfully";
 }
 
-//	public List<String> getCenterIdTestListDao(String cid){
-//	List<String> tempDao = new ArrayList<String>();
-//	for (Entry<String, List<DiagnosticTest>> entry : TestRepository.getCenterIdTestListMap().entrySet()) {
-// String key = entry.getKey();
-// if(key.equals(cid)) {
-//	List<DiagnosticTest> values = entry.getValue();
-//	for(int i=0;i<values.size();i++) {
-//	tempDao.add(values.get(i).getTestName());
-//	}
-//	}
-//	}
-//	return tempDao;
-//	}
-
-//	public Map<String,String> getCenterIdCenterNameMapDao() {
-//	return TestRepository.getCenterIdCenterNameMap();
-//	}
-
+
 
  public String getTestIdDao() {
 return TestRepository.getTestId();

Vishal Mawani/Sprint 1/HealthCareSystem/src/main/java/com/capgemini/healthcaresystem/dto/DiagnosticCenter.java

@@ -1,8 +1,6 @@
 package com.capgemini.healthcaresystem.dto;
 
 import java.util.List;
-
-import com.capgemini.healthcaresystem.util.TestRepository;
 public class DiagnosticCenter {
 
 private String centerName;
@@ -44,13 +42,13 @@ public List<DiagnosticTest> getListOfTests() {
 return listOfTests;
 }
 public void setListOfTests(List<DiagnosticTest> listOfTests) {
-this.listOfTests = listOfTests;
+DiagnosticCenter.listOfTests = listOfTests;
 }
 public List<Appointment> getAppointmentList() {
 return appointmentList;
 }
 public void setAppointmentList(List<Appointment> appointmentList) {
-this.appointmentList = appointmentList;
+DiagnosticCenter.appointmentList = appointmentList;
 }
 
 

Vishal Mawani/Sprint 1/HealthCareSystem/src/main/java/com/capgemini/healthcaresystem/service/TestService.java

@@ -1,9 +1,5 @@
 package com.capgemini.healthcaresystem.service;
 
-import java.util.List;
-
-import java.util.Map;
-
 import com.capgemini.healthcaresystem.dao.TestDao;
 import com.capgemini.healthcaresystem.dto.DiagnosticTest;
 import com.capgemini.healthcaresystem.exception.NullCenterId;
@@ -25,7 +21,7 @@ public String addTestService(String cId,DiagnosticTest diagnosticTest) throws Nu
 throw new NullTestValue("Test object passed is null");
 }
 testDaoObject.addTestDao(cId,diagnosticTest);
-return "abc";
+return "added successfully";
 }
 
 
@@ -44,21 +40,6 @@ public String removeTestService(String cid,DiagnosticTest diagnosticTest) throws
 return "called testDao remove";
 }
 
-
-
-
-//	public List<String> getCenterIdTestListService(String cid) throws NullCenterId{
-//	if(cid.isEmpty()) {
-//	throw new NullCenterId("Center Id is passed null");
-//	}
-//
-//	return testDaoObject.getCenterIdTestListDao(cid);
-//
-//	}
-
-//	public Map<String,String> getCenterIdCenterNameMapService() {
-//	return testDaoObject.getCenterIdCenterNameMapDao();
-//	}
 
 
 public String getTestIdService() {

Vishal Mawani/Sprint 1/HealthCareSystem/src/main/java/com/capgemini/healthcaresystem/ui/Ui.java

@@ -38,7 +38,7 @@ public void execute(){
 DiagnosticTest temp = new DiagnosticTest(null,getTestName());
 
 String cid = getCenterId();
-testServiceObject.addTestService(cid,temp);
+System.out.println(testServiceObject.addTestService(cid,temp));
 break;
 
 case 2:
@@ -49,7 +49,7 @@ public void execute(){
 String tid = getTestIdUser();
 String tname = getTestName();
 DiagnosticTest temp1 = new DiagnosticTest(tid,tname);
-testServiceObject.removeTestService(cid1,temp1);
+System.out.println(testServiceObject.removeTestService(cid1,temp1));
 break;
 
 default:

Vishal Mawani/Sprint 1/HealthCareSystem/src/main/java/com/capgemini/healthcaresystem/util/TestRepository.java

@@ -8,24 +8,24 @@
 
 public class TestRepository {
 
-private static Map<String,String> centerIdCenterNameMap = new TreeMap<String,String>();
+private static Map<String,String> centerIdCenterNameMap = new TreeMap<>();
 
-private static Map<String,List<DiagnosticTest>> centerIdTestListMap = new TreeMap<String,List<DiagnosticTest>>();
+private static Map<String,List<DiagnosticTest>> centerIdTestListMap = new TreeMap<>();
  static int randomTestId=100;
 
 
 
 public TestRepository() {
 
-makeCenterIdCenterNameMap();
+makeCenterIdCenterNameMap(); //Constructor calling functions to populate the repository...
 makeCenterIdTestListMap();
 
 }
 
 public void makeCenterIdCenterNameMap() {
 centerIdCenterNameMap.put("1001","AIMS");
 centerIdCenterNameMap.put("1002","MAX");
-centerIdCenterNameMap.put("1003","APOLO");
+centerIdCenterNameMap.put("1003","APOLO");// Center name and center id...
 centerIdCenterNameMap.put("1004","FORTIS");
 centerIdCenterNameMap.put("1005","TRAUMA CENTER");
 
@@ -41,7 +41,7 @@ public void makeCenterIdTestListMap() {
 populateListOfTests(listOfTests2);
 centerIdTestListMap.put("1002",listOfTests2);
 
-List<DiagnosticTest> listOfTests3 = new ArrayList<>();
+List<DiagnosticTest> listOfTests3 = new ArrayList<>();// Center name and corresponding list of tests...
 populateListOfTests(listOfTests3);
 centerIdTestListMap.put("1003",listOfTests3);
 
@@ -60,7 +60,7 @@ public List<DiagnosticTest> populateListOfTests(List<DiagnosticTest> temp){
 DiagnosticTest t1 = new DiagnosticTest(getTestId(),"blood group");
 DiagnosticTest t2 = new DiagnosticTest(getTestId(),"blood sugar");
 DiagnosticTest t3 = new DiagnosticTest(getTestId(),"blood pressure");
-temp.add(t1);
+temp.add(t1);// Generating list of test for every center...
 temp.add(t2);
 temp.add(t3);
 return temp;
@@ -69,15 +69,11 @@ public List<DiagnosticTest> populateListOfTests(List<DiagnosticTest> temp){
 }
 
 
-
-//	public static Map<String, String> getCenterIdCenterNameMap() {
-//	return centerIdCenterNameMap;
-//	}
 
 
 
 public static Map<String, List<DiagnosticTest>> getCenterIdTestListMap() {
-return centerIdTestListMap;
+return centerIdTestListMap;
 }
 
 

Vishal Mawani/Sprint 1/HealthCareSystem/src/test/java/com/capgemini/healthcaresystem/daotest/TestDaoTest.java

@@ -3,28 +3,32 @@
 
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
 import com.capgemini.healthcaresystem.dao.TestDao;
 import com.capgemini.healthcaresystem.dto.DiagnosticTest;
-import com.capgemini.healthcaresystem.service.TestService;
+import com.capgemini.healthcaresystem.exception.NullCenterId;
+import com.capgemini.healthcaresystem.util.TestRepository;
 
 public class TestDaoTest {
 
 @Test
-public void checkAddTestDao(){
+public void checkAddTestDao() throws NullCenterId{
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("112","cancer");
 TestDao daoObject = new TestDao();
 assertEquals("added successfully" ,daoObject.addTestDao("1001", obj));
 
 }
-
+
 @Test
 public void checkRemoveTestDao() {
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("102","blood sugar");
 TestDao daoObject = new TestDao();
 assertEquals("removed successfully" ,daoObject.removeTestDao("1002",obj));
 }
 
+
+
 }

Vishal Mawani/Sprint 1/HealthCareSystem/src/test/java/com/capgemini/healthcaresystem/servicetest/TestServiceTest.java

@@ -4,6 +4,7 @@
 import com.capgemini.healthcaresystem.exception.NullCenterId;
 import com.capgemini.healthcaresystem.exception.NullTestValue;
 import com.capgemini.healthcaresystem.service.TestService;
+import com.capgemini.healthcaresystem.util.TestRepository;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -14,6 +15,7 @@ public class TestServiceTest {
 
 @Test
 void checkAddTestService() throws NullCenterId, NullTestValue {
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("110","malaria");
 TestService serviceObject = new TestService();
 Throwable exception = assertThrows(Exception.class, ()->{serviceObject.addTestService("",obj);});
@@ -22,6 +24,7 @@ void checkAddTestService() throws NullCenterId, NullTestValue {
 
 @Test
 void checkAddTestService1() throws NullTestValue, NullCenterId{
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = null;
 TestService serviceObject = new TestService();
 Throwable exception = assertThrows(Exception.class, ()->{serviceObject.addTestService("1001",obj);});
@@ -30,14 +33,16 @@ void checkAddTestService1() throws NullTestValue, NullCenterId{
 
 @Test
 void checkAddTestService2() throws NullTestValue, NullCenterId{
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("110","malaria");
 TestService serviceObject = new TestService();
-assertEquals("abc", serviceObject.addTestService("1001",obj));
+assertEquals("added successfully", serviceObject.addTestService("1001",obj));
 }
 
 
 @Test
 public void checkRemoveTestService() throws NullTestValue, NullCenterId {
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("102","blood sugar");
 TestService serviceObject = new TestService();
 Throwable exception = assertThrows(Exception.class, ()->{serviceObject.removeTestService("",obj);});
@@ -47,6 +52,7 @@ public void checkRemoveTestService() throws NullTestValue, NullCenterId {
 @Test
 
 public void checkRemoveTestService1() throws NullTestValue, NullCenterId {
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = null;
 TestService serviceObject = new TestService();
 Throwable exception = assertThrows(Exception.class, ()->{serviceObject.removeTestService("1001",obj);});
@@ -56,6 +62,7 @@ public void checkRemoveTestService1() throws NullTestValue, NullCenterId {
 
 @Test
 public void checkRemoveTestService2() throws NullTestValue, NullCenterId {
+TestRepository repoObject = new TestRepository();
 DiagnosticTest obj = new DiagnosticTest("102","blood sugar");
 TestService serviceObject = new TestService();
 assertEquals("called testDao remove",serviceObject.removeTestService("1001", obj));
@@ -64,6 +71,7 @@ public void checkRemoveTestService2() throws NullTestValue, NullCenterId {
 
 @Test
 public void checkGetTestIdService() {
+TestRepository repoObject = new TestRepository();
 TestService serviceObject = new TestService();
 String str = serviceObject.getTestIdService();
 assertEquals(Integer.toString((Integer.parseInt(str)+1)),serviceObject.getTestIdService());