Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 145fd1cb authored by Mihai BOZ's avatar Mihai BOZ
Browse files

fix PR comments


Signed-off-by: default avatarbozmiha <Mihai.BOZ@ext.ec.europa.eu>
parent 7e387688
No related branches found
No related tags found
No related merge requests found
......@@ -169,11 +169,11 @@ public class SmallGrid extends DComponent {
LOG.debug("[{}] found on page [{}]", value, pageNr);
isElementPresent = true;
currentCell.click();
break;
return;
}
}
if (isElementPresent) {
break;
return;
}
getGridPagination().goToNextPage();
}
......
......@@ -30,11 +30,12 @@ public class EditResourceDocumentPage extends DomiSMPPage {
private WebElement documentMimeTypeLbl;
@FindBy(css = "smp-titled-label[title=\"Current document version:\"] div.smp-tl-value")
private WebElement currentDocumentVersionLbl;
@FindBy(id = "saveResource_id")
private WebElement saveBtn;
@FindBy(id = "cancel_id")
private WebElement cancelBtn;
@FindBy(id = "document version_id")
private WebElement versionDdl;
@FindBy(css = "ngx-codemirror[formcontrolname= \"payload\"] div textarea")
private WebElement codeEditorSendValueElement;
......@@ -64,22 +65,17 @@ public class EditResourceDocumentPage extends DomiSMPPage {
return formatedDoc;
}
public void clickOnGenerate() {
weToDButton(generateBtn).click();
}
public void clickOnSave() {
weToDButton(saveBtn).click();
}
public void clickOnValidate() {
weToDButton(validateBtn).click();
}
public void selectDocumentVersion(int version) {
weToDSelect(versionDdl).selectValue(String.valueOf(version));
}
}
......@@ -14,11 +14,6 @@ import utils.TestRunData;
* Rest client for group actions
*/
public class ResourceClient extends BaseRestClient {
public ResourceClient() {
super();
}
public ResourceModel createResourceForGroup(DomainModel domainModel, GroupModel groupModel, ResourceModel resourceModelToBeCreated) {
JSONObject resourceJson = new JSONObject(resourceModelToBeCreated);
String createResourcePath = RestServicePaths.getCreateResourcePath(TestRunData.getInstance().getUserId(), domainModel.getDomainId(), groupModel.getGroupId());
......
......@@ -20,11 +20,12 @@ public class XMLUtils {
protected final Logger log = LoggerFactory.getLogger(this.getClass());
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document doc;
public XMLUtils(String xmlStr) throws ParserConfigurationException {
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
try {
doc = dBuilder.parse(new InputSource(new StringReader(xmlStr)));
} catch (Exception e) {
......
......@@ -5,6 +5,7 @@ import ddsl.enums.Pages;
import ddsl.enums.ResourceTypes;
import domiSMPTests.SeleniumTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Ignore;
import org.testng.annotations.Test;
import org.testng.asserts.SoftAssert;
import pages.LoginPage;
......@@ -14,6 +15,7 @@ import rest.models.*;
import utils.TestRunData;
import utils.XMLUtils;
import javax.xml.parsers.ParserConfigurationException;
import java.util.Arrays;
import java.util.List;
......@@ -193,8 +195,17 @@ public class EditResourcePgTests extends SeleniumTest {
soft.assertAll();
}
@Ignore //TODO: continue test with select version
@Test(description = "EDTRES-04 Resource admins are able to add generated document", priority = 1)
public void resourceAdminsAreAbleToAddGeneratedDocument2() throws Exception {
public void resourceAdminsAreAbleToAddGeneratedDocument2() throws ParserConfigurationException {
editResourcePage.goToTab("Resource details");
EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
editResourceDocumentPage.getAlertArea().closeAlert();
XMLUtils document1 = new XMLUtils(editResourceDocumentPage.getDocumentValue());
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment