Projects >> operaprestodriver >>4373f8f9b1b7dd3010d39b48dd3bf6d3b87e0507

Chunk
Conflicting content 
	protected OperaDriverSettings settings;
	protected OperaRunner operaRunner;

<<<<<<< HEAD
	private boolean isDriverStarted = false; //Does this driver have a started opera? Makes it possible to restart opera without throwing out the driver.

=======
	private final boolean isDriverStarted = false; //Does this driver have a started opera? Makes it possible to restart opera without throwing out the driver.
	private final Logger logger = Logger.getLogger(this.getClass().getName());
	
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
	protected IEcmaScriptDebugger debugger;
	protected IOperaExec exec;
	protected IPrefs prefs;
Solution content 
	protected OperaDriverSettings settings;
	protected OperaRunner operaRunner;

	private final boolean isDriverStarted = false; //Does this driver have a started opera? Makes it possible to restart opera without throwing out the driver.

	protected IEcmaScriptDebugger debugger;
	protected IOperaExec exec;
	protected IPrefs prefs;
File
OperaDriver.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
	protected ScopeServices getScopeServices() {
		return services;
	}
<<<<<<< HEAD
    
	public String getPref(String section, String key) {
		return services.getPrefs().getPref(section, key, Mode.CURRENT);
	}

	public String getDefaultPref(String section, String key) {
		return services.getPrefs().getPref(section, key, Mode.DEFAULT);
	}
=======

	public OperaRunner getRunner() {
		return operaRunner;
	}
}
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f

	public List listPrefs(boolean sort, String section) {
		return services.getPrefs().listPrefs(sort, section);
Solution content 
	protected ScopeServices getScopeServices() {
		return services;
	}

	public OperaRunner getRunner() {
		return operaRunner;
	}
}
File
OperaDriver.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
			}
			
			String allArgs = "";
<<<<<<< HEAD

=======
			
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
			for (String s: stringArray)
			{
				allArgs = allArgs + s + " ";
Solution content 
			}
			
			String allArgs = "";

			for (String s: stringArray)
			{
				allArgs = allArgs + s + " ";
File
OperaLauncherRunner.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
			{
				allArgs = allArgs + s + " ";
			}
<<<<<<< HEAD

=======
			
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
			logger.info("Starting Opera Launcher: " + this.settings.getOperaLauncherBinary() + " " + allArgs);
			launcherRunner = new OperaLauncherBinary(this.settings.getOperaLauncherBinary(), stringArray.toArray(new String[stringArray.size()]));
		}
Solution content 
			{
				allArgs = allArgs + s + " ";
			}

			logger.info("Starting Opera Launcher: " + this.settings.getOperaLauncherBinary() + " " + allArgs);
			launcherRunner = new OperaLauncherBinary(this.settings.getOperaLauncherBinary(), stringArray.toArray(new String[stringArray.size()]));
		}
File
OperaLauncherRunner.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    int win_id = driver.waitForWindowShown("Bookmark Properties Dialog");
    assertTrue("Got bookmark dialog", win_id >= 0);
<<<<<<< HEAD

    QuickWidget widget = driver.findWidgetByName(-1, "label_for_Nick_edit");
    assertTrue("Has name edit", widget != null);

=======
    QuickWidget widget = driver.findWidgetByName(-1, "label_for_Nick_edit");
    assertTrue("Has name edit", widget != null);
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
    QuickWidget qw = driver.findWidgetByName(-1, "label_for_Name_edit");
    System.out.println("By name: " + qw.getText());
    qw.verifyText("DI_ID_HLFILEPROP_FNAME_LABEL");
Solution content 
    int win_id = driver.waitForWindowShown("Bookmark Properties Dialog");
    assertTrue("Got bookmark dialog", win_id >= 0);

    QuickWidget widget = driver.findWidgetByName(-1, "label_for_Nick_edit");
    assertTrue("Has name edit", widget != null);

    QuickWidget qw = driver.findWidgetByName(-1, "label_for_Name_edit");
    System.out.println("By name: " + qw.getText());
    qw.verifyText("DI_ID_HLFILEPROP_FNAME_LABEL");
File
BookmarkDialogTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
=======
    driver.waitStart();
    driver.operaDesktopAction("Show preferences");

<<<<<<< HEAD
    driver.waitForWindowShown("New Preferences Dialog");
    QuickWidget qw = driver.findWidgetByName(-1, "Startup_mode_dropdown");
    // assertTrue(qw != null);
    assertTrue("Drop down is visible", qw.isVisible());

    assertTrue("Chosen entry is startup with homepage", qw
        .verifyText("D_STARTUP_WITH_HOMEPAGE"));

    int win_id = driver.waitForWindowShown("New Preferences Dialog");
    QuickWidget qw = driver.findWidgetByName(-1, "Startup_mode_dropdown");
    // assertTrue(qw != null);
    assertTrue("Drop down is visible", qw.isVisible());
    assertTrue("Chosen entry is startup with homepage", qw
        .verifyText("D_STARTUP_WITH_HOMEPAGE"));
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
    assertTrue("Startup w/home is selected", qw
        .isSelected("D_STARTUP_WITH_HOMEPAGE"));
