Revision 43521 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
2 2

  
3 3
import org.gvsig.expressionevaluator.impl.SQLLexicalAnalyzer;
4 4
import org.gvsig.expressionevaluator.impl.DefaultCompiler;
5
import static junit.framework.Assert.assertEquals;
6 5
import junit.framework.TestCase;
7 6
import org.gvsig.expressionevaluator.LexicalAnalyzer;
8 7
import org.gvsig.expressionevaluator.Compiler;
......
45 44

  
46 45
        Compiler compiler = createCompiler();
47 46
        Code code = compiler.compileExpression(source);
48
        assertEquals("precio", code.toString());
47
        assertEquals("[precio]", code.toString());
49 48
    }
50 49

  
51 50
    public void testIdentifier2() {
......
53 52

  
54 53
        Compiler compiler = createCompiler();
55 54
        Code code = compiler.compileExpression(source);
56
        assertEquals("precio", code.toString());
55
        assertEquals("[precio]", code.toString());
57 56
    }
58 57

  
59 58
    public void testIdentifier3() {
......
61 60

  
62 61
        Compiler compiler = createCompiler();
63 62
        Code code = compiler.compileExpression(source);
64
        assertEquals("precio", code.toString());
63
        assertEquals("[precio]", code.toString());
65 64
    }
66 65

  
67 66

  
......
110 109

  
111 110
        Compiler compiler = createCompiler();
112 111
        Code code = compiler.compileExpression(source);
113
        assertEquals(operatorName+"(precio, 23)", code.toString());
112
        assertEquals(operatorName+"([precio], 23)", code.toString());
114 113
    }
115 114
    
116 115
    public void testOperators() {
......
139 138
        Compiler compiler = createCompiler();
140 139
        
141 140
        Code code = compiler.compileExpression(source);
142
        assertEquals("+(+(+(precio, *(10, 2)), 20), 30)", code.toString());
141
        assertEquals("+(+(+([precio], *(10, 2)), 20), 30)", code.toString());
143 142
    }
144 143
    
145 144
    public void testAddMulPar() {
......
148 147
        Compiler compiler = createCompiler();
149 148
        
150 149
        Code code = compiler.compileExpression(source);
151
        assertEquals("+(+(*(+(precio, 10), 2), 20), 30)", code.toString());
150
        assertEquals("+(+(*(+([precio], 10), 2), 20), 30)", code.toString());
152 151
    }
153 152
    
154 153
    public void testAbs() {
......
157 156
        Compiler compiler = createCompiler();
158 157
        
159 158
        Code code = compiler.compileExpression(source);
160
        assertEquals("+(precio, abs(10))", code.toString());
159
        assertEquals("+([precio], abs(10))", code.toString());
161 160
    }
162 161
    
163 162
    public void testAbs2() {
......
166 165
        Compiler compiler = createCompiler();
167 166
        
168 167
        Code code = compiler.compileExpression(source);
169
        assertEquals("+(precio, abs(-10))", code.toString());
168
        assertEquals("+([precio], abs(-10))", code.toString());
170 169
    }
171 170
    
172 171
    public void testPI() {
......
175 174
        Compiler compiler = createCompiler();
176 175
        
177 176
        Code code = compiler.compileExpression(source);
178
        assertEquals("+(precio, PI())", code.toString());
177
        assertEquals("+([precio], PI())", code.toString());
179 178
    }
180 179
    
181 180
    public void testCeil() {
......
184 183
        Compiler compiler = createCompiler();
185 184
        
186 185
        Code code = compiler.compileExpression(source);
187
        assertEquals("+(precio, CEIL(PI()))", code.toString());
186
        assertEquals("+([precio], CEIL(PI()))", code.toString());
188 187
    }
189 188
    
190 189
    public void testConcat() {
......
193 192
        Compiler compiler = createCompiler();
194 193
        
195 194
        Code code = compiler.compileExpression(source);
196
        assertEquals("CONCAT(precio, ' euros')", code.toString());
195
        assertEquals("CONCAT([precio], ' euros')", code.toString());
197 196
    }
198 197
    
198
    public void test1() {
199
        String source = "NOMBRE03 = 'Torre d''En Besora (la)'";
200

  
201
        Compiler compiler = createCompiler();
202
        
203
        Code code = compiler.compileExpression(source);
204
        assertEquals("=([NOMBRE03], 'Torre d'En Besora (la)')", code.toString());
205
    }
206
    
207
    public void test2() {
208
        String source = "[1990] = 0.168873933773767";
209

  
210
        Compiler compiler = createCompiler();
211
        
212
        Code code = compiler.compileExpression(source);
213
        assertEquals("=([1990], 0.168873933773767)", code.toString());
214
    }
215
    
199 216
}

Also available in: Unified diff