Revision 44098 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/TestInterpreter.java

View differences:

TestInterpreter.java
10 10
import org.gvsig.expressionevaluator.SymbolTable;
11 11
import org.gvsig.expressionevaluator.Interpreter;
12 12
import org.gvsig.expressionevaluator.Code;
13
import org.gvsig.expressionevaluator.impl.ExpressionEvaluatorImplLibrary;
13
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
14 14

  
15 15
public class TestInterpreter extends TestCase {
16 16
    
......
21 21
    @Override
22 22
    protected void setUp() throws Exception {
23 23
        super.setUp();
24
        new ExpressionEvaluatorImplLibrary().initialize();
24
        new DefaultLibrariesInitializer().fullInitialize();
25 25
    }
26 26
    
27 27
    @Override
......
125 125
        assertEquals(210, ((Number)v).intValue());
126 126
    }
127 127
    
128
    public void testSimpleAdd1() {
129
        String source = "5+10";
130

  
131
        SymbolTable symbolTable = createSymbolTable();
132
        Compiler compiler = createCompiler();
133
        Interpreter interpreter = createInterpreter(symbolTable);
134
        
135
        Code code = compiler.compileExpression(source);
136
        Object v = interpreter.run(code);
137
        assertEquals(15, ((Number)v).intValue());
138
    }
139
    
140
    public void testSimpleAdd2() {
141
        String source = "5 + 10";
142

  
143
        SymbolTable symbolTable = createSymbolTable();
144
        Compiler compiler = createCompiler();
145
        Interpreter interpreter = createInterpreter(symbolTable);
146
        
147
        Code code = compiler.compileExpression(source);
148
        Object v = interpreter.run(code);
149
        assertEquals(15, ((Number)v).intValue());
150
    }
151
    
152
    public void testSimpleAdd3() {
153
        String source = "10+-5";
154

  
155
        SymbolTable symbolTable = createSymbolTable();
156
        Compiler compiler = createCompiler();
157
        Interpreter interpreter = createInterpreter(symbolTable);
158
        
159
        Code code = compiler.compileExpression(source);
160
        Object v = interpreter.run(code);
161
        assertEquals(5, ((Number)v).intValue());
162
    }
163
    
164
    public void testSimpleSub1() {
165
        String source = "10-5";
166

  
167
        SymbolTable symbolTable = createSymbolTable();
168
        Compiler compiler = createCompiler();
169
        Interpreter interpreter = createInterpreter(symbolTable);
170
        
171
        Code code = compiler.compileExpression(source);
172
        Object v = interpreter.run(code);
173
        assertEquals(5, ((Number)v).intValue());
174
    }
175
    
176
    public void testSimpleSub2() {
177
        String source = "10 - 5";
178

  
179
        SymbolTable symbolTable = createSymbolTable();
180
        Compiler compiler = createCompiler();
181
        Interpreter interpreter = createInterpreter(symbolTable);
182
        
183
        Code code = compiler.compileExpression(source);
184
        Object v = interpreter.run(code);
185
        assertEquals(5, ((Number)v).intValue());
186
    }
187
    
188
    public void testSimpleNumber() {
189
        String source = "23";
190

  
191
        SymbolTable symbolTable = createSymbolTable();
192
        Compiler compiler = createCompiler();
193
        Interpreter interpreter = createInterpreter(symbolTable);
194
        
195
        Code code = compiler.compileExpression(source);
196
        Object v = interpreter.run(code);
197
        assertEquals(23, ((Number)v).intValue());
198
    }
199
    
200
    public void testSimpleNegativeNumber() {
201
        String source = "-23";
202

  
203
        SymbolTable symbolTable = createSymbolTable();
204
        Compiler compiler = createCompiler();
205
        Interpreter interpreter = createInterpreter(symbolTable);
206
        
207
        Code code = compiler.compileExpression(source);
208
        Object v = interpreter.run(code);
209
        assertEquals(-23, ((Number)v).intValue());
210
    }
211
    
212
    public void testNegateFunction() {
213
        String source = "-PI()";
214

  
215
        SymbolTable symbolTable = createSymbolTable();
216
        Compiler compiler = createCompiler();
217
        Interpreter interpreter = createInterpreter(symbolTable);
218
        
219
        Code code = compiler.compileExpression(source);
220
        Object v = interpreter.run(code);
221
        assertEquals(-Math.PI, ((Number)v).doubleValue());
222
    }
223
    
128 224
    public void testSub1() {
129 225
        String source = "precio - 10";
130 226

  

Also available in: Unified diff