[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/actions PyOrganizeImportsTest.java, 1.6, 1.7

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25016/tests/org/python/pydev/editor/actions

Modified Files:
	PyOrganizeImportsTest.java 
Log Message:
Organize imports fixes.

Index: PyOrganizeImportsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/actions/PyOrganizeImportsTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyOrganizeImportsTest.java	1 Jun 2008 20:44:41 -0000	1.6
--- PyOrganizeImportsTest.java	11 Jun 2008 00:00:00 -0000	1.7
***************
*** 20,24 ****
              PyOrganizeImportsTest test = new PyOrganizeImportsTest();
              test.setUp();
!             test.testPerformGroupingWithWraps3();
              test.tearDown();
              junit.textui.TestRunner.run(PyOrganizeImportsTest.class);
--- 20,24 ----
              PyOrganizeImportsTest test = new PyOrganizeImportsTest();
              test.setUp();
!             test.testPerformWithGroupingWithAs();
              test.tearDown();
              junit.textui.TestRunner.run(PyOrganizeImportsTest.class);
***************
*** 119,122 ****
--- 119,142 ----
          assertEquals(result, doc.get());
      }
+     
+     
+     public void testPerformWithGroupingWithAs() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "from a import c as d\n"+
+         "from a import f as g\n"+
+         "import e as g\n";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import c as d, f as g\n"+
+         "import e as g\n"+
+         "";
+         
+ //        System.out.println(">>"+doc.get()+"<<");
+         assertEquals(result, doc.get());
+     }
  
      
***************
*** 186,189 ****
--- 206,226 ----
      
      
+     public void testPerformGroupingWithWraps4() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "from cccccccccccccccccccccccccccccccccccccccccccccccccc import eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\n"; //50 * 'c'
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from cccccccccccccccccccccccccccccccccccccccccccccccccc import (\n" +
+         "    eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee)\n";
+         
+ //        System.out.println(">>"+doc.get()+"<<");
+         assertEquals(result, doc.get());
+     }
+     
+     
      public void testPerform2() {