diff --git a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java index 30042ce8b5..097fabd998 100644 --- a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java +++ b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java @@ -58,6 +58,8 @@ public enum Validations { // first %d is row index, second %d is plural form index (i.e. 0-6) private static final String TARGET_ID_FMT = "gwt-debug-%d-target-%d"; + private static final String EDITOR_SYNTAXHIGHLIGHT = + "gwt-debug-syntax-highlight-chk-input"; // buttons id format private static final String APPROVE_BUTTON_ID_FMT = "gwt-debug-target-%d-save-approve"; @@ -106,7 +108,8 @@ public List> getGlossaryResultTable() { new Function>>() { @Override public List> apply(WebDriver input) { - if (input.findElements(glossaryNoResultBy).size() == 1) { + if (input.findElements(glossaryNoResultBy).size() == + 1) { return Collections.emptyList(); } List> resultTable = @@ -148,7 +151,8 @@ public String getMessageSourceAtRowIndex(int rowIndex, Plurals plural) { */ public String getMessageTargetAtRowIndex(final int rowIndex) { log.info("Query text flow target at {}", rowIndex); - return getCodeMirrorContent(rowIndex, TARGET_ID_FMT, Plurals.TargetSingular); + return getCodeMirrorContent(rowIndex, TARGET_ID_FMT, + Plurals.TargetSingular); } private String getCodeMirrorContent(final long rowIndex, @@ -173,8 +177,8 @@ public EditorPage setSyntaxHighlighting(boolean option) { WebElement highlight = waitForAMoment().until(new Function() { @Override public WebElement apply(WebDriver input) { - WebElement element = getDriver() - .findElement(By.id("gwt-uid-143")); + WebElement element = + getDriver().findElement(By.id(EDITOR_SYNTAXHIGHLIGHT)); if (element.isDisplayed()) { return element; } @@ -207,7 +211,6 @@ public Boolean apply(WebDriver input) { .isDisplayed(); } }); - } /** diff --git a/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java b/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java index 0ede5f3d39..14abc09804 100644 --- a/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java +++ b/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java @@ -122,7 +122,6 @@ public String call() throws Exception { private static EditorPage openEditor() { return new BasicWorkFlow().goToEditor("obsolete-test", "master", "fr", - "message1") - .setSyntaxHighlighting(false); + "message1"); } } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java index 5869093c89..3da33fb247 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java @@ -96,6 +96,8 @@ public EditorOptionsView(WebTransMessages messages, .setText(messages.showTransUnitDetails()); showOptionalTransUnitDetailsChk.setTitle(messages .showTransUnitDetailsTooltip()); + + useCodeMirrorChk.ensureDebugId("syntax-highlight-chk"); } @Override