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

Commit

Permalink
re-indent and delete generated sql
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Dec 2, 2013
1 parent 152db84 commit 162ea08
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 87 deletions.
Expand Up @@ -105,7 +105,7 @@ public AdministrationPage goToAdministration() {
public RegisterPage goToRegistration() {
Preconditions
.checkArgument(!hasLoggedIn(),
"User has logged in! You should sign out or delete cookie first in your test.");
"User has logged in! You should sign out or delete cookie first in your test.");

WebElement registerLink =
getDriver().findElement(By.id("register_link_internal_auth"));
Expand Down
Expand Up @@ -97,9 +97,8 @@ private WebDriver configureChromeDriver() {
.withEnvironment(
ImmutableMap
.of("DISPLAY",
PropertiesHolder.properties
.getProperty(
"webdriver.display")))
PropertiesHolder.properties
.getProperty("webdriver.display")))
.withLogFile(
new File(PropertiesHolder.properties
.getProperty("webdriver.log"))).build();
Expand Down
Expand Up @@ -20,20 +20,17 @@
*/
package org.zanata.page.administration;

import java.util.List;

import org.openqa.selenium.Alert;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.zanata.page.BasePage;
import org.zanata.util.TableRow;
import org.zanata.util.WebElementUtil;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.openqa.selenium.*;
import org.openqa.selenium.support.FindBy;
import org.zanata.page.BasePage;
import org.zanata.util.TableRow;
import org.zanata.util.WebElementUtil;

import java.util.List;

/**
* @author Damian Jansen <a
Expand Down
Expand Up @@ -30,10 +30,12 @@
import org.openqa.selenium.support.FindBy;
import org.zanata.page.BasePage;
import org.zanata.util.WebElementUtil;

import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;

import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand Down
Expand Up @@ -20,18 +20,20 @@
*/
package org.zanata.page.projects;

import java.util.List;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;

import lombok.extern.slf4j.Slf4j;

import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.zanata.page.BasePage;
import org.zanata.page.webtrans.DocumentsViewPage;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;

import java.util.List;

