Revision 44006 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/TestCompiler.java

View differences:

TestCompiler.java
47 47

  
48 48
        Compiler compiler = createCompiler();
49 49
        Code code = compiler.compileExpression(source);
50
        assertEquals("[precio]", code.toString());
50
        assertEquals("\"precio\"", code.toString());
51 51
    }
52 52

  
53 53
    public void testIdentifier2() {
......
55 55

  
56 56
        Compiler compiler = createCompiler();
57 57
        Code code = compiler.compileExpression(source);
58
        assertEquals("[precio]", code.toString());
58
        assertEquals("\"precio\"", code.toString());
59 59
    }
60 60

  
61 61
    public void testIdentifier3() {
......
63 63

  
64 64
        Compiler compiler = createCompiler();
65 65
        Code code = compiler.compileExpression(source);
66
        assertEquals("[precio]", code.toString());
66
        assertEquals("\"precio\"", code.toString());
67 67
    }
68 68

  
69 69

  
......
112 112

  
113 113
        Compiler compiler = createCompiler();
114 114
        Code code = compiler.compileExpression(source);
115
        assertEquals(operatorName+"([precio], 23)", code.toString());
115
        assertEquals(operatorName+"(\"precio\", 23)", code.toString());
116 116
    }
117 117
    
118 118
    public void testOperators() {
......
141 141
        Compiler compiler = createCompiler();
142 142
        
143 143
        Code code = compiler.compileExpression(source);
144
        assertEquals("+(+(+([precio], *(10, 2)), 20), 30)", code.toString());
144
        assertEquals("+(+(+(\"precio\", *(10, 2)), 20), 30)", code.toString());
145 145
    }
146 146
    
147 147
    public void testAddMulPar() {
......
150 150
        Compiler compiler = createCompiler();
151 151
        
152 152
        Code code = compiler.compileExpression(source);
153
        assertEquals("+(+(*(+([precio], 10), 2), 20), 30)", code.toString());
153
        assertEquals("+(+(*(+(\"precio\", 10), 2), 20), 30)", code.toString());
154 154
    }
155 155
    
156 156
    public void testAbs() {
......
159 159
        Compiler compiler = createCompiler();
160 160
        
161 161
        Code code = compiler.compileExpression(source);
162
        assertEquals("+([precio], abs(10))", code.toString());
162
        assertEquals("+(\"precio\", abs(10))", code.toString());
163 163
    }
164 164
    
165 165
    public void testAbs2() {
......
168 168
        Compiler compiler = createCompiler();
169 169
        
170 170
        Code code = compiler.compileExpression(source);
171
        assertEquals("+([precio], abs(-10))", code.toString());
171
        assertEquals("+(\"precio\", abs(-10))", code.toString());
172 172
    }
173 173
    
174 174
    public void testPI() {
......
177 177
        Compiler compiler = createCompiler();
178 178
        
179 179
        Code code = compiler.compileExpression(source);
180
        assertEquals("+([precio], PI())", code.toString());
180
        assertEquals("+(\"precio\", PI())", code.toString());
181 181
    }
182 182
    
183 183
    public void testCeil() {
......
186 186
        Compiler compiler = createCompiler();
187 187
        
188 188
        Code code = compiler.compileExpression(source);
189
        assertEquals("+([precio], CEIL(PI()))", code.toString());
189
        assertEquals("+(\"precio\", CEIL(PI()))", code.toString());
190 190
    }
191 191
    
192 192
    public void testConcat() {
......
195 195
        Compiler compiler = createCompiler();
196 196
        
197 197
        Code code = compiler.compileExpression(source);
198
        assertEquals("CONCAT([precio], ' euros')", code.toString());
198
        assertEquals("CONCAT(\"precio\", ' euros')", code.toString());
199 199
    }
200 200
    
201 201
    public void test1() {
......
204 204
        Compiler compiler = createCompiler();
205 205
        
206 206
        Code code = compiler.compileExpression(source);
207
        assertEquals("=([NOMBRE03], 'Torre d'En Besora (la)')", code.toString());
207
        assertEquals("=(\"NOMBRE03\", 'Torre d'En Besora (la)')", code.toString());
208 208
    }
209 209
    
210 210
    public void test2() {
......
213 213
        Compiler compiler = createCompiler();
214 214
        
215 215
        Code code = compiler.compileExpression(source);
216
        assertEquals("=([1990], 0.168873933773767)", code.toString());
216
        assertEquals("=(\"1990\", 0.168873933773767)", code.toString());
217 217
    }
218 218

  
219 219
    public void test2fields() {
......
222 222
        Compiler compiler = createCompiler();
223 223
        
224 224
        Code code = compiler.compileExpression(source);
225
        assertEquals("=([1990], [precio])", code.toString());
225
        assertEquals("=(\"1990\", \"precio\")", code.toString());
226 226
    }
227 227
    
228 228
    
......
232 232
        Compiler compiler = createCompiler();
233 233
        
234 234
        Code code = compiler.compileExpression(source);
235
        assertEquals("ST_Area([GEOMETRY])", code.toString());
235
        assertEquals("ST_Area(\"GEOMETRY\")", code.toString());
236 236
    }
237 237

  
238 238
    public void testInvokeMethod1() {

Also available in: Unified diff