Revision 44139 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/TestSQLLexer.java

View differences:

TestSQLLexer.java
53 53
        String expression = "[precio]";
54 54

  
55 55
        LexicalAnalyzer lex = createLexicalAnalyzer(expression);
56
        lex.setUseBracketsForIdentifiers(true);
57
        
56 58
        Token t1 = lex.next();
57 59
        assertEquals(Token.IDENTIFIER, t1.getType());
58 60
        assertEquals("precio", t1.getLiteral());
......
125 127
        Token t1 = lex.next();
126 128
        assertEquals(Token.INTEGER_LITERAL, t1.getType());
127 129
        assertEquals("23", t1.getLiteral());
128
        assertEquals(new Long(23), t1.getValue());
130
        assertEquals((Integer)23, t1.getValue());
129 131
    }
130 132

  
131 133
    public void testDecimal() {
......
173 175
        Token t3 = lex.next();
174 176
        assertEquals(Token.INTEGER_LITERAL, t3.getType());
175 177
        assertEquals("23", t3.getLiteral());
176
        assertEquals(new Long(23), t3.getValue());
178
        assertEquals((Integer)23, t3.getValue());
177 179
    }
178 180
    
179 181
    public void testOperators() {
......
218 220
        t1 = lex.next();
219 221
        assertEquals(Token.INTEGER_LITERAL, t1.getType());
220 222
        assertEquals("23", t1.getLiteral());
221
        assertEquals(new Long(23), t1.getValue());
223
        assertEquals((Integer)23, t1.getValue());
222 224

  
223 225
        t1 = lex.next();
224 226
        assertEquals(Token.OP_ADD, t1.getType());
......
227 229
        t1 = lex.next();
228 230
        assertEquals(Token.INTEGER_LITERAL, t1.getType());
229 231
        assertEquals("5", t1.getLiteral());
230
        assertEquals(new Long(5), t1.getValue());
232
        assertEquals((Integer)5, t1.getValue());
231 233

  
232 234
        t1 = lex.next();
233 235
        assertEquals(Token.PARENTHESIS_CLOSE, t1.getType());
......
257 259
        t1 = lex.next();
258 260
        assertEquals(Token.INTEGER_LITERAL, t1.getType());
259 261
        assertEquals("23", t1.getLiteral());
260
        assertEquals(new Long(23), t1.getValue());
262
        assertEquals((Integer)23, t1.getValue());
261 263

  
262 264
        t1 = lex.next();
263 265
        assertEquals(Token.COMA, t1.getType());
......
266 268
        t1 = lex.next();
267 269
        assertEquals(Token.INTEGER_LITERAL, t1.getType());
268 270
        assertEquals("5", t1.getLiteral());
269
        assertEquals(new Long(5), t1.getValue());
271
        assertEquals((Integer)5, t1.getValue());
270 272

  
271 273
        t1 = lex.next();
272 274
        assertEquals(Token.PARENTHESIS_CLOSE, t1.getType());

Also available in: Unified diff