@Slf4j
public class ProjectVersionPage extends BasePage {
Expand Down
Expand Up @@ -20,12 +20,8 @@
*/
package org.zanata.util;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.RandomAccessFile;

import org.apache.commons.io.FileUtils;
import java.io.*;

/**
* Create and manipulate basic text files for testing.
Expand Down
Expand Up @@ -21,9 +21,9 @@
package org.zanata.workflow;

import org.openqa.selenium.WebDriver;
import org.zanata.page.WebDriverFactory;
import org.zanata.page.utility.DashboardPage;
import org.zanata.page.utility.HomePage;
import org.zanata.page.WebDriverFactory;

public class AbstractWebWorkFlow {
protected final WebDriver driver;
Expand Down
Expand Up @@ -24,6 +24,7 @@

import org.zanata.page.administration.ManageLanguagePage;
import org.zanata.page.administration.ManageLanguageTeamMemberPage;

import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand Down
Expand Up @@ -47,8 +47,8 @@ public <P extends AbstractPage> P signInAndGoToPage(String username,
log.warn("Login failed. May due to some weird issue. Will Try again.");
doSignIn(username, password);
} catch (TimeoutException e) {
log.error("timeout on login. If you are running tests manually" +
" with cargo.wait, you probably forget to create the user admin/admin.");
log.error("timeout on login. If you are running tests manually"
+ " with cargo.wait, you probably forget to create the user admin/admin.");
throw e;
}
return PageFactory.initElements(driver, pageClass);
Expand Down
Expand Up @@ -73,8 +73,8 @@ public void before() {
@After
public void cleanUp() {
EntityCleaner.deleteAll(getEntityManager(), Lists.<Class> newArrayList(
TransMemoryUnitVariant.class, TransMemoryUnit.class,
TransMemory.class));
TransMemoryUnitVariant.class, TransMemoryUnit.class,
TransMemory.class));
}

private EntityManager getEntityManager() {
Expand All @@ -93,7 +93,7 @@ public void createNewTranslationMemory() {

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow().createTranslationMemory(
newTMId, tmDescription);
newTMId, tmDescription);

assertThat("The success message is displayed",
translationMemoryPage.getNotificationMessage(),
Expand Down Expand Up @@ -162,18 +162,15 @@ public void importTranslationMemory() {
File importFile =
testFileGenerator
.generateTestFileWithContent(
"importtmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+
"<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+
" <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+
"<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");
"importtmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+ " <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+ "<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow()
Expand All @@ -194,7 +191,7 @@ public void rejectEmptyTranslation() {

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow().createTranslationMemory(
rejectTMId).clickImport(rejectTMId);
rejectTMId).clickImport(rejectTMId);
Alert uploadError = translationMemoryPage.expectFailedUpload();

assertThat("Error is displayed", uploadError.getText(),
Expand Down Expand Up @@ -253,18 +250,15 @@ public void clearTranslationMemory() {
File importFile =
testFileGenerator
.generateTestFileWithContent(
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+
"<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+
" <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+
"<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+ " <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+ "<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow()
Expand All @@ -291,18 +285,15 @@ public void dontClearTranslationMemory() {
File importFile =
testFileGenerator
.generateTestFileWithContent(
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+
"<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+
" <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+
"<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+ " <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+ "<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow()
Expand All @@ -329,18 +320,15 @@ public void mustClearBeforeDelete() {
File importFile =
testFileGenerator
.generateTestFileWithContent(
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+
"<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+
" <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+
"<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");
"cleartmtest",
".tmx",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<!DOCTYPE tmx SYSTEM \"http://www.lisa.org/tmx/tmx14.dtd\">\n"
+ "<tmx version=\"1.4\">\n"
+ " <header creationtool=\"Zanata TranslationsTMXExportStrategy\" creationtoolversion=\"unknown\" segtype=\"block\" o-tmf=\"unknown\" adminlang=\"en\" srclang=\"*all*\" datatype=\"unknown\"/>\n"
+ " <body>\n"
+ "<tu srclang=\"en-US\" tuid=\"about-fedora:master:About_Fedora:d033787962c24b1dc3e00316c86e578c\"><tuv xml:lang=\"en-US\"><seg>Fedora is an open, innovative, forward looking operating system and platform, based on Linux, that is always free for anyone to use, modify and distribute, now and forever. It is developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora is part of the Fedora Project, sponsored by Red Hat, Inc.</seg></tuv><tuv xml:lang=\"pl\"><seg>This is a TM Import Test</seg></tuv></tu>\n"
+ " </body>\n" + "</tmx>");

TranslationMemoryPage translationMemoryPage =
new TranslationMemoryWorkFlow()
Expand Down
Expand Up @@ -135,8 +135,8 @@ public void emptyResetPasswordFieldEntries() {
assertThat(
resetPasswordPage.getErrors().get(0),
either(equalTo("size must be between 3 and 20")).or(
equalTo("may not be empty")).or(
equalTo("must match ^[a-z\\d_]{3,20}$")));
equalTo("may not be empty")).or(
equalTo("must match ^[a-z\\d_]{3,20}$")));

}

Expand Down
Expand Up @@ -60,7 +60,7 @@ public ProjectVersionPage goToProjectVersion(String projectName,
projectVersionPage =
new BasicWorkFlow()
.goToPage(String.format("iteration/view/plurals/%s",
versionSlug), ProjectVersionPage.class);
versionSlug), ProjectVersionPage.class);
// ProjectPage projectPage =
// homePage.goToProjects().goToProject(projectName);
// projectVersionPage = projectPage.goToVersion(versionSlug);
Expand Down
Expand Up @@ -43,7 +43,6 @@
CustomResourceExtension.class })
@Category(ConcordionTest.class)
public class TranslatorJoinsLanguageTeamTest {

private DashboardPage dashboardPage;
private ManageLanguagePage manageLanguagePage;
private ManageLanguageTeamMemberPage manageLanguageTeamMemberPage;
Expand Down
Expand Up @@ -98,10 +98,8 @@ public class VersionGroupIDValidationTest {
public void goToGroupPage() {
if (groupPage == null) {
groupPage =
new LoginWorkFlow()
.signIn("admin", "admin")
.goToGroups()
.createNewGroup();
new LoginWorkFlow().signIn("admin", "admin").goToGroups()
.createNewGroup();
}
}

Expand Down

0 comments on commit 162ea08

Please sign in to comment.