Solution content 
    driver.waitStart();
    driver.operaDesktopAction("Show preferences");

    driver.waitForWindowShown("New Preferences Dialog");
    QuickWidget qw = driver.findWidgetByName(-1, "Startup_mode_dropdown");
    // assertTrue(qw != null);
    assertTrue("Drop down is visible", qw.isVisible());

    assertTrue("Chosen entry is startup with homepage", qw
        .verifyText("D_STARTUP_WITH_HOMEPAGE"));

    assertTrue("Startup w/home is selected", qw
        .isSelected("D_STARTUP_WITH_HOMEPAGE"));
File
PreferencesDialogTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
    driver.operaDesktopAction("Cancel");
    driver.waitForWindowClose("New Preferences Dialog");
  }
<<<<<<< HEAD
=======

>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
}
Solution content 
    driver.operaDesktopAction("Cancel");
    driver.waitForWindowClose("New Preferences Dialog");
  }
}
File
PreferencesDialogTest.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
package com.opera.core.systems;

<<<<<<< HEAD
import java.util.ArrayList;
=======
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
import java.util.List;

import org.junit.Test;
Solution content 
package com.opera.core.systems;

import java.util.ArrayList;
import java.util.List;

import org.junit.Test;
File
QuickWidgetTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.opera.core.systems.scope.protos.SystemInputProtos.ModifierPressed;

<<<<<<< HEAD
public class QuickWidgetTest extends DesktopTestBase {
  @Test
  public void testSomething() {
    driver.waitStart();

    List modifiers = new ArrayList();
    modifiers.add(ModifierPressed.CTRL);

    driver.keyPress("t", modifiers);
    System.out.println("Done keypress");
    // driver.waitForWindowShown("");
    // driver.close();

    int win_id = driver.waitForWindowShown("");
    System.out.println("Window shown = " + win_id);
    System.out.println("Window name = " + driver.getWindowName(win_id));

    // FIXME add asserts

    List windows = driver.getWindowList();
    QuickWindow window = driver.getWindow("Document window");
    List list = driver.getQuickWidgetList("Document window");

  }
=======
public class QuickWidgetTest  extends DesktopTestBase {
    @Test
    public void testSomething(){
    	driver.waitStart();
       // driver.operaDesktopAction("Open url in new page", "1");
    	driver.keyPress("t", ModifierPressed.CTRL);
    	System.out.println("Done keypress");
        //driver.waitForWindowShown("");
        //driver.close();

        int win_id = driver.waitForWindowShown("");
        System.out.println("Window shown = " + win_id);
        System.out.println("Window name = " + driver.getWindowName(win_id));
        List windows = driver.getWindowList();
        QuickWindow window = driver.getWindow("Document window");
        List list = driver.getQuickWidgetList("Document window");

    }
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
}
Solution content 
import com.opera.core.systems.scope.protos.SystemInputProtos.ModifierPressed;

public class QuickWidgetTest extends DesktopTestBase {
  @Test
  public void testSomething() {
    driver.waitStart();

    List modifiers = new ArrayList();
    modifiers.add(ModifierPressed.CTRL);

    driver.keyPress("t", modifiers);
    System.out.println("Done keypress");
    // driver.waitForWindowShown("");
    // driver.close();

    int win_id = driver.waitForWindowShown("");
    System.out.println("Window shown = " + win_id);
    System.out.println("Window name = " + driver.getWindowName(win_id));

    // FIXME add asserts

    List windows = driver.getWindowList();
    QuickWindow window = driver.getWindow("Document window");
    List list = driver.getQuickWidgetList("Document window");

  }
}
File
QuickWidgetTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Class signature
Method declaration
Chunk
Conflicting content 
    assertTrue("Server is t", driver.findWidgetByName(win_id, "Simple_message")
        .getText().startsWith("t"));
<<<<<<< HEAD

=======
>>>>>>> 5f64d4ae5d92a5511cbc508574a46cc231779a2f
    assertTrue("Has security warning message", driver.findWidgetByName(win_id,
        "Simple_message").verifyContainsText("D_SECURITYALERT_SETUPDOWNLOAD"));
Solution content 
    assertTrue("Server is t", driver.findWidgetByName(win_id, "Simple_message")
        .getText().startsWith("t"));

    assertTrue("Has security warning message", driver.findWidgetByName(win_id,
        "Simple_message").verifyContainsText("D_SECURITYALERT_SETUPDOWNLOAD"));
File
SecurityDialogs.java
Developer's decision
Version 1
Kind of conflict
Blank