Revision 28946

View differences:

branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/feature/BaseTestFeatureStore.java
357 357
		}
358 358
		if (ft1.getDefaultGeometryAttributeIndex() != ft2
359 359
				.getDefaultGeometryAttributeIndex()) {
360
			getLogger().warn("getDefaultGeometryAttributeIndex !=");
360
			getLogger().warn(
361
					"getDefaultGeometryAttributeIndex "
362
							+ ft1.getDefaultGeometryAttributeIndex() +
363
					" !="+ ft2.getDefaultGeometryAttributeIndex());
361 364
			return false;
362 365
		}
363 366
		if (ft1.getDefaultGeometryAttributeIndex() > -1) {
......
412 415
			return false;
413 416
		}
414 417
		if (!attr1.getName().equals(attr2.getName())) {
415
			getLogger().warn("name != ");
418
			getLogger().warn(
419
					"name '" + attr1.getName() + "' != '" + attr2.getName()
420
							+ "'");
416 421
			return false;
417 422
		}
418 423

  
419 424
		if (attr1.getDataType() != attr2.getDataType()) {
420
			getLogger().warn("dataType != ");
425
			getLogger().warn(
426
					attr1.getName() + ":" +
427
					"dataType '" + attr1.getDataTypeName() + "'["
428
							+ attr1.getDataType() + "] != '"
429
							+ attr2.getDataTypeName() + "'["
430
							+ attr2.getDataType() + "]");
421 431
			return false;
422 432
		}
423 433

  
424 434
		if (attr1.getSize() != attr2.getSize()) {
425
			getLogger().warn("size != ");
435
			getLogger().warn(
436
					attr1.getName() + ":" +
437
					"size " + attr1.getSize() + " != " + attr2.getSize());
426 438
			return false;
427 439
		}
428 440

  
429 441
		if (attr1.getPrecision() != attr2.getPrecision()) {
430
			getLogger().warn("precision != ");
442
			getLogger().warn(
443
					attr1.getName() + ":" +
444
					"precision " + attr1.getPrecision() + " != "
445
							+ attr1.getPrecision());
431 446
			return false;
432 447
		}
433 448

  
434 449
		if (attr1.getGeometryType() != attr2.getGeometryType()) {
435
			getLogger().warn("GeometryType != ");
450
			getLogger().warn(
451
					attr1.getName() + ":" +
452
					"GeometryType " + attr1.getGeometryType() + " != "
453
							+ attr2.getGeometryType());
436 454
			return false;
437 455
		}
438 456

  
439 457
		if (attr1.getGeometrySubType() != attr2.getGeometrySubType()) {
440
			getLogger().warn("GeometrySubType != ");
458
			getLogger().warn(
459
					attr1.getName() + ":" +
460
					"GeometrySubType " + attr1.getGeometrySubType() + " != "
461
							+ attr2.getGeometrySubType());
462

  
441 463
			return false;
442 464
		}
443 465

  
444 466
		if (attr1.getSRS() != null) {
445 467
			if (!attr1.getSRS().equals(attr2.getSRS())) {
446
				getLogger().warn("srs != ");
468
				getLogger().warn(
469
						attr1.getName() + ":" +
470
						"srs " + attr1.getSRS() + " != " + attr2.getSRS());
447 471
				return false;
448 472
			}
449 473
		} else {
450 474
			if (attr2.getSRS() != null) {
451
				getLogger().warn("srs != ");
475
				getLogger().warn(
476
						attr1.getName() + ":" +
477
						"srs " + attr1.getSRS() + " != " + attr2.getSRS());
452 478
				return false;
453 479
			}
454 480
		}

Also available in: Unified diff