Revision 44797
| 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/TestDateExpressionBuilder.java | ||
|---|---|---|
| 207 | 207 |
|
| 208 | 208 |
} |
| 209 | 209 |
|
| 210 |
public void testConstant() {
|
|
| 211 |
ExpressionBuilder builder = createExpressionBuilder(); |
|
| 212 |
|
|
| 213 |
Value v = builder.constant(10,DataTypes.INT); |
|
| 214 |
assertEquals("10", v.toString());
|
|
| 215 |
|
|
| 216 |
v = builder.constant("10",DataTypes.INT);
|
|
| 217 |
assertEquals("10", v.toString());
|
|
| 218 |
|
|
| 219 |
v = builder.constant(10,DataTypes.LONG); |
|
| 220 |
assertEquals("10", v.toString());
|
|
| 221 |
|
|
| 222 |
v = builder.constant("10",DataTypes.LONG);
|
|
| 223 |
assertEquals("10", v.toString());
|
|
| 224 |
|
|
| 225 |
v = builder.constant(10.5,DataTypes.DOUBLE); |
|
| 226 |
assertEquals("10.5", v.toString());
|
|
| 227 |
|
|
| 228 |
v = builder.constant("10.5",DataTypes.DOUBLE);
|
|
| 229 |
// assertEquals("10.5", v.toString());
|
|
| 230 |
|
|
| 231 |
v = builder.constant(10,DataTypes.STRING); |
|
| 232 |
assertEquals("'10'", v.toString());
|
|
| 233 |
|
|
| 234 |
v = builder.constant(10.5,DataTypes.STRING); |
|
| 235 |
// assertEquals("'10.5'", v.toString());
|
|
| 236 |
|
|
| 237 |
} |
|
| 238 |
|
|
| 239 | 210 |
} |
| 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/TestExpressionBuilder.java | ||
|---|---|---|
| 5 | 5 |
import org.apache.commons.lang3.ArrayUtils; |
| 6 | 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 7 | 7 |
import org.gvsig.expressionevaluator.ExpressionUtils; |
| 8 |
import org.gvsig.tools.dataTypes.DataTypeUtils; |
|
| 9 |
import org.gvsig.tools.dataTypes.DataTypes; |
|
| 8 | 10 |
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer; |
| 9 | 11 |
|
| 10 | 12 |
public class TestExpressionBuilder extends TestCase {
|
| ... | ... | |
| 591 | 593 |
); |
| 592 | 594 |
} |
| 593 | 595 |
|
| 596 |
public void testConstant() {
|
|
| 597 |
ExpressionBuilder builder = createExpressionBuilder(); |
|
| 598 |
|
|
| 599 |
ExpressionBuilder.Value v = builder.constant(10,DataTypes.INT); |
|
| 600 |
assertEquals("10", v.toString());
|
|
| 601 |
|
|
| 602 |
v = builder.constant("10",DataTypes.INT);
|
|
| 603 |
assertEquals("10", v.toString());
|
|
| 604 |
|
|
| 605 |
v = builder.constant(10,DataTypes.LONG); |
|
| 606 |
assertEquals("10", v.toString());
|
|
| 607 |
|
|
| 608 |
v = builder.constant("10",DataTypes.LONG);
|
|
| 609 |
assertEquals("10", v.toString());
|
|
| 610 |
|
|
| 611 |
v = builder.constant(10.5,DataTypes.DOUBLE); |
|
| 612 |
assertEquals("10.5", v.toString());
|
|
| 613 |
|
|
| 614 |
v = builder.constant("10.5",DataTypes.DOUBLE);
|
|
| 615 |
assertEquals("10.5", v.toString());
|
|
| 616 |
|
|
| 617 |
v = builder.constant(10,DataTypes.STRING); |
|
| 618 |
assertEquals("'10'", v.toString());
|
|
| 619 |
|
|
| 620 |
v = builder.constant(10.5,DataTypes.STRING); |
|
| 621 |
assertEquals("'10.5'", v.toString());
|
|
| 622 |
|
|
| 623 |
} |
|
| 624 |
|
|
| 594 | 625 |
} |
| 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 | ||
|---|---|---|
| 405 | 405 |
|
| 406 | 406 |
Compiler compiler = createCompiler(); |
| 407 | 407 |
Code code = compiler.compileExpression(source); |
| 408 |
assertEquals("1.23E-4", code.toString());
|
|
| 408 |
assertEquals("0.000123", code.toString());
|
|
| 409 | 409 |
} |
| 410 | 410 |
|
| 411 | 411 |
public void testDecimal6() {
|
| ... | ... | |
| 429 | 429 |
|
| 430 | 430 |
Compiler compiler = createCompiler(); |
| 431 | 431 |
Code code = compiler.compileExpression(source); |
| 432 |
assertEquals("-1.23E-4", code.toString());
|
|
| 432 |
assertEquals("-0.000123", code.toString());
|
|
| 433 | 433 |
} |
| 434 | 434 |
|
| 435 | 435 |
|
| 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/TestOptimizer.java | ||
|---|---|---|
| 356 | 356 |
SymbolTable symbolTable = createSymbolTable(); |
| 357 | 357 |
Optimizer optimizer = createOptimizer(symbolTable); |
| 358 | 358 |
Code code2 = optimizer.optimize(code); |
| 359 |
assertEquals("(\"precio\" + 4.0)", code2.toString());
|
|
| 359 |
assertEquals("(\"precio\" + 4)", code2.toString());
|
|
| 360 | 360 |
} |
| 361 | 361 |
|
| 362 | 362 |
public void testConcat() {
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/repr/ReprNumber.java | ||
|---|---|---|
| 3 | 3 |
import org.gvsig.expressionevaluator.ReprMethod; |
| 4 | 4 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 5 | 5 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
| 6 |
import org.gvsig.tools.dataTypes.DataTypeUtils; |
|
| 6 | 7 |
|
| 7 | 8 |
|
| 8 | 9 |
/** |
| ... | ... | |
| 26 | 27 |
|
| 27 | 28 |
@Override |
| 28 | 29 |
public String repr(Object value) {
|
| 29 |
return ((Number)value).toString();
|
|
| 30 |
return DataTypeUtils.toString(value, null);
|
|
| 30 | 31 |
} |
| 31 | 32 |
|
| 32 | 33 |
public static void selfRegister() {
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.geometry/org.gvsig.expressionevaluator.geometry.lib/org.gvsig.expressionevaluator.geometry.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestCompiler.java | ||
|---|---|---|
| 405 | 405 |
|
| 406 | 406 |
Compiler compiler = createCompiler(); |
| 407 | 407 |
Code code = compiler.compileExpression(source); |
| 408 |
assertEquals("1.23E-4", code.toString());
|
|
| 408 |
assertEquals("0.000123", code.toString());
|
|
| 409 | 409 |
} |
| 410 | 410 |
|
| 411 | 411 |
public void testDecimal6() {
|
| ... | ... | |
| 429 | 429 |
|
| 430 | 430 |
Compiler compiler = createCompiler(); |
| 431 | 431 |
Code code = compiler.compileExpression(source); |
| 432 |
assertEquals("-1.23E-4", code.toString());
|
|
| 432 |
assertEquals("-0.000123", code.toString());
|
|
| 433 | 433 |
} |
| 434 | 434 |
|
| 435 | 435 |
|
Also available in: Unified diff