Revision 28670

View differences:

branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/feature/BaseTestEditableFeatureStore.java
1264 1264
			// Dp nothing
1265 1265
		}
1266 1266

  
1267
		int pkAttributesCount = 0;
1268

  
1267 1269
		FeatureStore result = this.getStoreCopy(store, newParams);
1268 1270

  
1269 1271
		result.edit();
......
1274 1276

  
1275 1277
		Iterator iter = result.getDefaultFeatureType().iterator();
1276 1278
		int i = 0;
1279

  
1277 1280
		while (iter.hasNext()) {
1278
			orgAttNames[i] = ((FeatureAttributeDescriptor) iter.next())
1279
			.getName();
1281
			FeatureAttributeDescriptor attr = ((FeatureAttributeDescriptor) iter
1282
					.next());
1283
			orgAttNames[i] = attr.getName();
1280 1284
			i++;
1285
			if (attr.isPrimaryKey()) {
1286
				pkAttributesCount++;
1287
			}
1281 1288
		}
1282 1289

  
1283 1290
		EditableFeatureType edFtype = result
......
1341 1348
		query.setAttributeNames(new String[] { "__ATTR1__" });
1342 1349
		curSet = result.getFeatureSet(query);
1343 1350

  
1344
		assertEquals(1, curSet.getDefaultFeatureType().size());
1351
		assertEquals(1 + pkAttributesCount, curSet.getDefaultFeatureType()
1352
				.size());
1345 1353

  
1346 1354
		assertEquals(orgSet.getSize(), curSet.getSize());
1347 1355
		curIter = curSet.iterator();
......
1405 1413
		query.setAttributeNames(new String[] { "__ATTR1__" });
1406 1414
		curSet = result.getFeatureSet(query);
1407 1415

  
1408
		assertEquals(1, curSet.getDefaultFeatureType().size());
1416
		assertEquals(1 + pkAttributesCount, curSet.getDefaultFeatureType()
1417
				.size());
1409 1418

  
1410 1419
		assertEquals(orgSet.getSize(), curSet.getSize());
1411 1420
		curIter = curSet.iterator();

Also available in: Unified diff