Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Fix functional test
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Nov 21, 2013
1 parent 79365fa commit 7fbea75
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
12 changes: 12 additions & 0 deletions functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
View file
Expand Up @@ -47,6 +47,18 @@ public CreateVersionGroupPage inputGroupId(String groupId) {
return new CreateVersionGroupPage(getDriver());
}

public WebElement getInputGroupName() {
return groupNameField;
}

public WebElement getInputGroupId() {
return groupSlugField;
}

public WebElement getInputGroupDescription() {
return groupDescriptionField;
}

public CreateVersionGroupPage inputGroupName(String groupName) {
groupNameField.sendKeys(groupName);
return new CreateVersionGroupPage(getDriver());
Expand Down
18 changes: 10 additions & 8 deletions functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
View file
Expand Up @@ -69,7 +69,7 @@ public void createABasicGroup() {
.contains(groupName));
VersionGroupPage groupView = versionGroupsPage.goToGroup(groupName);
assertThat("The group is displayed", groupView.getTitle(),
Matchers.equalTo("Zanata: Groups:".concat(groupName)));
Matchers.equalTo("Groups:".concat(groupName)));
}

@Test
Expand All @@ -81,32 +81,33 @@ public void requiredFields() {
CreateVersionGroupPage groupPage =
dashboardPage.goToGroups().createNewGroup().saveGroupFailure();
assertThat("The two errors are value is required",
groupPage.getErrors(), Matchers.contains(errorMsg, errorMsg));
groupPage.getFieldValidationErrors(), Matchers.contains(errorMsg, errorMsg));

