Revision 44198 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/TestCase1.java

View differences:

TestCase1.java
5 5 
import org.cresques.cts.IProjection;
6 6 
import org.gvsig.expressionevaluator.Code;
7 7 
import org.gvsig.expressionevaluator.ExpressionBuilder;
8 
import org.gvsig.expressionevaluator.ExpressionBuilder.Config;
9 8 
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType;
10 9 
import org.gvsig.expressionevaluator.LexicalAnalyzer;
11 10 
import org.gvsig.expressionevaluator.impl.DefaultCompiler;
......
116 115 
                        builder.column("GEOMETRY")
117 116 
                )
118 117 
        );
119 
        builder.getConfig().set(Config.geometry_type_support, GeometrySupportType.WKT);
118 
        builder.geometry_support_type(GeometrySupportType.WKT);
120 119 
        System.out.println(expr2.toString());
121 120 
        assertEquals(
122 
                "( (\"campo1\") > (10) ) AND ST_Intersects((ST_GeomFromText('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', (4326))), (\"GEOMETRY\"))",
121 
                "( (\"campo1\") > (10) ) AND ST_Intersects((ST_GeomFromText(('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))'), (4326))), (\"GEOMETRY\"))",
123 122 
                expr2.toString()
124 123 
        );
125 
        builder.getConfig().set(Config.geometry_type_support, GeometrySupportType.WKB);
124 
        builder.geometry_support_type(GeometrySupportType.WKB);
126 125 
        System.out.println(expr2.toString());
127 126 
        assertEquals(
128 127 
                "( (\"campo1\") > (10) ) AND ST_Intersects((ST_GeomFromWKB((DECODE('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000','hex')), (4326))), (\"GEOMETRY\"))",
......
145 144 
        Compiler compiler = createCompiler();
146 145 
        Code code;
147 146
148 
        builder.getConfig().set(Config.geometry_type_support, GeometrySupportType.WKT);
147 
        builder.geometry_support_type(GeometrySupportType.WKT);
149 148 
        code = compiler.compileExpression(expr2.toString());
150 149 
        System.out.println(code.toString());
151 150 
        assertEquals(
152 
                "AND(>(\"campo1\", 10), ST_Intersects(ST_GeomFromText('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', 4326), \"GEOMETRY\"))",
151 
                "((\"campo1\" > 10) AND ST_Intersects(ST_GeomFromText('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', 4326), \"GEOMETRY\"))",
153 152 
                code.toString()
154 153 
        );
155 154 

  		




  156
  
  
    
        builder.getConfig().set(Config.geometry_type_support, GeometrySupportType.WKB);


  		




  
  155
  
    
        builder.geometry_support_type(GeometrySupportType.WKB);


  		




  157
  156
  
    
        code = compiler.compileExpression(expr2.toString());


  		




  158
  157
  
    
        System.out.println(code.toString());


  		




  159
  158
  
    
        assertEquals(


  		




  160
  
  
    
                "AND(>(\"campo1\", 10), ST_Intersects(ST_GeomFromWKB(DECODE('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000', 'hex'), 4326), \"GEOMETRY\"))", 


  		




  
  159
  
    
                "((\"campo1\" > 10) AND ST_Intersects(ST_GeomFromWKB(DECODE('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000', 'hex'), 4326), \"GEOMETRY\"))", 


  		




  161
  160
  
    
                code.toString()


  		




  162
  161
  
    
        );


  		




  163
  162
  
    
        


  		




  ......




  166
  165
  
    
    public void testRunExpression() throws Exception {


  		




  167
  166
  
    

  		




  168
  167
  
    
        ExpressionBuilder builder = new DefaultExpressionBuilder();


  		




  169
  
  
    
        builder.getConfig().set(Config.geometry_type_support, GeometrySupportType.WKB);


  		




  
  168
  
    
        builder.geometry_support_type(GeometrySupportType.WKB);


  		




  170
  169
  
    
        


  		




  171
  170
  
    
        String expr2 = builder.and(


  		




  172
  171
  
    
            builder.custom(this.createExpr1()),


  		












Also available in:  Unified diff