1 files changed, 111 insertions, 8 deletions

diff --git a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
index e78308b4ae92..1ee498cd5d2c 100644
--- a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
@@ -1,16 +1,24 @@
 package com.intellij.roots.libraries;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.RootProvider;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.impl.libraries.LibraryEx;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
+import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.roots.ModuleRootManagerTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
+import com.intellij.testFramework.PsiTestUtil;
+import com.intellij.util.CommonProcessors;
 import org.jdom.Element;
-import org.jdom.output.XMLOutputter;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
 
 /**
  *  @author dsl
@@ -40,11 +48,6 @@ public class LibraryTest extends ModuleRootManagerTestCase {
     commit(model2);
     assertFalse(listenerNotifiedOnChange[0]);
 
-    final Element element = new Element("root");
-    library.writeExternal(element);
-    assertEquals("<root><library name=\"library\"><CLASSES><root url=\"file://x.jar\" /></CLASSES><JAVADOC /><SOURCES><root url=\"file://x-src.jar\" /></SOURCES></library></root>",
-            new XMLOutputter().outputString(element));
-
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
@@ -53,6 +56,106 @@ public class LibraryTest extends ModuleRootManagerTestCase {
     });
   }
 
+  public void testLibrarySerialization() {
+    Library library = PsiTestUtil.addProjectLibrary(myModule, "junit", Collections.singletonList(getJDomJar()),
+                                                    Collections.singletonList(getJDomSources()));
+    Element element = serialize(library);
+    String classesUrl = getJDomJar().getUrl();
+    String sourcesUrl = getJDomSources().getUrl();
+    PlatformTestUtil.assertElementEquals(
+      "<root><library name=\"junit\"><CLASSES><root url=\"" + classesUrl + "\" /></CLASSES>" +
+      "<JAVADOC /><SOURCES><root url=\"" + sourcesUrl + "\" /></SOURCES></library></root>",
+      element);
+  }
+
+  public void testResolveDependencyToAddedLibrary() {
+    final ModifiableRootModel model = ModuleRootManager.getInstance(myModule).getModifiableModel();
+    model.addInvalidLibrary("jdom", LibraryTablesRegistrar.PROJECT_LEVEL);
+    commit(model);
+    assertEmpty(getLibraries());
+
+    Library library = createLibrary("jdom", getJDomJar(), null);
+    assertSameElements(getLibraries(), library);
+  }
+
+  public void testResolveDependencyToRenamedLibrary() {
+    Library library = createLibrary("jdom2", getJDomJar(), null);
+
+    final ModifiableRootModel model = ModuleRootManager.getInstance(myModule).getModifiableModel();
+    model.addInvalidLibrary("jdom", LibraryTablesRegistrar.PROJECT_LEVEL);
+    commit(model);
+    assertEmpty(getLibraries());
+
+    Library.ModifiableModel libModel = library.getModifiableModel();
+    libModel.setName("jdom");
+    commit(libModel);
+    assertSameElements(getLibraries(), library);
+  }
+
+  private Collection<Library> getLibraries() {
+    CommonProcessors.CollectProcessor<Library> processor = new CommonProcessors.CollectProcessor<Library>();
+    ModuleRootManager.getInstance(myModule).orderEntries().forEachLibrary(processor);
+    return processor.getResults();
+  }
+
+  private static void commit(final ModifiableRootModel model) {
+    new WriteAction() {
+      protected void run(@NotNull final Result result) {
+        model.commit();
+      }
+    }.execute();
+  }
+
+  public void testNativePathSerialization() {
+    LibraryTable table = LibraryTablesRegistrar.getInstance().getLibraryTable(myProject);
+    Library library = table.createLibrary("native");
+    Library.ModifiableModel model = library.getModifiableModel();
+    model.addRoot("file://native-lib-root", NativeLibraryOrderRootType.getInstance());
+    commit(model);
+
+    Element element = serialize(library);
+    PlatformTestUtil.assertElementEquals(
+      "<root><library name=\"native\"><CLASSES /><JAVADOC />" +
+      "<NATIVE><root url=\"file://native-lib-root\" /></NATIVE>" +
+      "<SOURCES /></library></root>",
+      element);
+  }
+
+  public void testJarDirectoriesSerialization() {
+    LibraryTable table = LibraryTablesRegistrar.getInstance().getLibraryTable(myProject);
+    Library library = table.createLibrary("jarDirs");
+    Library.ModifiableModel model = library.getModifiableModel();
+    model.addJarDirectory("file://jar-dir", false, OrderRootType.CLASSES);
+    model.addJarDirectory("file://jar-dir-src", false, OrderRootType.SOURCES);
+    commit(model);
+
+    Element element = serialize(library);
+    PlatformTestUtil.assertElementEquals("<root>\n" +
+                                         "  <library name=\"jarDirs\">\n" +
+                                         "    <CLASSES>\n" +
+                                         "      <root url=\"file://jar-dir\" />\n" +
+                                         "    </CLASSES>\n" +
+                                         "    <JAVADOC />\n" +
+                                         "    <SOURCES>\n" +
+                                         "      <root url=\"file://jar-dir-src\" />\n" +
+                                         "    </SOURCES>\n" +
+                                         "    <jarDirectory url=\"file://jar-dir\" recursive=\"false\" />\n" +
+                                         "    <jarDirectory url=\"file://jar-dir-src\" recursive=\"false\" type=\"SOURCES\" />\n" +
+                                         "  </library>\n" +
+                                         "</root>" , element);
+  }
+
+  private static Element serialize(Library library) {
+    try {
+      Element element = new Element("root");
+      library.writeExternal(element);
+      return element;
+    }
+    catch (WriteExternalException e) {
+      throw new AssertionError(e);
+    }
+  }
+
   public void testAddRemoveExcludedRoot() {
     VirtualFile jar = getJDomJar();
     LibraryEx library = (LibraryEx)createLibrary("junit", jar, null);