groupPage =
groupPage.clearFields().inputGroupName(groupName)
.saveGroupFailure();
assertThat("The value required error shown", groupPage.getErrors(),
assertThat("The value required error shown", groupPage.getFieldValidationErrors(),
Matchers.contains(errorMsg));

groupPage =
groupPage.clearFields().inputGroupId(groupID)
.saveGroupFailure();
assertThat("The value required error shown", groupPage.getErrors(),
assertThat("The value required error shown", groupPage.getFieldValidationErrors(),
Matchers.contains(errorMsg));
}

@Test
public void groupIDFieldSize() {
String errorMsg = "size must be between 1 and 40";
String errorMsg = "value must be shorter than or equal to 40 characters";
String groupID = "abcdefghijklmnopqrstuvwxyzabcdefghijklmno";
String groupName = "verifyIDFieldSizeName";

CreateVersionGroupPage groupPage =
dashboardPage.goToGroups().createNewGroup();
groupPage.inputGroupId(groupID).inputGroupName(groupName)
.saveGroupFailure();
assertThat("Invalid length error is shown", groupPage.getErrors(),
assertThat("Invalid length error is shown",
groupPage.getFieldValidationErrors(),
Matchers.contains(errorMsg));

groupPage.clearFields();
Expand All @@ -121,7 +122,7 @@ public void groupIDFieldSize() {

@Test
public void groupDescriptionFieldSize() {
String errorMsg = "size must be between 0 and 100";
String errorMsg = "value must be shorter than or equal to 100 characters";
String groupID = "verifyDescriptionFieldSizeID";
String groupName = "verifyDescriptionFieldSizeName";
String groupDescription =
Expand All @@ -134,7 +135,8 @@ public void groupDescriptionFieldSize() {
groupPage.inputGroupId(groupID).inputGroupName(groupName)
.inputGroupDescription(groupDescription);
groupPage.saveGroupFailure();
assertThat("Invalid length error is shown", groupPage.getErrors(),
assertThat("Invalid length error is shown",
groupPage.getFieldValidationErrors(),
Matchers.contains(errorMsg));

groupPage.clearFields();
Expand Down
10 changes: 9 additions & 1 deletion functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
View file
Expand Up @@ -49,6 +49,7 @@ DROP TABLE IF EXISTS PUBLIC.HDOCUMENTUPLOAD CASCADE;
DROP TABLE IF EXISTS PUBLIC.HDOCUMENTUPLOADPART CASCADE;
DROP TABLE IF EXISTS PUBLIC.HACCOUNTACTIVATIONKEY CASCADE;
DROP TABLE IF EXISTS PUBLIC.HRAWDOCUMENT CASCADE;
DROP TABLE IF EXISTS PUBLIC.ITERATIONGROUP_LOCALE CASCADE;
DROP TABLE IF EXISTS PUBLIC.TRANSMEMORY CASCADE;
DROP TABLE IF EXISTS PUBLIC.TRANSMEMORYUNIT CASCADE;
DROP TABLE IF EXISTS PUBLIC.TRANSMEMORYUNITVARIANT CASCADE;
Expand Down Expand Up @@ -665,7 +666,12 @@ CREATE CACHED TABLE PUBLIC.HPROJECTITERATION_LOCALE(
LOCALEID BIGINT NOT NULL
);
ALTER TABLE PUBLIC.HPROJECTITERATION_LOCALE ADD CONSTRAINT PUBLIC.CONSTRAINT_7 PRIMARY KEY(PROJECTITERATIONID, LOCALEID);
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.HPROJECTITERATION_LOCALE;
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ITERATIONGROUP_LOCALE;
CREATE CACHED TABLE PUBLIC.ITERATIONGROUP_LOCALE(
ITERATION_GROUP_ID BIGINT NOT NULL,
LOCALE_ID BIGINT NOT NULL
);
ALTER TABLE PUBLIC.ITERATIONGROUP_LOCALE ADD CONSTRAINT PUBLIC.CONSTRAINT_9 PRIMARY KEY(ITERATION_GROUP_ID, LOCALE_ID);
CREATE CACHED TABLE PUBLIC.HPROJECTITERATION_VALIDATION(
PROJECTITERATIONID BIGINT NOT NULL,
VALIDATION VARCHAR(100) NOT NULL,
Expand Down Expand Up @@ -1068,6 +1074,8 @@ ALTER TABLE PUBLIC.HACCOUNTACTIVATIONKEY ADD CONSTRAINT PUBLIC.FK86E79CA4FA68C45
ALTER TABLE PUBLIC.HGLOSSARYENTRY ADD CONSTRAINT PUBLIC.UKGLOSSARYENTRY_SRCLOCALEID FOREIGN KEY(SRCLOCALEID) REFERENCES PUBLIC.HLOCALE(ID) NOCHECK;
ALTER TABLE PUBLIC.HPROJECTITERATION_LOCALE ADD CONSTRAINT PUBLIC.FKHPROJECTITELOCLOC FOREIGN KEY(LOCALEID) REFERENCES PUBLIC.HLOCALE(ID) NOCHECK;
ALTER TABLE PUBLIC.HPROJECTITERATION_LOCALE ADD CONSTRAINT PUBLIC.FKHPROJECTITELOCPRO FOREIGN KEY(PROJECTITERATIONID) REFERENCES PUBLIC.HPROJECTITERATION(ID) NOCHECK;
ALTER TABLE PUBLIC.ITERATIONGROUP_LOCALE ADD CONSTRAINT PUBLIC.FKITERATIONGROUPLOCLOC FOREIGN KEY(LOCALE_ID) REFERENCES PUBLIC.HLOCALE(ID) NOCHECK;
ALTER TABLE PUBLIC.ITERATIONGROUP_LOCALE ADD CONSTRAINT PUBLIC.FKITERATIONGROUPLOCITERATION FOREIGN KEY(ITERATION_GROUP_ID) REFERENCES PUBLIC.HITERATIONGROUP(ID) NOCHECK;
ALTER TABLE PUBLIC.HACCOUNTROLEGROUP ADD CONSTRAINT PUBLIC.FK3321CC642DF53D7E FOREIGN KEY(ROLEID) REFERENCES PUBLIC.HACCOUNTROLE(ID) NOCHECK;
ALTER TABLE PUBLIC.HACCOUNTRESETPASSWORDKEY ADD CONSTRAINT PUBLIC.FK85C9EFDAFA68C45F FOREIGN KEY(ACCOUNTID) REFERENCES PUBLIC.HACCOUNT(ID) NOCHECK;
ALTER TABLE PUBLIC.HPERSONEMAILVALIDATIONKEY ADD CONSTRAINT PUBLIC.FK_HPERSONEMAILVALIDATIONKEY_HPERSON FOREIGN KEY(PERSONID) REFERENCES PUBLIC.HPERSON(ID) NOCHECK;
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
View file
Expand Up @@ -70,7 +70,7 @@ public class ApplicationConfiguration implements Serializable {
public static final String EVENT_CONFIGURATION_CHANGED =
"zanata.configuration.changed";

private static final String STYLESHEET_LOCAL_PATH = "/assets/css/style.css";
private static final String STYLESHEET_LOCAL_PATH = "/assets/css/style.min.css";

@In
private DatabaseBackedConfig databaseBackedConfig;
Expand Down

0 comments on commit 7fbea75

Please sign in to comment.