MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

adapt some project model tests to run on new project model

Browse Source 
GitOrigin-RevId: 02e7154004d2f702127b275bd87bc578ad581cfd
This commit is contained in:
Leonid Shalupov
2019-09-20 19:10:40 +02:00
committed by intellij-monorepo-bot
parent e7095a10f8
commit a95c302b2b
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java
View File

@@ -109,7 +109,7 @@ public class ManagingContentRootsTest extends JavaProjectTestCase {
public void testExcludePatternSerialization() throws Exception {
PsiTestUtil.addContentRoot(myModule, dir);
ModuleRootModificationUtil.updateModel(myModule, model -> findContentEntry(dir.getUrl(), model).addExcludePattern("exc"));
StoreUtil.saveSettings(myModule, false);
StoreUtil.saveDocumentsAndProjectSettings(myProject);
Element root = JDOMUtil.load(new File(myModule.getModuleFilePath()));
String elementText = "<content url=\"file://$MODULE_DIR$/idea_test_\">\n" +

8
java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java
View File

@@ -88,7 +88,7 @@ public class ModuleRootsExternalizationTest extends JavaModuleTestCase {
PsiTestUtil.setCompilerOutputPath(module, classesFile.getUrl(), false);
PsiTestUtil.setCompilerOutputPath(module, testClassesFile.getUrl(), true);
StoreUtil.saveSettings(module);
StoreUtil.saveDocumentsAndProjectSettings(myProject);
assertEquals(
"<component name=\"NewModuleRootManager\">\n" +
@@ -125,7 +125,7 @@ public class ModuleRootsExternalizationTest extends JavaModuleTestCase {
WriteAction.run(() -> extension.commit());
});
StoreUtil.saveSettings(module);
StoreUtil.saveDocumentsAndProjectSettings(myProject);
assertEquals(
"<component name=\"NewModuleRootManager\" inherit-compiler-output=\"true\">\n" +
@@ -173,7 +173,7 @@ public class ModuleRootsExternalizationTest extends JavaModuleTestCase {
assertEquals(libraryIterator.next(), namedLibrary);
ApplicationManager.getApplication().runWriteAction(rootModel::commit);
StoreUtil.saveSettings(module);
StoreUtil.saveDocumentsAndProjectSettings(myProject);
assertEquals(
"<component name=\"NewModuleRootManager\" inherit-compiler-output=\"true\">\n" +
@@ -209,7 +209,7 @@ public class ModuleRootsExternalizationTest extends JavaModuleTestCase {
final ModifiableRootModel rootModel = moduleRootManager.getModifiableModel();
rootModel.getModuleExtension(CompilerModuleExtension.class).inheritCompilerOutputPath(true);
ApplicationManager.getApplication().runWriteAction(rootModel::commit);
StoreUtil.saveSettings(module);
StoreUtil.saveDocumentsAndProjectSettings(myProject);
assertEquals(
"<component name=\"NewModuleRootManager\" inherit-compiler-output=\"true\">\n" +

13
java/java-tests/testSrc/com/intellij/roots/libraries/RepositoryLibrarySerializationTest.java
View File

@@ -2,13 +2,15 @@
package com.intellij.roots.libraries;
import com.intellij.jarRepository.RepositoryLibraryType;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.impl.libraries.LibraryEx;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.project.ProjectKt;
import com.intellij.roots.ModuleRootManagerTestCase;
import org.jdom.JDOMException;
@@ -52,9 +54,12 @@ public class RepositoryLibrarySerializationTest extends ModuleRootManagerTestCas
private RepositoryLibraryProperties loadLibrary(String name) throws JDOMException, IOException {
String libraryPath = "jps/model-serialization/testData/repositoryLibraries/.idea/libraries/" + name + ".xml";
File librarySource = PathManagerEx.findFileUnderCommunityHome(libraryPath);
File libraryFile = new File(myProject.getBasePath(), ".idea/libraries/" + name + ".xml");
FileUtil.copy(librarySource, libraryFile);
LocalFileSystem.getInstance().refreshAndFindFileByIoFile(libraryFile);
WriteAction.runAndWait(() -> {
VirtualFile librariesVirtualFile = VfsUtil.createDirectoryIfMissing(myProject.getBaseDir(), ".idea/libraries");
VfsUtil.copy(this, LocalFileSystem.getInstance().refreshAndFindFileByIoFile(librarySource), librariesVirtualFile);
});
LibraryTable projectLibraryTable = LibraryTablesRegistrar.getInstance().getLibraryTable(myProject);
LibraryEx library = (LibraryEx)projectLibraryTable.getLibraryByName(name);
assertNotNull(library);