Skip to content

Commit ca0ec47

Browse files
atishbeehyv123atishbeehyv123
committed
Fixed PIT named testForSubscriberAbsent for MCTS And RCH Beneficiary.
1 parent eb27e9b commit ca0ec47

File tree

5 files changed

+44
-30
lines changed

5 files changed

+44
-30
lines changed

‎testing/src/test/java/org/motechproject/nms/testing/it/helperUtils/HelperUtils.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package org.motechproject.nms.testing.it.helperUtils;
2+
3+
import org.motechproject.mds.query.SqlQueryExecution;
4+
import org.motechproject.nms.kilkari.domain.MctsMother;
5+
import org.motechproject.nms.kilkari.repository.MctsMotherDataService;
6+
7+
import javax.jdo.Query;
8+
import java.util.List;
9+
10+
public class HelperUtils {
11+
12+
13+
public static List<MctsMother> retrieveAllMothers(MctsMotherDataService mctsMotherDataService){
14+
15+
SqlQueryExecution<List<MctsMother>> queryExecution = new SqlQueryExecution<List<MctsMother>>() {
16+
17+
@Override
18+
public String getSqlQuery() {
19+
return "Select * FROM nms_mcts_mothers";
20+
}
21+
22+
@Override
23+
public List<MctsMother> execute(Query query) {
24+
query.setClass(MctsMother.class);
25+
return (List<MctsMother>) query.execute();
26+
}
27+
};
28+
return mctsMotherDataService.executeSQLQuery(queryExecution);
29+
}
30+
}

‎testing/src/test/java/org/motechproject/nms/testing/it/kilkari/MctsBeneficiaryImportServiceBundleIT.java‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,24 @@
1414
import org.junit.Ignore;
1515
import org.junit.Test;
1616
import org.junit.runner.RunWith;
17-
import org.motechproject.nms.csv.domain.CsvAuditRecord;
1817
import org.motechproject.nms.csv.repository.CsvAuditRecordDataService;
1918
import org.motechproject.nms.kilkari.domain.*;
2019
import org.motechproject.nms.kilkari.repository.*;
2120
import org.motechproject.nms.kilkari.service.MctsBeneficiaryImportReaderService;
2221
import org.motechproject.nms.kilkari.service.SubscriberService;
2322
import org.motechproject.nms.kilkari.service.SubscriptionService;
24-
import org.motechproject.nms.region.domain.Circle;
25-
import org.motechproject.nms.region.domain.District;
26-
import org.motechproject.nms.region.domain.HealthBlock;
27-
import org.motechproject.nms.region.domain.HealthFacility;
28-
import org.motechproject.nms.region.domain.HealthFacilityType;
29-
import org.motechproject.nms.region.domain.HealthSubFacility;
30-
import org.motechproject.nms.region.domain.State;
31-
import org.motechproject.nms.region.domain.Taluka;
32-
import org.motechproject.nms.region.domain.Village;
23+
import org.motechproject.nms.region.domain.*;
3324
import org.motechproject.nms.region.repository.CircleDataService;
3425
import org.motechproject.nms.region.repository.DistrictDataService;
3526
import org.motechproject.nms.region.repository.LanguageDataService;
3627
import org.motechproject.nms.region.repository.StateDataService;
37-
import org.motechproject.nms.region.service.DistrictService;
38-
import org.motechproject.nms.region.service.HealthBlockService;
39-
import org.motechproject.nms.region.service.HealthFacilityService;
40-
import org.motechproject.nms.region.service.HealthSubFacilityService;
41-
import org.motechproject.nms.region.service.LanguageService;
42-
import org.motechproject.nms.region.service.TalukaService;
43-
import org.motechproject.nms.region.service.VillageService;
28+
import org.motechproject.nms.region.service.*;
4429
import org.motechproject.nms.rejectionhandler.domain.ChildImportRejection;
4530
import org.motechproject.nms.rejectionhandler.domain.MotherImportRejection;
4631
import org.motechproject.nms.rejectionhandler.repository.ChildRejectionDataService;
4732
import org.motechproject.nms.rejectionhandler.repository.MotherRejectionDataService;
4833
import org.motechproject.nms.testing.it.api.utils.RequestBuilder;
34+
import org.motechproject.nms.testing.it.helperUtils.HelperUtils;
4935
import org.motechproject.nms.testing.it.utils.RegionHelper;
5036
import org.motechproject.nms.testing.it.utils.SubscriptionHelper;
5137
import org.motechproject.nms.testing.service.TestingService;
@@ -73,14 +59,7 @@
7359
import java.util.Set;
7460

7561
import static org.junit.Assert.*;
76-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createDistrict;
77-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createHealthBlock;
78-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createHealthFacility;
79-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createHealthFacilityType;
80-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createHealthSubFacility;
81-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createState;
82-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createTaluka;
83-
import static org.motechproject.nms.testing.it.utils.RegionHelper.createVillage;
62+
import static org.motechproject.nms.testing.it.utils.RegionHelper.*;
8463

8564
@RunWith(PaxExam.class)
8665
@ExamReactorStrategy(PerSuite.class)
@@ -1642,7 +1621,7 @@ public void testForSubscriberAbsent() throws Exception {
16421621
status = transactionManager.getTransaction(new DefaultTransactionDefinition());
16431622
subscriber = subscriberService.getSubscriber(9439986187L);
16441623
assertTrue(subscriber.isEmpty());
1645-
List<MctsMother> mothers = mctsMotherDataService.retrieveAll();
1624+
List<MctsMother> mothers = HelperUtils.retrieveAllMothers(mctsMotherDataService);
16461625
assertEquals(1,mothers.size());
16471626

16481627
transactionManager.commit(status);
@@ -1665,6 +1644,8 @@ public void testForSubscriberAbsent() throws Exception {
16651644
transactionManager.commit(status);
16661645
}
16671646

1647+
1648+
16681649
/* Test SubscriberMsisdnTracker in Mother Import
16691650
* Ignored due to NullPointerException
16701651
*/

‎testing/src/test/java/org/motechproject/nms/testing/it/kilkari/RchBeneficiaryImportServiceBundleIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.motechproject.nms.rejectionhandler.domain.MotherImportRejection;
5858
import org.motechproject.nms.rejectionhandler.repository.ChildRejectionDataService;
5959
import org.motechproject.nms.rejectionhandler.repository.MotherRejectionDataService;
60+
import org.motechproject.nms.testing.it.helperUtils.HelperUtils;
6061
import org.motechproject.nms.testing.it.utils.RegionHelper;
6162
import org.motechproject.nms.testing.it.utils.SubscriptionHelper;
6263
import org.motechproject.nms.testing.service.TestingService;
@@ -846,7 +847,7 @@ public void testForSubscriberAbsent() throws Exception {
846847
status = transactionManager.getTransaction(new DefaultTransactionDefinition());
847848
subscriber = subscriberService.getSubscriber(9439986187L);
848849
assertTrue(subscriber.isEmpty());
849-
List<MctsMother> mothers = mctsMotherDataService.retrieveAll();
850+
List<MctsMother> mothers = HelperUtils.retrieveAllMothers(mctsMotherDataService);
850851
Assert.assertEquals(1, mothers.size());
851852
transactionManager.commit(status);
852853

‎testing/src/test/java/org/motechproject/nms/testing/it/mcts/MctsImportBundleIT.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.motechproject.nms.rejectionhandler.repository.ChildRejectionDataService;
3535
import org.motechproject.nms.rejectionhandler.repository.FlwImportRejectionDataService;
3636
import org.motechproject.nms.rejectionhandler.repository.MotherRejectionDataService;
37+
import org.motechproject.nms.testing.it.helperUtils.HelperUtils;
3738
import org.motechproject.nms.testing.it.mcts.util.*;
3839
import org.motechproject.nms.testing.service.TestingService;
3940
import org.motechproject.testing.osgi.BasePaxIT;
@@ -488,7 +489,7 @@ public void shouldPerformImportWithUpdatesAndDeleteInFailedTable() throws Malfor
488489
assertEquals(1, children.size());
489490
assertEquals("Name 3", children.get(0).getName());
490491

491-
List<MctsMother> mothers = mctsMotherDataService.retrieveAll();
492+
List<MctsMother> mothers = HelperUtils.retrieveAllMothers(mctsMotherDataService);
492493
assertEquals(2, mothers.size()); // 2 records from mother import and 2 from child
493494
assertEquals("Name 3", mothers.get(0).getName());
494495
} finally {
@@ -618,7 +619,7 @@ public void shouldPerformImportWithUpdatesAndDeleteInFailedTableOneUpdateDate()
618619
assertEquals(1, children.size());
619620
assertEquals("Name y", children.get(0).getName());
620621

621-
List<MctsMother> mothers = mctsMotherDataService.retrieveAll();
622+
List<MctsMother> mothers = HelperUtils.retrieveAllMothers(mctsMotherDataService);
622623
assertEquals(2, mothers.size()); // 1 record from mother import and 1 from child
623624
assertEquals("Name x", mothers.get(0).getName());
624625

‎testing/src/test/java/org/motechproject/nms/testing/it/rch/RchWebServiceFacadeBundleIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.motechproject.nms.rejectionhandler.repository.ChildRejectionDataService;
2525
import org.motechproject.nms.rejectionhandler.repository.FlwImportRejectionDataService;
2626
import org.motechproject.nms.rejectionhandler.repository.MotherRejectionDataService;
27+
import org.motechproject.nms.testing.it.helperUtils.HelperUtils;
2728
import org.motechproject.nms.testing.it.rch.util.*;
2829
import org.motechproject.nms.testing.service.TestingService;
2930
import org.motechproject.scheduler.service.MotechSchedulerService;
@@ -259,7 +260,7 @@ public void checkForZeroMother() throws IOException {
259260

260261
List<ChildImportRejection> childImportRejections = childRejectionDataService.retrieveAll();
261262
assertEquals(0, childImportRejections.size());
262-
List<MctsMother> mothers = mctsMotherDataService.retrieveAll();
263+
List<MctsMother> mothers = HelperUtils.retrieveAllMothers(mctsMotherDataService);
263264
assertEquals(0, mothers.size());
264265
}
265266

0 commit comments

Comments
 (0)