Projects >> kotlin >>12447eace17cef22a4952eaaa185b0f0c2f1f291

Chunk
Conflicting content 
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;

<<<<<<< HEAD:idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightProjectDescriptor.java
public class JetLightProjectDescriptor implements LightProjectDescriptor {
    protected JetLightProjectDescriptor() {
=======
public class KotlinLightProjectDescriptor extends LightProjectDescriptor {
    protected KotlinLightProjectDescriptor() {
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3:idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java
    }
    
    public static final KotlinLightProjectDescriptor INSTANCE = new KotlinLightProjectDescriptor();
Solution content 
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;

public class KotlinLightProjectDescriptor implements LightProjectDescriptor {
    protected KotlinLightProjectDescriptor() {
    }
    
    public static final KotlinLightProjectDescriptor INSTANCE = new KotlinLightProjectDescriptor();
File
KotlinLightProjectDescriptor.java
Developer's decision
Manual
Kind of conflict
Class signature
Method signature
Chunk
Conflicting content 
<<<<<<< HEAD
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.JetTestUtils;
=======
import org.jetbrains.kotlin.test.KotlinTestUtils;
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
import org.jetbrains.kotlin.test.MockLibraryUtil;
import org.junit.ComparisonFailure;
Solution content 
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.MockLibraryUtil;
import org.junit.ComparisonFailure;
File
KotlinDebuggerTestCase.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
            MockLibraryUtil.compileKotlin(sourcesDir, new File(outputDir), CUSTOM_LIBRARY_JAR.getPath());

            List options = Arrays.asList("-d", outputDir, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath());
<<<<<<< HEAD
            JetTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
=======
            try {
                KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
            }
            catch (IOException e) {
                throw new RuntimeException(e);
            }
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3

            IS_TINY_APP_COMPILED = true;
        }
Solution content 
            MockLibraryUtil.compileKotlin(sourcesDir, new File(outputDir), CUSTOM_LIBRARY_JAR.getPath());

            List options = Arrays.asList("-d", outputDir, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath());
            try {
                KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
            }
            catch (IOException e) {
                throw new RuntimeException(e);
            }

            IS_TINY_APP_COMPILED = true;
        }
File
KotlinDebuggerTestCase.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Try statement
Chunk
Conflicting content 
        }
            doStepOverTest(fileName);
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt");
            doStepOutTest(fileName);
        }
<<<<<<< HEAD
=======

        @TestMetadata("stepOutInlineFunction.kt")
        public void testStepOutInlineFunction() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlineFunction.kt");
            doStepOutTest(fileName);
        }

        @TestMetadata("stepOutInlinedLambdaArgument.kt")
        public void testStepOutInlinedLambdaArgument() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgument.kt");
            doStepOutTest(fileName);
        }

        @TestMetadata("stepOutSeveralInlineArgumentDeepest.kt")
        public void testStepOutSeveralInlineArgumentDeepest() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineArgumentDeepest.kt");
            doStepOutTest(fileName);
        }

        @TestMetadata("stepOutSeveralInlineFunctions.kt")
        public void testStepOutSeveralInlineFunctions() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctions.kt");
            doStepOutTest(fileName);
        }

        @TestMetadata("stepOutSeveralInlineFunctionsDeepest.kt")
        public void testStepOutSeveralInlineFunctionsDeepest() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctionsDeepest.kt");
            doStepOutTest(fileName);
        }
    }

    @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
    public static class StepOver extends AbstractKotlinSteppingTest {
        public void testAllFilesPresentInStepOver() throws Exception {
            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOver"), Pattern.compile("^(.+)\\.kt$"), true);
        }

        @TestMetadata("ifCapturedVariableKt9118.kt")
        public void testIfCapturedVariableKt9118() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("inlineFunctionSameLines.kt")
        public void testInlineFunctionSameLines() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineFunctionSameLines.kt");

        @TestMetadata("stepOverForWithInline.kt")
        public void testStepOverForWithInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverForWithInline.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverIfWithInline.kt")
        public void testStepOverIfWithInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverInlineFunctionInReturn.kt")
        public void testStepOverInlineFunctionInReturn() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverInlinedLambda.kt")
        public void testStepOverInlinedLambda() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverInlinedLambdaStdlib.kt")
        public void testStepOverInlinedLambdaStdlib() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambdaStdlib.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverReifiedParam.kt")
        public void testStepOverReifiedParam() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverReifiedParam.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverSimpleFun.kt")
        public void testStepOverSimpleFun() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverSimpleFun.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverTryCatchWithInline.kt")
        public void testStepOverTryCatchWithInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverWhenInReturn.kt")
        public void testStepOverWhenInReturn() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverWhenWithInline.kt")
        public void testStepOverWhenWithInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.kt");
            doStepOverTest(fileName);
        }

        @TestMetadata("stepOverWhileWithInline.kt")
        public void testStepOverWhileWithInline() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.kt");
            doStepOverTest(fileName);
        }
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
    }

    @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/filters")
Solution content 
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt");
            doStepOutTest(fileName);
        }
    }

    @TestMetadata("idea/testData/debugger/tinyApp/src/stepping/filters")
File
KotlinSteppingTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Class signature
Method declaration
Chunk
Conflicting content 
            doCustomTest(fileName);
        }

