azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move project descriptor to common place

Browse Source
This commit is contained in:
Nikolay Krasko
2013-07-04 14:00:24 +04:00
parent 2152c22f86
commit c8f79e1966
2 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java
+43
View File
@@ -0,0 +1,43 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.plugin;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.vfs.VfsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
@Override
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
super.configureModule(module, model, contentEntry);
Library library = model.getModuleLibraryTable().getLibraryByName("myLibrary");
assert library != null;
Library.ModifiableModel modifiableModel = library.getModifiableModel();
modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES);
modifiableModel.commit();
}
}
idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
+6 -24
View File
@@ -17,11 +17,6 @@
package org.jetbrains.jet.plugin.libraries; package org.jetbrains.jet.plugin.libraries;
import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
@@ -31,10 +26,10 @@ import com.intellij.psi.PsiReference;
import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.LightPlatformTestCase;
import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -91,12 +86,14 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
return psiFile; return psiFile;
} }
private void checkNavigationElement(@NotNull PsiElement element, @NotNull String expectedName) { private static void checkNavigationElement(@NotNull PsiElement element, @NotNull String expectedName) {
if (element instanceof PsiClass) { if (element instanceof PsiClass) {
assertEquals(expectedName, ((PsiClass) element).getQualifiedName()); assertEquals(expectedName, ((PsiClass) element).getQualifiedName());
} }
else if (element instanceof JetClass) { else if (element instanceof JetClass) {
assertEquals(expectedName, JetPsiUtil.getFQName((JetClass) element).asString()); FqName name = JetPsiUtil.getFQName((JetClass) element);
assert name != null;
assertEquals(expectedName, name.asString());
} }
else { else {
fail("Navigation element should be JetClass or PsiClass: " + element.getClass() + ", " + element.getText()); fail("Navigation element should be JetClass or PsiClass: " + element.getClass() + ", " + element.getText());
@@ -122,19 +119,4 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
protected LightProjectDescriptor getProjectDescriptor() { protected LightProjectDescriptor getProjectDescriptor() {
return ProjectDescriptorWithStdlibSources.INSTANCE; return ProjectDescriptorWithStdlibSources.INSTANCE;
} }
private static class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
@Override
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @Nullable ContentEntry contentEntry) {
super.configureModule(module, model, contentEntry);
Library library = model.getModuleLibraryTable().getLibraryByName("myLibrary");
assert library != null;
Library.ModifiableModel modifiableModel = library.getModifiableModel();
modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES);
modifiableModel.commit();
}
}
} }