Revision 28840 branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/feature/BaseTestFeatureStore.java
BaseTestFeatureStore.java | ||
---|---|---|
319 | 319 |
if (!iter2.hasNext()) { |
320 | 320 |
return true; |
321 | 321 |
} else { |
322 |
System.out |
|
323 |
.println("BaseTestFeatureStore.compareFeatureIterators() size !="); |
|
322 |
getLogger().warn("size !="); |
|
324 | 323 |
return false; |
325 | 324 |
} |
326 | 325 |
|
... | ... | |
344 | 343 |
|
345 | 344 |
protected boolean compareTypes(FeatureType ft1, FeatureType ft2) { |
346 | 345 |
if (ft1.size() != ft2.size()) { |
347 |
System.out.println("BaseTestFeatureStore.compareTypes(): size !=");
|
|
346 |
getLogger().warn("size !=");
|
|
348 | 347 |
return false; |
349 | 348 |
} |
350 | 349 |
if (ft1.getDefaultGeometryAttributeIndex() != ft2 |
351 | 350 |
.getDefaultGeometryAttributeIndex()) { |
352 |
System.out |
|
353 |
.println("BaseTestFeatureStore.compareTypes(): getDefaultGeometryAttributeIndex !="); |
|
351 |
getLogger().warn("getDefaultGeometryAttributeIndex !="); |
|
354 | 352 |
return false; |
355 | 353 |
} |
356 | 354 |
if (ft1.getDefaultGeometryAttributeIndex() > -1) { |
357 | 355 |
if (ft1.getDefaultSRS() != null) { |
358 | 356 |
if (!ft1.getDefaultSRS().equals(ft2.getDefaultSRS())) { |
359 |
System.out |
|
360 |
.println("BaseTestFeatureStore.compareTypes(): getDefaultSRS !="); |
|
357 |
getLogger().warn("getDefaultSRS !="); |
|
361 | 358 |
return false; |
362 | 359 |
} |
363 | 360 |
|
364 | 361 |
} else { |
365 | 362 |
if (ft2.getDefaultSRS() != null) { |
366 |
System.out |
|
367 |
.println("BaseTestFeatureStore.compareTypes(): getDefaultSRS !="); |
|
368 |
|
|
363 |
getLogger().warn("getDefaultSRS !="); |
|
369 | 364 |
return false; |
370 | 365 |
} |
371 | 366 |
} |
... | ... | |
374 | 369 |
if (ft1.getDefaultGeometryAttributeName() != null) { |
375 | 370 |
if (!ft1.getDefaultGeometryAttributeName().equals( |
376 | 371 |
ft2.getDefaultGeometryAttributeName())) { |
377 |
System.out |
|
378 |
.println("BaseTestFeatureStore.compareTypes(): getDefaultGeometryAttributeName !="); |
|
372 |
getLogger().warn("getDefaultGeometryAttributeName !="); |
|
379 | 373 |
|
380 | 374 |
return false; |
381 | 375 |
} |
382 | 376 |
} else { |
383 | 377 |
if (ft2.getDefaultGeometryAttributeName() != null) { |
384 |
System.out |
|
385 |
.println("BaseTestFeatureStore.compareTypes(): getDefaultGeometryAttributeName !="); |
|
378 |
getLogger().warn("getDefaultGeometryAttributeName !="); |
|
386 | 379 |
return false; |
387 | 380 |
} |
388 | 381 |
} |
... | ... | |
406 | 399 |
protected boolean compareAttributes(FeatureAttributeDescriptor attr1, |
407 | 400 |
FeatureAttributeDescriptor attr2) { |
408 | 401 |
if (attr1 == null || attr2 == null) { |
409 |
System.out |
|
410 |
.println("BaseTestFeatureStore.compareAttributes() attr1 == null || attr2 == null"); |
|
402 |
getLogger().warn("attr1 == null || attr2 == null"); |
|
411 | 403 |
return false; |
412 | 404 |
} |
413 | 405 |
if (!attr1.getName().equals(attr2.getName())) { |
414 |
System.out |
|
415 |
.println("BaseTestFeatureStore.compareAttributes() name != "); |
|
406 |
getLogger().warn("name != "); |
|
416 | 407 |
return false; |
417 | 408 |
} |
418 | 409 |
|
419 | 410 |
if (attr1.getDataType() != attr2.getDataType()) { |
420 |
System.out |
|
421 |
.println("BaseTestFeatureStore.compareAttributes() dataType != "); |
|
411 |
getLogger().warn("dataType != "); |
|
422 | 412 |
return false; |
423 | 413 |
} |
424 | 414 |
|
425 | 415 |
if (attr1.getSize() != attr2.getSize()) { |
426 |
System.out |
|
427 |
.println("BaseTestFeatureStore.compareAttributes() size != "); |
|
416 |
getLogger().warn("size != "); |
|
428 | 417 |
return false; |
429 | 418 |
} |
430 | 419 |
|
431 | 420 |
if (attr1.getPrecision() != attr2.getPrecision()) { |
432 |
System.out |
|
433 |
.println("BaseTestFeatureStore.compareAttributes() precision != "); |
|
421 |
getLogger().warn("precision != "); |
|
434 | 422 |
return false; |
435 | 423 |
} |
436 | 424 |
|
437 | 425 |
if (attr1.getGeometryType() != attr2.getGeometryType()) { |
438 |
System.out |
|
439 |
.println("BaseTestFeatureStore.compareAttributes() GeometryType != "); |
|
426 |
getLogger().warn("GeometryType != "); |
|
440 | 427 |
return false; |
441 | 428 |
} |
442 | 429 |
|
443 | 430 |
if (attr1.getGeometrySubType() != attr2.getGeometrySubType()) { |
444 |
System.out |
|
445 |
.println("BaseTestFeatureStore.compareAttributes() GeometrySubType != "); |
|
431 |
getLogger().warn("GeometrySubType != "); |
|
446 | 432 |
return false; |
447 | 433 |
} |
448 | 434 |
|
449 | 435 |
if (attr1.getSRS() != null) { |
450 | 436 |
if (!attr1.getSRS().equals(attr2.getSRS())) { |
451 |
System.out |
|
452 |
.println("BaseTestFeatureStore.compareAttributes() srs != "); |
|
437 |
getLogger().warn("srs != "); |
|
453 | 438 |
return false; |
454 | 439 |
} |
455 | 440 |
} else { |
456 | 441 |
if (attr2.getSRS() != null) { |
457 |
System.out |
|
458 |
.println("BaseTestFeatureStore.compareAttributes() srs != "); |
|
442 |
getLogger().warn("srs != "); |
|
459 | 443 |
return false; |
460 | 444 |
} |
461 | 445 |
} |
... | ... | |
488 | 472 |
|
489 | 473 |
protected boolean compareFeatures(Feature f1, Feature f2) { |
490 | 474 |
if (!compareTypes(f1.getType(), f2.getType())) { |
491 |
System.out.println("compareFeatures() type !="); |
|
492 | 475 |
return false; |
493 | 476 |
} |
494 | 477 |
Iterator iter = f1.getType().iterator(); |
... | ... | |
511 | 494 |
FeatureAttributeDescriptor attr) { |
512 | 495 |
|
513 | 496 |
if ((v1 == null || v2 == null) && !attr.allowNull() ){ |
514 |
System.out |
|
515 |
.println("BaseTestFeatureStore.compareFeatureValue() null and !allowNull:" |
|
497 |
getLogger().warn("null and !allowNull:" |
|
516 | 498 |
+ attr.getName()); |
517 | 499 |
return false; |
518 | 500 |
} |
... | ... | |
520 | 502 |
if (v1 == v2) { |
521 | 503 |
return true; |
522 | 504 |
} else if (v1 == null) { |
523 |
getLogger().debug( |
|
524 |
"BaseTestFeatureStore.compareFeatureValue() v1 == null and v2 != null:" |
|
505 |
getLogger().warn(" v1 == null and v2 != null:" |
|
525 | 506 |
+ attr.getName()); |
526 | 507 |
return false; |
527 | 508 |
} else if (v2 == null) { |
528 |
getLogger().debug( |
|
529 |
"BaseTestFeatureStore.compareFeatureValue() v2 == null and v1 != null:" |
|
509 |
getLogger().warn("v2 == null and v1 != null:" |
|
530 | 510 |
+ attr.getName()); |
531 | 511 |
return false; |
532 | 512 |
|
... | ... | |
539 | 519 |
Geometry geom1 = (Geometry) v1; |
540 | 520 |
Geometry geom2 = (Geometry) v2; |
541 | 521 |
if (!geom1.equals(geom2)) { |
542 |
getLogger().debug( |
|
543 |
"BaseTestFeatureStore.compareFeatureValue() v1 != v2 (Geom):" |
|
544 |
+ attr.getName()); |
|
522 |
getLogger().warn(" v1 != v2 (Geom):" + attr.getName()); |
|
545 | 523 |
return false; |
546 | 524 |
|
547 | 525 |
} |
... | ... | |
550 | 528 |
double diff = ((Double) v1).doubleValue() |
551 | 529 |
- ((Double) v1).doubleValue(); |
552 | 530 |
if (!(Math.abs(diff) < 0.000001)) { |
553 |
getLogger().debug( |
|
554 |
"BaseTestFeatureStore.compareFeatureValue() v1 != v2 (Dobule):" |
|
555 |
+ attr.getName()); |
|
531 |
getLogger().warn(" v1 != v2 (Dobule):" + attr.getName()); |
|
556 | 532 |
return false; |
557 | 533 |
|
558 | 534 |
} |
... | ... | |
562 | 538 |
byte[] bytes1 = (byte[]) v1; |
563 | 539 |
byte[] bytes2 = (byte[]) v2; |
564 | 540 |
if (bytes1.length != bytes2.length) { |
565 |
getLogger().debug( |
|
566 |
"BaseTestFeatureStore.compareFeatureValue() v1.length != v2.length (byte []):" |
|
567 |
+ attr.getName()); |
|
541 |
getLogger().warn( |
|
542 |
"v1.length != v2.length (byte []):" + attr.getName()); |
|
568 | 543 |
return false; |
569 | 544 |
} |
570 | 545 |
for (int i = 0; i < bytes1.length; i++) { |
571 | 546 |
if (bytes1[i] != bytes2[i]) { |
572 |
getLogger().debug( |
|
573 |
"BaseTestFeatureStore.compareFeatureValue() v1[" |
|
574 |
+ i |
|
575 |
+ "] != v2[" |
|
576 |
+ i |
|
577 |
+ "] (byte []):" |
|
547 |
getLogger().warn( |
|
548 |
" v1[" + i + "] != v2[" + i + "] (byte []):" |
|
578 | 549 |
+ attr.getName()); |
579 | 550 |
return false; |
580 | 551 |
} |
581 | 552 |
} |
582 | 553 |
return true; |
583 | 554 |
|
584 |
default:
|
|
555 |
case DataTypes.OBJECT:
|
|
585 | 556 |
if (!v1.equals(v2)) { |
586 |
getLogger().debug( |
|
587 |
"BaseTestFeatureStore.compareFeatureValue() v1 != v2:" |
|
588 |
+ attr.getName() + " [ignored]"); |
|
557 |
getLogger().warn( |
|
558 |
" v1 != v2 (object):" + attr.getName() + " [ignored]"); |
|
589 | 559 |
|
590 | 560 |
} |
591 | 561 |
return true; |
562 |
|
|
563 |
default: |
|
564 |
if (!v1.equals(v2)) { |
|
565 |
getLogger() |
|
566 |
.warn( |
|
567 |
" v1 != v2:" + attr.getName() + ": " + v1 |
|
568 |
+ " != " + v2); |
|
569 |
return false; |
|
570 |
} |
|
592 | 571 |
} |
572 |
return true; |
|
593 | 573 |
|
594 | 574 |
} |
595 | 575 |
|
... | ... | |
1256 | 1236 |
v1 = feature.get(attr.getIndex()); |
1257 | 1237 |
v2 = feature1.get(attr.getIndex()); |
1258 | 1238 |
if (attr.getDataType() == DataTypes.STRING) { |
1259 |
if (v1 != null) {
|
|
1260 |
v1 = ((String) v1).toLowerCase();
|
|
1239 |
if (v2 != null) {
|
|
1240 |
v2 = ((String) v2).toLowerCase();
|
|
1261 | 1241 |
} |
1262 | 1242 |
|
1263 | 1243 |
} |
1264 |
compareFeatureValue(v1, v2, attr);
|
|
1244 |
assertTrue(compareFeatureValue(v1, v2, attr));
|
|
1265 | 1245 |
} |
1266 | 1246 |
} |
1267 | 1247 |
assertFalse(iter1.hasNext()); |
... | ... | |
1305 | 1285 |
v1 = feature.get(attr.getIndex()); |
1306 | 1286 |
v2 = feature1.get(attr.getIndex()); |
1307 | 1287 |
if (attr.getDataType() == DataTypes.STRING) { |
1308 |
if (v1 != null) {
|
|
1309 |
v1 = ((String) v1).toUpperCase();
|
|
1288 |
if (v2 != null) {
|
|
1289 |
v2 = ((String) v2).toUpperCase();
|
|
1310 | 1290 |
} |
1311 | 1291 |
|
1312 | 1292 |
} |
... | ... | |
1352 | 1332 |
v1 = feature.get("_" + attr.getName()); |
1353 | 1333 |
v2 = feature1.get(attr.getIndex()); |
1354 | 1334 |
if (attr.getDataType() == DataTypes.STRING) { |
1355 |
if (v1 != null) {
|
|
1356 |
v1 = ((String) v1).toUpperCase();
|
|
1335 |
if (v2 != null) {
|
|
1336 |
v2 = ((String) v2).toUpperCase();
|
|
1357 | 1337 |
} |
1358 | 1338 |
|
1359 | 1339 |
} |
... | ... | |
1398 | 1378 |
v1 = feature.get("_" + attr.getName()); |
1399 | 1379 |
v2 = feature1.get(attr.getIndex()); |
1400 | 1380 |
if (attr.getDataType() == DataTypes.STRING) { |
1401 |
if (v1 != null) {
|
|
1402 |
v1 = ((String) v1).toUpperCase();
|
|
1381 |
if (v2 != null) {
|
|
1382 |
v2 = ((String) v2).toUpperCase();
|
|
1403 | 1383 |
} |
1404 | 1384 |
|
1405 | 1385 |
} |
... | ... | |
1448 | 1428 |
v1 = feature.get("_" + attr.getName()); |
1449 | 1429 |
v2 = feature1.get(attr.getIndex()); |
1450 | 1430 |
if (attr.getDataType() == DataTypes.STRING) { |
1451 |
if (v1 != null) {
|
|
1452 |
v1 = ((String) v1).toUpperCase();
|
|
1431 |
if (v2 != null) {
|
|
1432 |
v2 = ((String) v2).toUpperCase();
|
|
1453 | 1433 |
} |
1454 | 1434 |
|
1455 | 1435 |
} |
Also available in: Unified diff