Sprint1->Testing completed for add test functionality

 Add test functionality also completed.

Author: vishalmawani

Vishal Mawani/Sprint 1/HealthCareSystem/pom.xml

@@ -21,6 +21,20 @@
  <version>5.6.0</version>
  <scope>test</scope>
 </dependency>
+<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.6.0</version>
+ <scope>test</scope>
+</dependency>
+<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
+<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.6.0</version>
+ <scope>test</scope>
+</dependency>
+
 
 </dependencies>
 </project>

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

@@ -3,50 +3,53 @@
 
 
 import com.capgemini.healthcaresystem.dto.Test;
-
+import com.capgemini.healthcaresystem.ui.Ui;
 import com.capgemini.healthcaresystem.util.TestRepository;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
 import java.util.Map.Entry;
 
 public class TestDao {
 
-TestRepository testRepositoryObject = new TestRepository();
-
+
 
-public String addTestDao(Test test) {
+public String addTestDao(String cId,Test test) {
 
-/* for (Entry<String, List<Test>> entry : centerIdTestListMap.entrySet()) {
+ for (Entry<String, List<Test>> entry : TestRepository.getCenterIdTestListMap().entrySet()) {
  String key = entry.getKey();
- List<Test> values = entry.getValue();
- System.out.println("Key = " + key);
- System.out.println("Values = " + values.add(obj));
- System.out.println("Values = " + values.get(3).getTestName());
- }*/
-//System.out.println(testRepositoryObject.getCenterIdTestListMap().computeIfPresent(userEnteredCenterIdDao(),(k,v)->v.add(test)));
-return null;
+ System.out.println(key);
+ if(key.equals(cId)) {
+ List<Test> values = entry.getValue();
+ values.add(test);
+ TestRepository.getCenterIdTestListMap().put(key, values);
+ 
+ }
+ 
+ }
+ System.out.println(TestRepository.getCenterIdTestListMap());
+
+return "added successfully";
 }
 
 
 
-
-
-
-
 public boolean removeTestDao(Test test) {
 
-
+
 
 return true;
 }
-
-
-
-public String userEnteredCenterIdDao(String cId) {
-return cId;
-}
 
 
+
+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/exception/NullCenterId.java

@@ -0,0 +1,8 @@
+package com.capgemini.healthcaresystem.exception;
+
+public class NullCenterId extends Exception{
+
+public NullCenterId(String message) {
+super(message);
+}
+}

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

@@ -1,19 +1,29 @@
 package com.capgemini.healthcaresystem.service;
 
+import java.util.Map;
+
 import com.capgemini.healthcaresystem.dao.TestDao;
 import com.capgemini.healthcaresystem.dto.Test;
+import com.capgemini.healthcaresystem.exception.NullCenterId;
 import com.capgemini.healthcaresystem.exception.NullTestValue;
 
 public class TestService {
-public TestDao testDaoObject;
 
+ TestDao testDaoObject = new TestDao();
 
-public String addTestService(Test test) throws NullTestValue {
+public TestService() {
+
+}
+
+public String addTestService(String cId,Test test) throws NullTestValue, NullCenterId {
+if(cId.isEmpty()) {
+throw new NullCenterId("Center Id passed is null");
+}
 if(test == null) {
 throw new NullTestValue("Test object passed is null");
 }
-testDaoObject.addTestDao(test);
-return null;
+testDaoObject.addTestDao(cId,test);
+return "abc";
 }
 
 
@@ -27,7 +37,12 @@ public boolean removeTestService(Test test) throws NullTestValue {
 }
 
 
-public String userEnteredCenterIdService(String cId) {
-return cId;
+public Map<String,String> getCenterIdCenterNameMapService() {
+return testDaoObject.getCenterIdCenterNameMapDao();
 }
+
+public String getTestIdService() {
+return testDaoObject.getTestIdDao();
+}
+
 }

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

@@ -1,5 +1,87 @@
 package com.capgemini.healthcaresystem.ui;
 
+import java.util.Scanner;
+
+import com.capgemini.healthcaresystem.dao.TestDao;
+import com.capgemini.healthcaresystem.dto.Test;
+import com.capgemini.healthcaresystem.exception.NullCenterId;
+import com.capgemini.healthcaresystem.exception.NullTestValue;
+import com.capgemini.healthcaresystem.service.TestService;
+import com.capgemini.healthcaresystem.util.TestRepository;
+
 public class Ui {
 
+TestService testServiceObject = new TestService();
+
+TestRepository testRepositoryObject = new TestRepository();
+Scanner sc = new Scanner(System.in);
+
+
+public static void main(String arg[]){
+Ui uiObject = new Ui();
+uiObject.execute();
+}
+
+
+
+public void execute(){
+
+System.out.println("Choose one option:");
+System.out.println("1. Add a test 2.Remove a test");
+
+
+
+try {switch(getChoice()) {
+
+case 1:
+System.out.println(testServiceObject.getCenterIdCenterNameMapService());
+Test temp = new Test(getTestId(),getTestName());
+String cid = getCenterId();
+testServiceObject.addTestService(cid,temp);
+
+
+break;
+
+case 2:
+
+break;
+
+default:
+System.out.println("Choice entered is not correct");
+break;
+
+}
+}
+
+catch(NullTestValue e) {
+System.out.println(e.getMessage());
+}
+catch(NullCenterId e) {
+System.out.println(e.getMessage());
+}
+}
+
+
+public int getChoice() {
+int choice = sc.nextInt();
+return choice;
+}
+
+public String getCenterId() {
+System.out.println("Enter Center Id:");
+
+String userInputCenterId = sc.nextLine();
+return userInputCenterId;
+}
+
+public String getTestId() {
+return testServiceObject.getTestIdService();
+}
+public String getTestName() {
+System.out.println("Enter test name:");
+sc.nextLine();
+String userInputTestName = sc.nextLine();
+return userInputTestName;
+}
+
 }

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

@@ -18,6 +18,13 @@ public class TestRepository {
 
 
 
+public TestRepository() {
+
+makeCenterIdCenterNameMap();
+makeCenterIdTestListMap();
+
+}
+
 public void makeCenterIdCenterNameMap() {
 centerIdCenterNameMap.put("1001","AIMS");
 centerIdCenterNameMap.put("1002","MAX");
@@ -27,7 +34,7 @@ public void makeCenterIdCenterNameMap() {
 
 }
 
-public void makeTestList() {
+public void makeCenterIdTestListMap() {
 
 List<Test> listOfTests1 = new ArrayList<Test>();
 populateListOfTests(listOfTests1);
@@ -65,31 +72,23 @@ public List<Test> populateListOfTests(List<Test> temp){
 }
 
 
+
 public static Map<String, String> getCenterIdCenterNameMap() {
 return centerIdCenterNameMap;
 }
 
-public static void setCenterIdCenterNameMap(Map<String, String> centerIdCenterNameMap) {
-TestRepository.centerIdCenterNameMap = centerIdCenterNameMap;
-}
+
 
-public static Map<String, List<Test>> getCenterIdTestListMap() {
+public static Map<String, List<Test>> getCenterIdTestListMap() {
 return centerIdTestListMap;
 }
 
-public static void setCenterIdTestListMap(Map<String, List<Test>> centerIdTestListMap) {
-TestRepository.centerIdTestListMap = centerIdTestListMap;
-}
 
 
-/*public Map<String,List<Test>> getListOfCenterIdTests(){
-return centerIdTestListMap;	// To return the list of tests.
-}*/
 
 
 
-
-public String getTestId() {
+public static String getTestId() {
 //Method or function to generate testId automatically...
 Test testObject = new Test();
 return testObject.generateTestId();
@@ -98,39 +97,23 @@ public String getTestId() {
 
 
 
-public static void main(String arg[]) {
+/*public static void main(String arg[]) {
 Test obj = new Test("110","abc");
 TestRepository object = new TestRepository();
-object.makeCenterIdCenterNameMap();
-object.makeTestList();
-System.out.println(centerIdCenterNameMap);
-//	System.out.println(centerIdTestListMap);
- /*for (Entry<String, List<Test>> entry : centerIdTestListMap.entrySet()) {
+
+
+System.out.println(centerIdTestListMap);
+ for (Entry<String, List<Test>> entry : centerIdTestListMap.entrySet()) {
  String key = entry.getKey();
  List<Test> values = entry.getValue();
  System.out.println("Key = " + key);
  System.out.println("Values = " + values.add(obj));
  System.out.println("Values = " + values.get(3).getTestName());
- }*/
+ }
 
 
-}
+}*/
 
 }
 
-
-
-
-/*Test t8 = new Test(getTestId(),"CT-scan");
-Test t9 = new Test(getTestId(),"Eye Test");
-Test t10= new Test(getTestId(),"DNA test");
-Test t11= new Test(getTestId(),"MRI Scan");
-Test t12 = new Test(getTestId(),"Full Body Checkup");
-Test t13= new Test(getTestId(),"Liver Function Test");
-listOfTests.add(t8);
-listOfTests.add(t9);
-listOfTests.add(t10);
-listOfTests.add(t11);
-listOfTests.add(t12);
-listOfTests.add(t13);*/
 

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

@@ -1,5 +1,16 @@
 package com.capgemini.healthcaresystem.daotest;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.capgemini.healthcaresystem.dao.TestDao;
+import com.capgemini.healthcaresystem.dto.Test;
+
 public class TestDaoTest {
 
+void checkAddTestDao() {
+Test obj = new Test("112","cancer");
+TestDao daoObject = new TestDao();
+assertEquals("added successfully" ,daoObject.addTestDao("1001", obj));
+
+}
 }

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

@@ -1,5 +1,15 @@
 package com.capgemini.healthcaresystem.servicetest;
 
+import com.capgemini.healthcaresystem.exception.NullCenterId;
+import com.capgemini.healthcaresystem.exception.NullTestValue;
+import com.capgemini.healthcaresystem.service.TestService;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
 public class TestServiceTest {
 
+void checkAddTestService() throws NullTestValue, NullCenterId {
+TestService serviceObject = new TestService();
+assertEquals("null null", serviceObject.addTestService(null, null));
+}
 }

Vishal Mawani/Sprint 1/HealthCareSystem/target/classes/META-INF/maven/com.capgemini/HealthCareSystem/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Feb 17 22:32:51 IST 2020
+#Tue Feb 18 13:05:55 IST 2020
 version=0.0.1-SNAPSHOT
 groupId=com.capgemini
 m2e.projectName=HealthCareSystem