Projects >> jbehave-web >>e275bed5cbdec40318ff7981ae734ae74cddf0fa

Chunk
Conflicting content 
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
<<<<<<< HEAD
import org.openqa.selenium.android.AndroidDriver;
=======
import org.junit.After;
>>>>>>> 68aae5823345475391bdac0aa66f4e340526d1ba
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.ie.InternetExplorerDriver;
Solution content 
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.openqa.selenium.android.AndroidDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.ie.InternetExplorerDriver;
File
PropertyWebDriverProviderTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
public class PropertyWebDriverProviderTest {

<<<<<<< HEAD
    private WebDriverProvider provider;

    @After
    public void after() {
        if (provider != null) {
            provider.get().close();
        }
    }

    @Test
    public void shouldSupportFirefoxByDefault() {
        createProviderForProperty(null);
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    public void shouldSupportFirefoxByProperty() {
        createProviderForProperty("firefox");
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    @Ignore("Only when Chrome is available")
    public void shouldSupportChromeByProperty() {
        createProviderForProperty("chrome");
        assertThat(provider.get(), instanceOf(ChromeDriver.class));
    }

    @Test
    @Ignore("Only when IE is available")
    public void shouldSupportIEByProperty() {
        createProviderForProperty("ie");
        assertThat(provider.get(), instanceOf(InternetExplorerDriver.class));
    }

    @Test
    @Ignore("Only when Android is available")
    public void shouldSupportAndroidByProperty() {
        createProviderForProperty("android");
        assertThat(provider.get(), instanceOf(AndroidDriver.class));
    }

    private void createProviderForProperty(String browser) {
        if (browser != null) {
=======
    private PropertyWebDriverProvider provider;

    @Test
    public void shouldAllowFirefoxAsDefultBasedOnBrowserProperty() {
        providerForBrowser(null);
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    public void shouldAllowFirefoxBasedOnBrowserProperty() {
        providerForBrowser("firefox");
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    public void shouldAllowChromeBasedOnBrowserProperty() {
        providerForBrowser("chrome");
        assertThat(provider.get(), instanceOf(ChromeDriver.class));
    }

    @Test
    public void shouldAllowHtmlUnitBasedOnBrowserProperty() {
        providerForBrowser("html");
        assertThat(provider.get(), instanceOf(HtmlUnitDriver.class));
    }


    @After
    public void tearDown() {
        if (provider != null) {
            provider.quit();
        }
    }


    private void providerForBrowser(String browser) {
        if ( browser != null ){
>>>>>>> 68aae5823345475391bdac0aa66f4e340526d1ba
            System.setProperty("browser", browser);
        }
        provider = new PropertyWebDriverProvider();
Solution content 
public class PropertyWebDriverProviderTest {

    private WebDriverProvider provider;

    @After
    public void after() {
        if (provider != null) {
            provider.get().close();
        }
    }

    @Test
    public void shouldSupportFirefoxByDefault() {
        createProviderForProperty(null);
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    public void shouldSupportFirefoxByProperty() {
        createProviderForProperty("firefox");
        assertThat(provider.get(), instanceOf(FirefoxDriver.class));
    }

    @Test
    @Ignore("Only when Chrome is available")
    public void shouldSupportChromeByProperty() {
        createProviderForProperty("chrome");
        assertThat(provider.get(), instanceOf(ChromeDriver.class));
    }

    @Test
    @Ignore("Only when IE is available")
    public void shouldSupportIEByProperty() {
        createProviderForProperty("ie");
        assertThat(provider.get(), instanceOf(InternetExplorerDriver.class));
    }

    @Test
    @Ignore("Only when Android is available")
    public void shouldSupportAndroidByProperty() {
        createProviderForProperty("android");
        assertThat(provider.get(), instanceOf(AndroidDriver.class));
    }

    private void createProviderForProperty(String browser) {
        if (browser != null) {
            System.setProperty("browser", browser);
        }
        provider = new PropertyWebDriverProvider();
File
PropertyWebDriverProviderTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
If statement
Method declaration
Method signature