Revision 44748 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.geometry/org.gvsig.expressionevaluator.geometry.lib/org.gvsig.expressionevaluator.geometry.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestExpressionBuilderFormatter.java

View differences:

TestExpressionBuilderFormatter.java
6 6 
import junit.framework.TestCase;
7 7 
import org.apache.commons.lang3.ArrayUtils;
8 8 
import org.apache.commons.lang3.StringUtils;
9 
import org.apache.commons.lang3.tuple.Pair;
9 10 
import org.cresques.cts.IProjection;
10 11 
import org.gvsig.expressionevaluator.Formatter;
11 12 
import org.gvsig.expressionevaluator.ExpressionBuilder;
......
97 98 

  		




  98
  99
  
    
            @Override


  		




  99
  100
  
    
            public String format(Value function) {


  		




  100
  
  
    
                List<Value> parameters = ((Function)function).parameters();


  		




  101
  
  
    
                String p1 = parameters.get(0).toString(formatter());


  		




  102
  
  
    
                String p2 = parameters.get(1).toString(formatter());


  		




  
  101
  
    
                List<Pair<String,Value>> parameters = ((Function)function).parameters();


  		




  
  102
  
    
                String p1 = parameters.get(0).getValue().toString(formatter());


  		




  
  103
  
    
                String p2 = parameters.get(1).getValue().toString(formatter());


  		




  103
  104
  
    
                String r = MessageFormat.format(


  		




  104
  105
  
    
                        "( (({0}) && ({1})) AND ST_Intersects(({0}),({1}) ))", 


  		




  105
  106
  
    
                        p1,


  		




  ......




  121
  122
  
    

  		




  122
  123
  
    
            @Override


  		




  123
  124
  
    
            public String format(Value function) {


  		




  124
  
  
    
                List<Value> parameters = ((Function)function).parameters();


  		




  125
  
  
    
                String p1 = parameters.get(0).toString(formatter());


  		




  126
  
  
    
                String p2 = parameters.get(1).toString(formatter());


  		




  
  125
  
    
                List<Pair<String,Value>> parameters = ((Function)function).parameters();


  		




  
  126
  
    
                String p1 = parameters.get(0).getValue().toString(formatter());


  		




  
  127
  
    
                String p2 = parameters.get(1).getValue().toString(formatter());


  		




  127
  128
  
    
                String r = MessageFormat.format(


  		




  128
  129
  
    
                        "GeomFromWKB({0}, {1})", 


  		




  129
  130
  
    
                        p1,


  		




  ......




  145
  146
  
    

  		




  146
  147
  
    
            @Override


  		




  147
  148
  
    
            public String format(Value function) {


  		




  148
  
  
    
                List<Value> parameters = ((Function)function).parameters();


  		




  149
  
  
    
                String p1 = parameters.get(0).toString(formatter());


  		




  150
  
  
    
                String p2 = parameters.get(1).toString(formatter());


  		




  151
  
  
    
                String p3 = parameters.get(2).toString(formatter());


  		




  
  149
  
    
                List<Pair<String,Value>> parameters = ((Function)function).parameters();


  		




  
  150
  
    
                String p1 = parameters.get(0).getValue().toString(formatter());


  		




  
  151
  
    
                String p2 = parameters.get(1).getValue().toString(formatter());


  		




  
  152
  
    
                String p3 = parameters.get(2).getValue().toString(formatter());


  		




  152
  153
  
    
                String r = MessageFormat.format(


  		




  153
  154
  
    
                        "NVL2({0}, {1}, {2})", 


  		




  154
  155
  
    
                        p1,


  		




  ......




  171
  172
  
    

  		




  172
  173
  
    
            @Override


  		




  173
  174
  
    
            public String format(Value function) {


  		




  174
  
  
    
                List<Value> parameters = ((Function)function).parameters();


  		




  175
  
  
    
                String p1 = parameters.get(0).toString(formatter());


  		




  
  175
  
    
                List<Pair<String,Value>> parameters = ((Function)function).parameters();


  		




  
  176
  
    
                String p1 = parameters.get(0).getValue().toString(formatter());


  		




  176
  177
  
    
                String r = MessageFormat.format(


  		




  177
  178
  
    
                        "AsWKB(({0}))", 


  		




  178
  179
  
    
                        p1


  		




  ......




  193
  194
  
    

  		




  194
  195
  
    
            @Override


  		




  195
  196
  
    
            public String format(Value function) {


  		




  196
  
  
    
                List<Value> parameters = ((Function)function).parameters();


  		




  197
  
  
    
                String p1 = parameters.get(0).toString(MyFormatter.this);


  		




  
  197
  
    
                List<Pair<String,Value>> parameters = ((Function)function).parameters();


  		




  
  198
  
    
                String p1 = parameters.get(0).getValue().toString(formatter());


  		




  198
  199
  
    
                String r = MessageFormat.format(


  		




  199
  200
  
    
                        "( ({0}) IS NOT NULL )", 


  		




  200
  201
  
    
                        p1


  		












Also available in:  Unified diff