Projects >> jtalks-common >>ede1fc959477b98893694b9505f788be7512c6d6

Chunk
Conflicting content 
        passwordTextField = loginForm.getInputByName("j_password");
    }

<<<<<<< HEAD
    @Test(description = "Entered empty login data", dataProvider = "localeData")
    public void signInWithEmptyData(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitEmptyData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
=======
    @Test(enabled=false)
    public void signInWithEmptyDataEn() throws IOException {
        usernameTextField.setValueAttribute("");
        passwordTextField.setValueAttribute("");
        HtmlPage homePage = submitButton.click();
        assertEquals(homePage.getTitleText(), "Sign in");
        assertTrue(homePage.asText().contains("Your login attempt was not successful, try again."));
>>>>>>> 2300d81d57cee1078e7af7492330645299102ef7
    }

     //TODO: remove "enabled=false" after updated files
Solution content 
        passwordTextField = loginForm.getInputByName("j_password");
    }

    @Test(description = "Entered empty login data", dataProvider = "localeData")
    public void signInWithEmptyData(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitEmptyData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
    }

     //TODO: remove "enabled=false" after updated files
File
SignInTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Cast expression
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        assertTrue(mainPage.asText().contains(validationMessage));
    }

<<<<<<< HEAD
    @Test(description = "Entered password in wrong case", dataProvider = "localeData")
    public void signInWithWrongPasswordCase(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitWrongPasswordCaseData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
    }

    @Test(description = "Entered the non-registered username", dataProvider = "localeData")
    public void signInWithWrongUsername(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitWrongUsernameData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
=======
    @Test(enabled=false)
    public void signInSuccess() throws IOException {
        usernameTextField.setValueAttribute("testuser");
        passwordTextField.setValueAttribute("userpass");
        HtmlPage homePage = submitButton.click();
        assertEquals(homePage.getTitleText(), "JCommune");
>>>>>>> 2300d81d57cee1078e7af7492330645299102ef7
    }

    @Test(description = "Entered valid login data", dataProvider = "localeData")
Solution content 
        assertTrue(mainPage.asText().contains(validationMessage));
    }

    @Test(description = "Entered password in wrong case", dataProvider = "localeData")
    public void signInWithWrongPasswordCase(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitWrongPasswordCaseData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
    }

    @Test(description = "Entered the non-registered username", dataProvider = "localeData")
    public void signInWithWrongUsername(String locale, String validationMessage, String pageTitle) throws Exception {
        HtmlAnchor localeLink = mainPage.getAnchorByText(locale);
        mainPage = (HtmlPage) localeLink.click();
        submitWrongUsernameData();
        assertEquals(mainPage.getTitleText(), pageTitle);
        assertTrue(mainPage.asText().contains(validationMessage));
    }

    @Test(description = "Entered valid login data", dataProvider = "localeData")
File
SignInTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Cast expression
Method declaration
Method invocation
Method signature
Variable