SORMAS-Foundation#3967 - changes for Save button on Modal window on Samples

Author: raghupola-vg

sormas-e2e-ui-tests/Object Repository/Samples/MainView/edit_sample_from_table.rs

@@ -7,7 +7,11 @@
    <selectorCollection>
       <entry>
          <key>XPATH</key>
-         <value>//div[@id='sormasui-1655777373']/div/div[2]/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div[3]/div/div[3]/table/tbody/tr/td/span</value>
+         <value>//div[@id='sormasui-1655777373']/div/div[2]/div/div[2]/div/div/div/div[2]/div/div/div/div/div/div[3]/div/div[3]/table/tbody/tr/td</value>
+      </entry>
+      <entry>
+         <key>BASIC</key>
+         <value>//*[(text() = '' or . = '')]</value>
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>

sormas-e2e-ui-tests/Scripts/Samples/CreateNewTestResult/Script1586936959595.groovy

@@ -1,10 +1,8 @@
 import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
 import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
-
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-
-import com.kms.katalon.core.exception.StepFailedException
+import java.text.DateFormat as DateFormat
+import java.text.SimpleDateFormat as SimpleDateFormat
+import com.kms.katalon.core.exception.StepFailedException as StepFailedException
 import com.kms.katalon.core.model.FailureHandling as FailureHandling
 import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
 
@@ -25,34 +23,47 @@ WebUI.click(findTestObject('Object Repository/Samples/NewTestResult/div_Tested d
 WebUI.click(findTestObject('Object Repository/Samples/NewTestResult/td_COVID-19'))
 
 Date now = new Date()
+
 String resultDate = now.format('MM/dd/yyyy')
+
 String resultTime = now.format('HH:mm')
-println('Setting date-time of result to: date=' + resultDate + ' time=' + resultTime)
-WebUI.setText(findTestObject('Samples/NewTestResult/input_Date'), 
-    resultDate)
 
-WebUI.setText(findTestObject('Object Repository/Samples/NewTestResult/input_Time'),
-	resultTime)
+println((('Setting date-time of result to: date=' + resultDate) + ' time=') + resultTime)
+
+WebUI.setText(findTestObject('Samples/NewTestResult/input_Date'), resultDate)
+
+WebUI.setText(findTestObject('Object Repository/Samples/NewTestResult/input_Time'), resultTime)
 
 WebUI.click(findTestObject('Object Repository/Samples/NewTestResult/div_Test result_v-filterselect-button'))
 
 WebUI.click(findTestObject('Object Repository/Samples/NewTestResult/td_Pending'))
 
 WebUI.click(findTestObject('Object Repository/Samples/NewTestResult/label_No'))
-WebUI.click(findTestObject('ReusableORs/div_Save'))
+
+WebUI.click(findTestObject('ReusableORs/div_Save_modalWindow'))
 
 WebUI.delay(1)
 
 String dateToCheck = WebUI.getText(findTestObject('Samples/SampleInformation/last_testResultDateTime'))
+
 DateFormat f1 = new SimpleDateFormat('MM/dd/yyyy h:mm a')
+
 Date d = f1.parse(dateToCheck)
+
 DateFormat f2 = new SimpleDateFormat('MM/dd/yyyy HH:mm')
+
 String displayedDate = f2.format(d)
+
 println(displayedDate)
-String expectedDateTime = resultDate + ' ' +resultTime
-if (!displayedDate.equals(expectedDateTime)) {
-	WebUI.closeBrowser()
- 	throw new StepFailedException('Expected to find in the first testresult the another date-time string. expected: ' + expectedDateTime + ' found: ' + dateToCheck)
+
+String expectedDateTime = (resultDate + ' ') + resultTime
+
+if (!(displayedDate.equals(expectedDateTime))) {
+    WebUI.closeBrowser()
+
+    throw new StepFailedException((('Expected to find in the first testresult the another date-time string. expected: ' + 
+    expectedDateTime) + ' found: ') + dateToCheck)
 }
 
 WebUI.closeBrowser()
+