SYNCT-30: Corrected the unit test

openmrs · Dec 18, 2017 · 59d9232 · 59d9232
1 parent 68b17a1
commit 59d9232
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
                   http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
 
-    <changeSet id="sync2-2017-12-18" author="Soldevelo">
+    <changeSet id="sync2-2017-12-19" author="Soldevelo">
         <preConditions onFail="MARK_RAN">
             <not><tableExists tableName="sync_audit_message"/></not>
         </preConditions>

diff --git a/api/src/test/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImplTest.java b/api/src/test/java/org/openmrs/module/sync2/api/impl/SyncAuditServiceImplTest.java
@@ -42,6 +42,7 @@ public class SyncAuditServiceImplTest {
     private static final String AUDIT_PARENT_URL = "parentUrl";
     private static final String AUDIT_LOCAL_URL = "localUrl";
     private static final String AUDIT_LINK_TYPE = "test";
+    private static final Integer AUDIT_NEXT_MESSAGE = 1;
 
     @InjectMocks
     private SyncAuditServiceImpl auditService;
@@ -196,6 +197,7 @@ private AuditMessage prepareAuditMessage(Boolean success) throws ParseException
         newMessage.setLocalUrl(AUDIT_LOCAL_URL);
         newMessage.setUsedResourceUrl(AUDIT_USED_URL);
         newMessage.setLinkType(AUDIT_LINK_TYPE);
+        newMessage.setNextMessage(AUDIT_NEXT_MESSAGE);
         newMessage.setSuccess(success);
 
         String createDate = "2017-12-07 00:00:00";

diff --git a/api/src/test/resources/audit/sampleAuditMessage.json b/api/src/test/resources/audit/sampleAuditMessage.json
@@ -1 +1 @@
-{"id":1,"uuid":"9f3dccc9-6bc3-4a2b-862d-af4ce41caa28","success":false,"timestamp":"2017-12-07 00:00:00.000","resourceName":"test","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test"}
+{"id":1,"uuid":"9f3dccc9-6bc3-4a2b-862d-af4ce41caa28","success":false,"timestamp":"2017-12-07 00:00:00.000","resourceName":"test","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test","nextMessage":1}
diff --git a/api/src/test/resources/audit/sampleAuditMessages.json b/api/src/test/resources/audit/sampleAuditMessages.json
@@ -1 +1 @@
-{"itemsCount":2,"page":1,"pageSize":100,"data":[{"id":1,"uuid":"9f3dccc9-6bc3-4a2b-862d-af4ce41caa28","success":true,"timestamp":"2017-12-07 00:00:00.000","resourceName":"Test 1","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test"},{"id":1,"uuid":"74e75d4a-393c-4611-a903-883a0fd5fc6f","success":false,"timestamp":"2017-12-07 00:00:00.000","resourceName":"Test 2","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test"}]}
+{"itemsCount":2,"page":1,"pageSize":100,"data":[{"id":1,"uuid":"9f3dccc9-6bc3-4a2b-862d-af4ce41caa28","success":true,"timestamp":"2017-12-07 00:00:00.000","resourceName":"Test 1","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test","nextMessage":1},{"id":1,"uuid":"74e75d4a-393c-4611-a903-883a0fd5fc6f","success":false,"timestamp":"2017-12-07 00:00:00.000","resourceName":"Test 2","usedResourceUrl":"/test/test","availableResourceUrls":"{\"rest\":\"testUrl2\",\"fhir\":\"testUrl1\"}","parentUrl":"parentUrl","localUrl":"localUrl","action":"testAction","operation":"testOperation","details":"testDetails","linkType":"test","nextMessage":1}]}
diff --git a/omod/src/main/webapp/fragments/auditDetails.gsp b/omod/src/main/webapp/fragments/auditDetails.gsp
@@ -77,12 +77,12 @@
         <a class="button right" href="${ ui.pageLink(detailViewProvider, "details",
             [messageId: auditLog.nextMessage, backPage: param.backPage[0], backPageIndex: param.backPageIndex]) }">
             <i class="icon-chevron-right"></i>
-            ${ ui.message(artifactId + '.nextMessage') }
+            ${ ui.message(messagesPrefix + '.nextMessage') }
         </a>
     <% } else {  %>
         <a class="button confirm right" onClick="retry();">
             <i class="icon-retweet"></i>
-            ${ ui.message(artifactId + '.retry') }
+            ${ ui.message(messagesPrefix + '.retry') }
         </a>
     <% } %>
 <% } %>