Thread: [Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics AssistAssig
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2007-08-30 01:26:52
|
Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29242/tests/org/python/pydev/editor/correctionassist/heuristics Modified Files: AssistAssignTest.java Log Message: Assign to local variable/attribute handles constants correctly Index: AssistAssignTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistAssignTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AssistAssignTest.java 24 Feb 2007 19:28:10 -0000 1.6 --- AssistAssignTest.java 30 Aug 2007 01:26:49 -0000 1.7 *************** *** 50,54 **** AssistAssignTest test = new AssistAssignTest(); test.setUp(); ! test.testSimple4(); test.tearDown(); junit.textui.TestRunner.run(AssistAssignTest.class); --- 50,54 ---- AssistAssignTest test = new AssistAssignTest(); test.setUp(); ! test.testSimple9(); test.tearDown(); junit.textui.TestRunner.run(AssistAssignTest.class); *************** *** 84,88 **** assertEquals(true, assist.isValid(ps, sel, null, d.length())); ! List props = assist.getProps(ps, null, null, null, null, d.length()); assertEquals(2, props.size()); --- 84,88 ---- assertEquals(true, assist.isValid(ps, sel, null, d.length())); ! List<ICompletionProposal> props = assist.getProps(ps, null, null, null, null, d.length()); assertEquals(2, props.size()); *************** *** 201,204 **** --- 201,205 ---- assertContains("Assign to local (result)", props); } + public void testSimple6() throws BadLocationException { String d = ""+ *************** *** 214,217 **** --- 215,269 ---- } + public void testSimple7() throws BadLocationException { + String d = ""+ + "def m1():\n" + + " ALL_UPPERCASE"; + + Document doc = new Document(d); + + PySelection ps = new PySelection(doc, new TextSelection(doc, d.length(), 0)); + String sel = PyAction.getLineWithoutComments(ps); + + assertEquals(true, assist.isValid(ps, sel, null, d.length())); + List<ICompletionProposal> props = assist.getProps(ps, null, null, null, null, d.length()); + assertEquals(2, props.size()); + assertContains("Assign to local (all_uppercase)", props); + } + + public void testSimple8() throws BadLocationException { + assist = new AssistAssign(new NonCamelCodingStd()); + + String d = ""+ + "def m1():\n" + + " IKVMClass"; + + Document doc = new Document(d); + PySelection ps = new PySelection(doc, new TextSelection(doc, d.length(), 0)); + String sel = PyAction.getLineWithoutComments(ps); + + assertEquals(true, assist.isValid(ps, sel, null, d.length())); + List<ICompletionProposal> props = assist.getProps(ps, null, null, null, null, d.length()); + assertEquals(2, props.size()); + assertContains("Assign to local (ikvmclass)", props); + } + + public void testSimple9() throws BadLocationException { + assist = new AssistAssign(new NonCamelCodingStd()); + + String d = ""+ + "def m1():\n" + + " IKVMClassBBBar"; + + Document doc = new Document(d); + PySelection ps = new PySelection(doc, new TextSelection(doc, d.length(), 0)); + String sel = PyAction.getLineWithoutComments(ps); + + assertEquals(true, assist.isValid(ps, sel, null, d.length())); + List<ICompletionProposal> props = assist.getProps(ps, null, null, null, null, d.length()); + assertEquals(2, props.size()); + assertContains("Assign to local (ikvmclass_bbbar)", props); + } + + private void assertContains(String string, List<ICompletionProposal> props) { StringBuffer buffer = new StringBuffer("Available: \n"); |