<<<<<<< HEAD
=======
        @TestMetadata("smartStepIntoInlinedFunLiteral.kt")
        public void testSmartStepIntoInlinedFunLiteral() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.kt");
            doCustomTest(fileName);
        }

        @TestMetadata("smartStepIntoInlinedFunctionalExpression.kt")
        public void testSmartStepIntoInlinedFunctionalExpression() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.kt");
            doCustomTest(fileName);
        }

>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
        @TestMetadata("stepIntoStdlibInlineFun2step.kt")
        public void testStepIntoStdlibInlineFun2step() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt");
Solution content 
            doCustomTest(fileName);
        }

        @TestMetadata("stepIntoStdlibInlineFun2step.kt")
        public void testStepIntoStdlibInlineFun2step() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt");
File
KotlinSteppingTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt");
            doCustomTest(fileName);
        }
<<<<<<< HEAD
=======

        @TestMetadata("stepOutInlineFunctionStdlib.kt")
        public void testStepOutInlineFunctionStdlib() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.kt");
            doCustomTest(fileName);
        }
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
    }
}
Solution content 
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt");
            doCustomTest(fileName);
        }
    }
}
File
KotlinSteppingTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        doTest(fileName);
    }

<<<<<<< HEAD
=======
    @TestMetadata("inlinedFunctionalExpression.kt")
    public void testInlinedFunctionalExpression() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunctionalExpression.kt");
        doTest(fileName);
    }

>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
    @TestMetadata("invoke.kt")
    public void testInvoke() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt");
Solution content 
        doTest(fileName);
    }

    @TestMetadata("invoke.kt")
    public void testInvoke() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt");
File
SmartStepIntoTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
            doMultipleBreakpointsTest(fileName);
        }

<<<<<<< HEAD
=======
        @TestMetadata("isInsideInlineLambda.kt")
        public void testIsInsideInlineLambda() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt");
            doMultipleBreakpointsTest(fileName);
        }

>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
        @TestMetadata("localFun.kt")
        public void testLocalFun() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt");
Solution content 
            doMultipleBreakpointsTest(fileName);
        }

        @TestMetadata("localFun.kt")
        public void testLocalFun() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt");
File
KotlinEvaluateExpressionTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
            doMultipleBreakpointsTest(fileName);
        }

<<<<<<< HEAD
=======
        @TestMetadata("multipleBreakpointsAtLine.kt")
        public void testMultipleBreakpointsAtLine() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt");
            doMultipleBreakpointsTest(fileName);
        }

>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
        @TestMetadata("whenEntry.kt")
        public void testWhenEntry() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt");
Solution content 
            doMultipleBreakpointsTest(fileName);
        }

        @TestMetadata("whenEntry.kt")
        public void testWhenEntry() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt");
File
KotlinEvaluateExpressionTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        public void testTestNG() throws Exception {
            doTest(fileName);
        }
    }

            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/libraries/testNG.kt");
        }
    }

<<<<<<< HEAD
=======
    @TestMetadata("idea/testData/quickfix/libraries")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Libraries extends AbstractQuickFixTest {
        public void testAllFilesPresentInLibraries() throws Exception {
            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/libraries"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
        }

        @TestMetadata("junit.kt")
        public void testJunit() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/libraries/junit.kt");
            doTest(fileName);
        }

        @TestMetadata("testNG.kt")
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3
    @TestMetadata("idea/testData/quickfix/migration")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
Solution content 
        }
    }

    @TestMetadata("idea/testData/quickfix/migration")
    @TestDataPath("$PROJECT_ROOT")
    @RunWith(JUnit3RunnerWithInners.class)
File
QuickFixTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Class declaration
Chunk
Conflicting content 
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
<<<<<<< HEAD
import org.junit.Ignore;
import org.jetbrains.kotlin.test.JetTestUtils;
=======
import org.jetbrains.kotlin.test.KotlinTestUtils;
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3

import java.io.File;
import java.util.*;
Solution content 
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.junit.Ignore;
import org.jetbrains.kotlin.test.KotlinTestUtils;

import java.io.File;
import java.util.*;
File
JetChangeSignatureTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
public class JUnitMembersSearcherTest extends AbstractSearcherTest {
    private static final LightProjectDescriptor junitProjectDescriptor =
<<<<<<< HEAD
            new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));
=======
            new KotlinJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar"));
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3

    public void testJunit3() throws IOException {
        doJUnit3test();
Solution content 
public class JUnitMembersSearcherTest extends AbstractSearcherTest {
    private static final LightProjectDescriptor junitProjectDescriptor =
            new KotlinJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));

    public void testJunit3() throws IOException {
        doJUnit3test();
File
JUnitMembersSearcherTest.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.jetbrains.android.facet.AndroidRootUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
<<<<<<< HEAD
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.test.JetTestUtils;
=======
import org.jetbrains.kotlin.test.KotlinTestUtils;
>>>>>>> 23e35ab1128f83ae83cbd1bc8a3e899863e552c3

import java.io.File;
import java.io.FileFilter;
Solution content 
import org.jetbrains.android.facet.AndroidRootUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
import org.jetbrains.kotlin.test.KotlinTestUtils;

import java.io.File;
import java.io.FileFilter;
File
KotlinAndroidTestCase.java
Developer's decision
Version 2
Kind of conflict
Import