Refactor CompilerConfiguration: keys -> Content roots

Represent classpath roots and java source roots as separate entities

compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java

@@ -19,13 +19,14 @@ package org.jetbrains.kotlin.asJava;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
-import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
 
 import java.io.File;
 import java.util.List;
 
+import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot;
+
 public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
     protected JavaElementFinder finder;
 
@@ -34,7 +35,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
         CompilerConfiguration configuration = new CompilerConfiguration();
 
         for (File root : getKotlinSourceRoots()) {
-            configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, root.getPath());
+            addKotlinSourceRoot(configuration, root.getPath());
         }
 
         extraConfiguration(configuration);

compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java

@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Set;
 
 import static org.jetbrains.kotlin.asJava.KotlinLightClassStructureTest.ClassProperty.*;
-import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY;
+import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot;
 
 @SuppressWarnings("JUnitTestClassNamingConvention")
 public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase {
@@ -149,7 +149,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase
 
         @Override
         protected void extraConfiguration(@NotNull CompilerConfiguration configuration) {
-            configuration.add(CLASSPATH_KEY, ForTestCompileRuntime.runtimeJarForTests());
+            addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests());
         }
     }
 

compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java

@@ -21,7 +21,6 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
@@ -29,6 +28,8 @@ import java.io.File;
 import java.util.Collections;
 import java.util.List;
 
+import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot;
+
 public class LightClassAnnotationsTest extends KotlinAsJavaTestBase {
     private final File testDir = new File("compiler/testData/asJava/annotations");
 
@@ -39,7 +40,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase {
 
     @Override
     protected void extraConfiguration(@NotNull CompilerConfiguration configuration) {
-        configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar());
+        addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar());
     }
 
     public void testExtraAnnotations() throws Exception {