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

[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-serv24261/tests/org/python/pydev/editor/actions

Modified Files:
	PyOrganizeImportsTest.java 
Log Message:
Organize imports can group from xxx imports.

Index: PyOrganizeImportsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/actions/PyOrganizeImportsTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyOrganizeImportsTest.java	4 Aug 2007 16:01:11 -0000	1.5
--- PyOrganizeImportsTest.java	1 Jun 2008 20:44:41 -0000	1.6
***************
*** 7,10 ****
--- 7,11 ----
  
  import org.eclipse.jface.text.Document;
+ import org.python.pydev.ui.importsconf.ImportsPreferencesPage;
  
  import junit.framework.TestCase;
***************
*** 19,23 ****
              PyOrganizeImportsTest test = new PyOrganizeImportsTest();
              test.setUp();
!             test.testPerformSort2();
              test.tearDown();
              junit.textui.TestRunner.run(PyOrganizeImportsTest.class);
--- 20,24 ----
              PyOrganizeImportsTest test = new PyOrganizeImportsTest();
              test.setUp();
!             test.testPerformGroupingWithWraps3();
              test.tearDown();
              junit.textui.TestRunner.run(PyOrganizeImportsTest.class);
***************
*** 32,36 ****
--- 33,39 ----
      protected void setUp() throws Exception {
          super.setUp();
+         ImportsPreferencesPage.groupImportsForTests = false;
      }
+     
  
      /*
***************
*** 39,42 ****
--- 42,46 ----
      protected void tearDown() throws Exception {
          super.tearDown();
+         ImportsPreferencesPage.groupImportsForTests = true; //default
      }
  
***************
*** 51,55 ****
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
  String result = ""+
--- 55,59 ----
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
  String result = ""+
***************
*** 64,68 ****
--- 68,189 ----
  
      }
+     
+     public void testPerformWithGrouping() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "import b\n"+
+         "import a\n"+
+         "\n"+
+         "from a import c\n"+
+         "from b import d\n"+
+         "from a import b";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import b, c\n"+
+         "from b import d\n"+
+         "import a\n"+
+         "import b\n"+
+         "\n";
+         
+         assertEquals(result, doc.get());
+         
+     }
  
+     
+     public void testPerformWithGroupingAndComments() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "import b #comment\n"+
+         "import a\n"+
+         "\n"+
+         "from a import c #comment\n"+
+         "from a import f #comment2\n"+
+         "from a import e\n"+
+         "from b import d\n"+
+         "from a import b";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import b, e, c #comment\n"+
+         "from a import f #comment2\n"+
+         "from b import d\n"+
+         "import a\n"+
+         "import b #comment\n"+
+         "\n";
+         
+         assertEquals(result, doc.get());
+     }
+ 
+     
+     public void testPerformGroupingWithWraps() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "from a import cccccccccccccccccccccccccccccccccccccccccccccccccc\n"+ //50 * 'c'
+         "from a import eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\n"+
+         "from a import ffffffffffffffffffffffffffffffffffffffffffffffffff";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import (cccccccccccccccccccccccccccccccccccccccccccccccccc, \n" +
+         "    eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee, \n"+
+         "    ffffffffffffffffffffffffffffffffffffffffffffffffff)\n";
+         
+ //        System.out.println(">>"+doc.get()+"<<");
+         assertEquals(result, doc.get());
+     }
+     
+     
+     public void testPerformGroupingWithWraps3() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "from a import cccccccccc\n"+ //10 * 'c'
+         "from a import bbbbbbbbbb\n"+
+         "from a import aaaaaaaaaa\n"+
+         "from a import dddddddddd\n"+
+         "from a import eeeeeeeeee\n"+
+         "from a import ffffffffff\n" +
+         "from a import gggggggggg\n" +
+         "from a import hhhhhhhhhh\n" +
+         "";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import (aaaaaaaaaa, bbbbbbbbbb, cccccccccc, dddddddddd, eeeeeeeeee, \n"+
+         "    ffffffffff, gggggggggg, hhhhhhhhhh)\n";
+         
+ //        System.out.println(">>"+doc.get()+"<<");
+         assertEquals(result, doc.get());
+     }
+     
+     
+     public void testPerformGroupingWithWraps2() {
+         ImportsPreferencesPage.groupImportsForTests = true;
+         String d = ""+
+         "from a import cccccccccccccccccccccccccccccccccccccccccccccccccc\n"+ //50 * 'c'
+         "from a import eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee #comment 1\n"+
+         "from a import ffffffffffffffffffffffffffffffffffffffffffffffffff #comment 2";
+         
+         Document doc = new Document(d);
+         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
+         
+         String result = ""+
+         "from a import (cccccccccccccccccccccccccccccccccccccccccccccccccc, \n" +
+         "    eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee) #comment 1\n"+
+         "from a import ffffffffffffffffffffffffffffffffffffffffffffffffff #comment 2\n";
+         
+ //        System.out.println(">>"+doc.get()+"<<");
+         assertEquals(result, doc.get());
+     }
+     
+     
      public void testPerform2() {
          
***************
*** 83,87 ****
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
  String result = ""+header+
--- 204,208 ----
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
  String result = ""+header+
***************
*** 114,118 ****
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
  String result = ""+header+
--- 235,239 ----
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
  String result = ""+header+
***************
*** 143,147 ****
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
  String result = ""+header+
--- 264,268 ----
  
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
  String result = ""+header+
***************
*** 167,171 ****
          
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
          String result = ""+
--- 288,292 ----
          
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
          String result = ""+
***************
*** 188,192 ****
      	
      	Document doc = new Document(d);
!     	PyOrganizeImports.performArrangeImports(doc, "\n");
      	
      	String result = ""+
--- 309,313 ----
      	
      	Document doc = new Document(d);
!     	PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
      	
      	String result = ""+
***************
*** 207,211 ****
          
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n");
          
          assertEquals(d, doc.get());
--- 328,332 ----
          
          Document doc = new Document(d);
!         PyOrganizeImports.performArrangeImports(doc, "\n", "    ");
          
          assertEquals(d, doc.get());