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

View differences:

TestCompiler.java
117 117

  
118 118
        Compiler compiler = createCompiler();
119 119
        Code code = compiler.compileExpression(source);
120
        assertEquals(operatorName+"(\"precio\", 23)", code.toString());
120
        assertEquals("(\"precio\" "+ operatorName + " 23)", code.toString());
121 121
    }
122 122
    
123 123
    public void testOperators() {
......
148 148
        Compiler compiler = createCompiler();
149 149
        
150 150
        Code code = compiler.compileExpression(source);
151
        assertEquals("+(+(+(\"precio\", *(10, 2)), 20), 30)", code.toString());
151
        assertEquals("(((\"precio\" + (10 * 2)) + 20) + 30)", code.toString());
152 152
    }
153 153
    
154 154
    public void testAddMulPar() {
......
157 157
        Compiler compiler = createCompiler();
158 158
        
159 159
        Code code = compiler.compileExpression(source);
160
        assertEquals("+(+(*(+(\"precio\", 10), 2), 20), 30)", code.toString());
160
        assertEquals("((((\"precio\" + 10) * 2) + 20) + 30)", code.toString());
161 161
    }
162 162
    
163 163
    public void testAbs() {
......
166 166
        Compiler compiler = createCompiler();
167 167
        
168 168
        Code code = compiler.compileExpression(source);
169
        assertEquals("+(\"precio\", abs(10))", code.toString());
169
        assertEquals("(\"precio\" + abs(10))", code.toString());
170 170
    }
171 171
    
172 172
    public void testAbs2() {
......
175 175
        Compiler compiler = createCompiler();
176 176
        
177 177
        Code code = compiler.compileExpression(source);
178
        assertEquals("+(\"precio\", abs(NEGATE(10)))", code.toString());
178
        assertEquals("(\"precio\" + abs(-(10)))", code.toString());
179 179
    }
180 180
    
181 181
    public void testPI() {
......
184 184
        Compiler compiler = createCompiler();
185 185
        
186 186
        Code code = compiler.compileExpression(source);
187
        assertEquals("+(\"precio\", PI())", code.toString());
187
        assertEquals("(\"precio\" + PI())", code.toString());
188 188
    }
189 189
    
190 190
    public void testCeil() {
......
193 193
        Compiler compiler = createCompiler();
194 194
        
195 195
        Code code = compiler.compileExpression(source);
196
        assertEquals("+(\"precio\", CEIL(PI()))", code.toString());
196
        assertEquals("(\"precio\" + CEIL(PI()))", code.toString());
197 197
    }
198 198
    
199 199
    public void testGetitem1() {
......
220 220
        Compiler compiler = createCompiler();
221 221
        
222 222
        Code code = compiler.compileExpression(source);
223
        assertEquals("=(\"NOMBRE03\", 'Torre d'En Besora (la)')", code.toString());
223
        assertEquals("(\"NOMBRE03\" = 'Torre d''En Besora (la)')", code.toString());
224 224
    }
225 225
    
226 226
    public void test2() {
......
230 230
        String source = "[1990] = 0.168873933773767";
231 231

  
232 232
        Code code = compiler.compileExpression(source);
233
        assertEquals("=(\"1990\", 0.168873933773767)", code.toString());
233
        assertEquals("(\"1990\" = 0.168873933773767)", code.toString());
234 234
    }
235 235

  
236 236
    public void test2fields() {
......
240 240
        String source = "[1990] = [precio]";
241 241

  
242 242
        Code code = compiler.compileExpression(source);
243
        assertEquals("=(\"1990\", \"precio\")", code.toString());
243
        assertEquals("(\"1990\" = \"precio\")", code.toString());
244 244
    }
245 245
    
246 246
    

Also available in: Unified diff