Projects >> selenide >>4ea3c5e87a049fc64aa38cac032cee92f476c249

Chunk
Conflicting content 
  @Test
  public void selenideClearTest() {
<<<<<<< HEAD
    SelenideElement input = $(By.id("id1"));
    Assert.assertThat(input.getValue(), is(equalTo("")));
=======
    assumeTrue("Bug in Selenium should be fixed in 2.49+, see http://bit.ly/1JKT4AE", isFirefox());
    
    SelenideElement input = $("#id1");
    assertThat(input.getValue(), is(equalTo("")));
    
>>>>>>> 52cf5322cabc0484be2b9a4de18a6ae982e16265
    input.clear();
    input.setValue(",.123");
    input.clear();
Solution content 
  @Test
  public void selenideClearTest() {
    assumeTrue("Bug in Selenium should be fixed in 2.49+, see http://bit.ly/1JKT4AE", isFirefox());

    SelenideElement input = $("#id1");
    assertThat(input.getValue(), is(equalTo("")));

    input.clear();
    input.setValue(",.123");
    input.clear();
File
InputFieldTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    input.setValue(",.123");
    input.clear();
    input.setValue("456");
<<<<<<< HEAD
    Assert.assertThat(input.getValue(), is(equalTo("456")));
=======
    assertThat(input.getValue(), is(equalTo("456")));
    
>>>>>>> 52cf5322cabc0484be2b9a4de18a6ae982e16265
    input.clear();
    input.setValue(",.123");
    input.clear();
Solution content 
    input.setValue(",.123");
    input.clear();
    input.setValue("456");
    assertThat(input.getValue(), is(equalTo("456")));

    input.clear();
    input.setValue(",.123");
    input.clear();
File
InputFieldTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    input.setValue(",.123");
    input.clear();
    input.setValue("456");
<<<<<<< HEAD
    Assert.assertThat(input.getValue(), is(equalTo("456")));
=======
    assertThat(input.getValue(), is(equalTo("456")));
>>>>>>> 52cf5322cabc0484be2b9a4de18a6ae982e16265
  }
}
Solution content 
    input.setValue(",.123");
    input.clear();
    input.setValue("456");
    assertThat(input.getValue(), is(equalTo("456")));
  }
}
File
InputFieldTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation