Projects >> android_frameworks_base >>84f992a249491b9f755e879bf096baac3f9472f5

Chunk
Conflicting content 
import java.io.StringReader;
import java.lang.Runtime;
import java.lang.Process;
<<<<<<< HEAD
import java.util.Map;
=======
import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
>>>>>>> 6aec2250108b7db774643bbc088590138099adb6
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Solution content 
import java.io.StringReader;
import java.lang.Runtime;
import java.lang.Process;
import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
File
PackageManagerHostTestUtils.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
     * @param runnerName (optional) The name of the TestRunner of the test on the device to be run
     * @param params (optional) Any additional parameters to pass into the Test Runner
     * @return the {@link CollectingTestRunListener}
<<<<<<< HEAD
     * @throws TimeoutException in case of a timeout on the connection.
     * @throws AdbCommandRejectedException if adb rejects the command
     * @throws ShellCommandUnresponsiveException if the device did not output anything for
     * a period longer than the max time to output.
     * @throws IOException if connection to device was lost.
     */
    private CollectingTestRunListener doRunTests(String pkgName) throws IOException,
    TimeoutException, AdbCommandRejectedException, ShellCommandUnresponsiveException {
        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
                pkgName, mDevice);
=======
     */
    private CollectingTestRunListener doRunTests(String pkgName, String className, String
            methodName, String runnerName, Map params) throws IOException {

        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(pkgName, runnerName,
                mDevice);

        if (className != null && methodName != null) {
            testRunner.setMethodName(className, methodName);
        }

        // Add in any additional args to pass into the test
        if (params != null) {
            for (Entry argPair : params.entrySet()) {
                testRunner.addInstrumentationArg(argPair.getKey(), argPair.getValue());
            }
        }

>>>>>>> 6aec2250108b7db774643bbc088590138099adb6
        CollectingTestRunListener listener = new CollectingTestRunListener();
        testRunner.run(listener);
        return listener;
Solution content 
     * @param runnerName (optional) The name of the TestRunner of the test on the device to be run
     * @param params (optional) Any additional parameters to pass into the Test Runner
     * @return the {@link CollectingTestRunListener}
     * @throws TimeoutException in case of a timeout on the connection.
     * @throws AdbCommandRejectedException if adb rejects the command
     * @throws ShellCommandUnresponsiveException if the device did not output anything for
     * a period longer than the max time to output.
     * @throws IOException if connection to device was lost.
     */
    private CollectingTestRunListener doRunTests(String pkgName, String className, String
            methodName, String runnerName, Map params) throws IOException, 
            TimeoutException, AdbCommandRejectedException, ShellCommandUnresponsiveException {

        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(pkgName, runnerName,
                mDevice);

        if (className != null && methodName != null) {
            testRunner.setMethodName(className, methodName);
        }

        // Add in any additional args to pass into the test
        if (params != null) {
            for (Entry argPair : params.entrySet()) {
                testRunner.addInstrumentationArg(argPair.getKey(), argPair.getValue());
            }
        }

        CollectingTestRunListener listener = new CollectingTestRunListener();
        testRunner.run(listener);
        return listener;
File
PackageManagerHostTestUtils.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
     *
     * @param pkgName Android application package for tests
     * @return true if every test passed, false otherwise.
<<<<<<< HEAD
     * @throws TimeoutException in case of a timeout on the connection.
     * @throws AdbCommandRejectedException if adb rejects the command
     * @throws ShellCommandUnresponsiveException if the device did not output anything for
     * a period longer than the max time to output.
     * @throws IOException if connection to device was lost.
     */
    public boolean runDeviceTestsDidAllTestsPass(String pkgName) throws IOException,
            TimeoutException, AdbCommandRejectedException, ShellCommandUnresponsiveException {
        CollectingTestRunListener listener = doRunTests(pkgName);
=======
     */
    public boolean runDeviceTestsDidAllTestsPass(String pkgName) throws IOException {
        CollectingTestRunListener listener = doRunTests(pkgName, null, null, null, null);
>>>>>>> 6aec2250108b7db774643bbc088590138099adb6
        return listener.didAllTestsPass();
    }
Solution content 
     *
     * @param pkgName Android application package for tests
     * @return true if every test passed, false otherwise.
     * @throws TimeoutException in case of a timeout on the connection.
     * @throws AdbCommandRejectedException if adb rejects the command
     * @throws ShellCommandUnresponsiveException if the device did not output anything for
     * a period longer than the max time to output.
     * @throws IOException if connection to device was lost.
     */
    public boolean runDeviceTestsDidAllTestsPass(String pkgName) throws IOException, 
            TimeoutException, AdbCommandRejectedException, ShellCommandUnresponsiveException {
        CollectingTestRunListener listener = doRunTests(pkgName, null, null, null, null);
        return listener.didAllTestsPass();
    }
File
PackageManagerHostTestUtils.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Method signature
Variable