[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/actions PyFormatStdTest.java,NONE,1.1 PyOrganizeImportsTest.java,NONE,1.1

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

Added Files:
	PyFormatStdTest.java PyOrganizeImportsTest.java 
Log Message:


--- NEW FILE: PyOrganizeImportsTest.java ---
/*
 * Created on Feb 21, 2005
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.actions;

import org.eclipse.jface.text.Document;

import junit.framework.TestCase;

/**
 * @author Fabio Zadrozny
 */
public class PyOrganizeImportsTest extends TestCase {

    public static void main(String[] args) {
        junit.textui.TestRunner.run(PyOrganizeImportsTest.class);
    }

    /*
     * @see TestCase#setUp()
     */
    protected void setUp() throws Exception {
        super.setUp();
    }

    /*
     * @see TestCase#tearDown()
     */
    protected void tearDown() throws Exception {
        super.tearDown();
    }

    public void testPerform() {
        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\n"+
"from a import c\n"+
"from b import d\n"+
"import a\n"+
"import b\n"+
"\n";

		assertEquals(result, doc.get());

    }

    public void testPerform2() {
        
        String header = ""+
"'''\n"+
"from fff import xxx #ignore\n"+
"import ggg #ignore\n"+
"import aaa #ignore\n"+
"'''\n";

        String d = ""+header+
"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 = ""+header+
"from a import b\n"+
"from a import c\n"+
"from b import d\n"+
"import a\n"+
"import b\n"+
"\n";

		assertEquals(result, doc.get());

    }

    public void testPerform3() {
        
        String header = ""+
"'''\n"+
"from fff import xxx #ignore\n"+
"import ggg #ignore\n"+
"import aaa #ignore'''\n";

        String d = ""+header+
"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 = ""+header+
"from a import b\n"+
"from a import c\n"+
"from b import d\n"+
"import a\n"+
"import b\n"+
"\n";

		assertEquals(result, doc.get());

    }

    public void testPerform4() {
        
        String header = ""+
"'''ignore'''\n"+
"from a import aaa\n";

        String d = ""+header+
"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 = ""+header+
"from a import b\n"+
"from a import c\n"+
"from b import d\n"+
"import a\n"+
"import b\n"+
"\n";

		assertEquals(result, doc.get());

    }

    
    public void testPerformSort(){
        String s = ""+
"line4\n"+
"line1\n"+
"line3\n"+ //end the selection
"line2\n";

        
        String result = ""+
"line1\n"+
"line3\n"+
"line4\n"+
"line2\n"; //not changed

        Document doc = new Document(s);
        PyOrganizeImports.performSimpleSort(doc, "\n",0,2);

		assertEquals(result, doc.get());
    }
}

--- NEW FILE: PyFormatStdTest.java ---
/*
 * Created on Feb 22, 2005
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.actions;

import org.python.pydev.editor.actions.PyFormatStd.FormatStd;

import junit.framework.TestCase;

/**
 * @author Fabio Zadrozny
 */
public class PyFormatStdTest extends TestCase {

    private PyFormatStd format;
    private FormatStd std;

    public static void main(String[] args) {
        junit.textui.TestRunner.run(PyFormatStdTest.class);
    }

    
    /**
     * @see junit.framework.TestCase#setUp()
     */
    protected void setUp() throws Exception {
        super.setUp();
        format = new PyFormatStd();
        std = new PyFormatStd.FormatStd();
    }
    
    public void testFormatComma(){
        std.spaceAfterComma = true;
        std.parametersWithSpace = false;

        String s = ""+
"def a(  a,b  ):\n"+
"    pass   \n";
        
        String s1 = ""+
"def a(a, b):\n"+
"    pass   \n";
        
        assertEquals(s1, PyFormatStd.formatStr(s, std));
    
        std.spaceAfterComma = false;

        String s2 = ""+
"def a(a,b):\n"+
"    pass   \n";
        
        assertEquals(s2, PyFormatStd.formatStr(s, std));
    
    }


    public void testFormatPar(){
        std.spaceAfterComma = true;
        std.parametersWithSpace = true;

        String s = ""+
"def a():\n"+
"    pass   \n";
        
        String s1 = ""+
"def a( ):\n"+
"    pass   \n";
        
        assertEquals(s1, PyFormatStd.formatStr(s, std));
    }


    public void testFormatComma2(){
        std.spaceAfterComma = true;
        std.parametersWithSpace = false;

        String s = ""+
"def a( a,   b):\n"+
"    pass   \n";
        
        String s1 = ""+
"def a(a, b):\n"+
"    pass   \n";
        
        assertEquals(s1, PyFormatStd.formatStr(s, std));
    
        std.spaceAfterComma = false;

        String s2 = ""+
"def a(a,b):\n"+
"    pass   \n";
        
        assertEquals(s2, PyFormatStd.formatStr(s, std));
    }

    

    public void testFormatCommaParams(){
        std.spaceAfterComma = true;
        std.parametersWithSpace = true;

        String s = ""+
"def a(a,   b):\n"+
"    pass   \n";
        
        String s1 = ""+
"def a( a, b ):\n"+
"    pass   \n";
        
        assertEquals(s1, PyFormatStd.formatStr(s, std));
    
        std.spaceAfterComma = false;

        String s2 = ""+
"def a( a,b ):\n"+
"    pass   \n";
        
        assertEquals(s2, PyFormatStd.formatStr(s, std));
    }

    public void testFormatInnerParams(){
        std.spaceAfterComma = true;
        std.parametersWithSpace = false;

        String s = ""+
"def a(a,   b):\n"+
"    return ( (a+b) + ( a+b ) )   \n";
        
        String s1 = ""+
"def a(a, b):\n"+
"    return ((a+b) + (a+b))   \n";
        
        assertEquals(s1, PyFormatStd.formatStr(s, std));
    

        std.parametersWithSpace = true;
        String s2 = ""+
"def a( a, b ):\n"+
"    return ( ( a+b ) + ( a+b ) )   \n";
        
        assertEquals(s2, PyFormatStd.formatStr(s, std));
    }

    
    

}