Revision 44750 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestGrammarCompiler.java

View differences:

TestGrammarCompiler.java
285 285

  
286 286
        Code code = compiler.compileExpression(source);
287 287
        link(code);
288
        assertEquals("CREATE_FUNCTION(FUNCTION_NAME:'test1', BODY:print('Hola'))", code.toString());
289
                     
288
        assertEquals("CREATE_FUNCTION('test1', NULL, print('Hola'), NULL, NULL, NULL)", code.toString());
289
                                      
290 290
    }
291 291
    
292 292
    public void testDef2() {
......
296 296

  
297 297
        Code code = compiler.compileExpression(source);
298 298
        link(code);
299
        assertEquals("CREATE_FUNCTION(FUNCTION_NAME:'test1', PARAMETERS:LIST('nombre'), BODY:print(('Hola ' + \"nombre\")))", code.toString());
299
        assertEquals("CREATE_FUNCTION('test1', LIST('nombre'), print(('Hola ' + \"nombre\")), NULL, NULL, NULL)", code.toString());
300 300
    }
301 301

  
302 302
    public void testDef3() {
......
306 306

  
307 307
        Code code = compiler.compileExpression(source);
308 308
        link(code);
309
        assertEquals("CREATE_FUNCTION(FUNCTION_NAME:'test1', PARAMETERS:LIST('nombre'), BODY:RETURN(('Hola ' || \"nombre\")))", code.toString());
309
        assertEquals("CREATE_FUNCTION('test1', LIST('nombre'), RETURN(('Hola ' || \"nombre\")), NULL, NULL, NULL)", code.toString());
310 310
    }
311 311
    
312 312
    public void testCreateFunctionExtern1() {
......
316 316

  
317 317
        Code code = compiler.compileExpression(source);
318 318
        link(code);
319
        assertEquals("CREATE_FUNCTION(FUNCTION_NAME:'test1', PARAMETERS:LIST('nombre'), SCRIPT_PATH:'addons/test/test', SCRIPT_FUNCTION:'test1', LANGUAGE:'cosa')", code.toString());
319
        assertEquals("CREATE_FUNCTION('test1', LIST('nombre'), NULL, 'addons/test/test', 'test1', 'cosa')", code.toString());
320 320
    }
321 321
    
322 322
    public void testList() {

Also available in: Unified diff