Revision 42488 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/test/java/org/gvsig/fmap/dal/feature/BaseTestEditableFeatureStore.java
| BaseTestEditableFeatureStore.java | ||
|---|---|---|
| 264 | 264 |
} |
| 265 | 265 |
assertEquals(set.getSize(), originalSet.getSize()); |
| 266 | 266 |
|
| 267 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 268 |
DisposableIterator iter = set.iterator();
|
|
| 267 |
DisposableIterator originalIter = (DisposableIterator) originalSet.fastIterator();
|
|
| 268 |
DisposableIterator iter = (DisposableIterator) set.fastIterator();
|
|
| 269 | 269 |
assertTrue(compareFeatureIterators(originalIter, iter)); |
| 270 | 270 |
originalIter.dispose(); |
| 271 | 271 |
iter.dispose(); |
| ... | ... | |
| 311 | 311 |
FeatureSet originalSet = store.getFeatureSet(getDefaultQuery(store)); |
| 312 | 312 |
assertEquals(set.getSize(), originalSet.getSize()); |
| 313 | 313 |
|
| 314 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 315 |
DisposableIterator iter = set.iterator();
|
|
| 314 |
DisposableIterator originalIter = originalSet.fastIterator();
|
|
| 315 |
DisposableIterator iter = set.fastIterator();
|
|
| 316 | 316 |
int i = 0; |
| 317 | 317 |
while (iter.hasNext()) {
|
| 318 | 318 |
assertTrue("" + i, compareFeatures((Feature) originalIter.next(),
|
| ... | ... | |
| 329 | 329 |
originalIter.dispose(); |
| 330 | 330 |
|
| 331 | 331 |
|
| 332 |
originalIter = originalSet.iterator();
|
|
| 333 |
iter = set.iterator();
|
|
| 332 |
originalIter = (DisposableIterator) originalSet.fastIterator();
|
|
| 333 |
iter = (DisposableIterator) set.fastIterator();
|
|
| 334 | 334 |
i = 0; |
| 335 | 335 |
while (iter.hasNext()) {
|
| 336 | 336 |
assertTrue("" + i, compareFeatures((Feature) originalIter.next(),
|
| ... | ... | |
| 352 | 352 |
set = result.getFeatureSet(); |
| 353 | 353 |
assertEquals(originalSet.getSize() - 2, set.getSize()); |
| 354 | 354 |
|
| 355 |
originalIter = originalSet.iterator();
|
|
| 356 |
iter = set.iterator();
|
|
| 355 |
originalIter = originalSet.fastIterator();
|
|
| 356 |
iter = set.fastIterator();
|
|
| 357 | 357 |
i = 0; |
| 358 | 358 |
while (iter.hasNext()) {
|
| 359 | 359 |
assertTrue("" + i, compareFeatures((Feature) originalIter.next(),
|
| ... | ... | |
| 403 | 403 |
EditableFeature newFeature = result.createNewFeature(true); |
| 404 | 404 |
fillPrimaryKeyInserFeature(newFeature); |
| 405 | 405 |
set.insert(newFeature); |
| 406 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 407 |
DisposableIterator iter = set.iterator();
|
|
| 406 |
DisposableIterator originalIter = originalSet.fastIterator();
|
|
| 407 |
DisposableIterator iter = set.fastIterator();
|
|
| 408 | 408 |
int i = 0; |
| 409 | 409 |
while (originalIter.hasNext()) {
|
| 410 | 410 |
assertTrue("" + i, compareFeatures((Feature) originalIter
|
| ... | ... | |
| 420 | 420 |
iter.dispose(); |
| 421 | 421 |
originalIter.dispose(); |
| 422 | 422 |
|
| 423 |
originalIter = originalSet.iterator();
|
|
| 424 |
iter = set.iterator();
|
|
| 423 |
originalIter = originalSet.fastIterator();
|
|
| 424 |
iter = set.fastIterator();
|
|
| 425 | 425 |
i = 0; |
| 426 | 426 |
while (originalIter.hasNext()) {
|
| 427 | 427 |
assertTrue("" + i, compareFeatures((Feature) originalIter
|
| ... | ... | |
| 447 | 447 |
set = result.getFeatureSet(); |
| 448 | 448 |
assertEquals(originalSet.getSize() + 2, set.getSize()); |
| 449 | 449 |
|
| 450 |
originalIter = originalSet.iterator();
|
|
| 451 |
iter = set.iterator();
|
|
| 450 |
originalIter = originalSet.fastIterator();
|
|
| 451 |
iter = set.fastIterator();
|
|
| 452 | 452 |
i = 0; |
| 453 | 453 |
while (originalIter.hasNext()) {
|
| 454 | 454 |
assertTrue("" + i, compareFeatures((Feature) originalIter
|
| ... | ... | |
| 500 | 500 |
|
| 501 | 501 |
FeatureSet set = result.getFeatureSet(); |
| 502 | 502 |
|
| 503 |
DisposableIterator iter = set.iterator();
|
|
| 503 |
DisposableIterator iter = set.fastIterator();
|
|
| 504 | 504 |
assertTrue(iter.hasNext()); |
| 505 | 505 |
assertNotNull(iter.next()); |
| 506 | 506 |
|
| ... | ... | |
| 567 | 567 |
|
| 568 | 568 |
FeatureSet set = result.getFeatureSet(); |
| 569 | 569 |
|
| 570 |
DisposableIterator iter = set.iterator();
|
|
| 570 |
DisposableIterator iter = set.fastIterator();
|
|
| 571 | 571 |
assertTrue(iter.hasNext()); |
| 572 | 572 |
assertNotNull(iter.next()); |
| 573 | 573 |
|
| ... | ... | |
| 653 | 653 |
|
| 654 | 654 |
FeatureSet set = result.getFeatureSet(); |
| 655 | 655 |
|
| 656 |
DisposableIterator iter = set.iterator();
|
|
| 656 |
DisposableIterator iter = set.fastIterator();
|
|
| 657 | 657 |
assertTrue(iter.hasNext()); |
| 658 | 658 |
assertNotNull(iter.next()); |
| 659 | 659 |
|
| ... | ... | |
| 789 | 789 |
assertEquals(originalSet.getSize() - deletesFeature.length, set |
| 790 | 790 |
.getSize()); |
| 791 | 791 |
|
| 792 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 793 |
DisposableIterator iter = set.iterator();
|
|
| 792 |
DisposableIterator originalIter = originalSet.fastIterator();
|
|
| 793 |
DisposableIterator iter = set.fastIterator();
|
|
| 794 | 794 |
|
| 795 | 795 |
i = 0; |
| 796 | 796 |
while (iter.hasNext()) {
|
| ... | ... | |
| 810 | 810 |
assertEquals(originalSet.getSize() - deletesFeature.length, set |
| 811 | 811 |
.getSize()); |
| 812 | 812 |
|
| 813 |
originalIter = originalSet.iterator();
|
|
| 814 |
iter = set.iterator();
|
|
| 813 |
originalIter = originalSet.fastIterator();
|
|
| 814 |
iter = set.fastIterator();
|
|
| 815 | 815 |
i = 0; |
| 816 | 816 |
while (iter.hasNext()) {
|
| 817 | 817 |
assertTrue("" + i, compareFeatures((Feature) originalIter.next(),
|
| ... | ... | |
| 930 | 930 |
assertEquals(originalSet.getSize() + insertsFeature.length, set |
| 931 | 931 |
.getSize()); |
| 932 | 932 |
|
| 933 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 934 |
DisposableIterator iter = set.iterator();
|
|
| 933 |
DisposableIterator originalIter = originalSet.fastIterator();
|
|
| 934 |
DisposableIterator iter = set.fastIterator();
|
|
| 935 | 935 |
|
| 936 | 936 |
i = 0; |
| 937 | 937 |
while (originalIter.hasNext()) {
|
| ... | ... | |
| 955 | 955 |
assertEquals(originalSet.getSize() + insertsFeature.length, set |
| 956 | 956 |
.getSize()); |
| 957 | 957 |
|
| 958 |
originalIter = originalSet.iterator();
|
|
| 959 |
iter = set.iterator();
|
|
| 958 |
originalIter = originalSet.fastIterator();
|
|
| 959 |
iter = set.fastIterator();
|
|
| 960 | 960 |
i = 0; |
| 961 | 961 |
while (originalIter.hasNext()) {
|
| 962 | 962 |
assertTrue("" + i, compareFeatures((Feature) originalIter.next(),
|
| ... | ... | |
| 1022 | 1022 |
} |
| 1023 | 1023 |
} |
| 1024 | 1024 |
set = result.getFeatureSet(getDefaultQuery(result)); |
| 1025 |
DisposableIterator iter = set.iterator();
|
|
| 1025 |
DisposableIterator iter = set.fastIterator();
|
|
| 1026 | 1026 |
|
| 1027 | 1027 |
printFeatureTypeColNames(set.getDefaultFeatureType(), 15); |
| 1028 | 1028 |
Feature f; |
| ... | ... | |
| 1035 | 1035 |
|
| 1036 | 1036 |
FeatureSet originalSet = store.getFeatureSet(getDefaultQuery(store)); |
| 1037 | 1037 |
|
| 1038 |
DisposableIterator originalIter = originalSet.iterator();
|
|
| 1038 |
DisposableIterator originalIter = originalSet.fastIterator();
|
|
| 1039 | 1039 |
|
| 1040 |
iter = set.iterator();
|
|
| 1040 |
iter = set.fastIterator();
|
|
| 1041 | 1041 |
|
| 1042 | 1042 |
long i = 0; |
| 1043 | 1043 |
while (originalIter.hasNext()) {
|
| ... | ... | |
| 1061 | 1061 |
set = result.getFeatureSet(); |
| 1062 | 1062 |
assertEquals(originalSet.getSize(), set.getSize()); |
| 1063 | 1063 |
|
| 1064 |
originalIter = originalSet.iterator();
|
|
| 1065 |
iter = set.iterator();
|
|
| 1064 |
originalIter = originalSet.fastIterator();
|
|
| 1065 |
iter = set.fastIterator();
|
|
| 1066 | 1066 |
i = 0; |
| 1067 | 1067 |
while (originalIter.hasNext()) {
|
| 1068 | 1068 |
try {
|
| ... | ... | |
| 1100 | 1100 |
} |
| 1101 | 1101 |
set = result.getFeatureSet(); |
| 1102 | 1102 |
|
| 1103 |
iter = set.iterator();
|
|
| 1104 |
originalIter = originalSet.iterator();
|
|
| 1103 |
iter = set.fastIterator();
|
|
| 1104 |
originalIter = originalSet.fastIterator();
|
|
| 1105 | 1105 |
i = 0; |
| 1106 | 1106 |
while (originalIter.hasNext()) {
|
| 1107 | 1107 |
try {
|
| ... | ... | |
| 1192 | 1192 |
FeatureSet set = result.getFeatureSet(); |
| 1193 | 1193 |
FeatureSet set2 = result2.getFeatureSet(); |
| 1194 | 1194 |
|
| 1195 |
DisposableIterator iter1 = set.iterator();
|
|
| 1196 |
DisposableIterator iter2 = set2.iterator();
|
|
| 1195 |
DisposableIterator iter1 = set.fastIterator();
|
|
| 1196 |
DisposableIterator iter2 = set2.fastIterator();
|
|
| 1197 | 1197 |
assertTrue(this.compareFeatureIterators(iter1, iter2)); |
| 1198 | 1198 |
iter1.dispose(); |
| 1199 | 1199 |
iter2.dispose(); |
| ... | ... | |
| 1308 | 1308 |
assertEquals(orgSet.getDefaultFeatureType().size() + 1, curSet |
| 1309 | 1309 |
.getDefaultFeatureType().size()); |
| 1310 | 1310 |
|
| 1311 |
DisposableIterator orgIter = orgSet.iterator();
|
|
| 1312 |
DisposableIterator curIter = curSet.iterator();
|
|
| 1311 |
DisposableIterator orgIter = orgSet.fastIterator();
|
|
| 1312 |
DisposableIterator curIter = curSet.fastIterator();
|
|
| 1313 | 1313 |
|
| 1314 | 1314 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| 1315 | 1315 |
|
| ... | ... | |
| 1323 | 1323 |
orgIter.dispose(); |
| 1324 | 1324 |
curIter.dispose(); |
| 1325 | 1325 |
|
| 1326 |
orgIter = orgSet.iterator();
|
|
| 1326 |
orgIter = orgSet.fastIterator();
|
|
| 1327 | 1327 |
curIter = curSet.fastIterator(); |
| 1328 | 1328 |
|
| 1329 | 1329 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| ... | ... | |
| 1331 | 1331 |
curIter.dispose(); |
| 1332 | 1332 |
|
| 1333 | 1333 |
orgIter = orgSet.fastIterator(); |
| 1334 |
curIter = curSet.iterator();
|
|
| 1334 |
curIter = curSet.fastIterator();
|
|
| 1335 | 1335 |
|
| 1336 | 1336 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| 1337 | 1337 |
orgIter.dispose(); |
| 1338 | 1338 |
curIter.dispose(); |
| 1339 | 1339 |
|
| 1340 |
curIter = curSet.iterator();
|
|
| 1340 |
curIter = curSet.fastIterator();
|
|
| 1341 | 1341 |
Feature feature; |
| 1342 | 1342 |
while (curIter.hasNext()) {
|
| 1343 | 1343 |
feature = (Feature) curIter.next(); |
| ... | ... | |
| 1354 | 1354 |
.size()); |
| 1355 | 1355 |
|
| 1356 | 1356 |
assertEquals(orgSet.getSize(), curSet.getSize()); |
| 1357 |
curIter = curSet.iterator();
|
|
| 1357 |
curIter = curSet.fastIterator();
|
|
| 1358 | 1358 |
while (curIter.hasNext()) {
|
| 1359 | 1359 |
feature = (Feature) curIter.next(); |
| 1360 | 1360 |
assertEquals("HOLA", feature.get("__ATTR1__"));
|
| ... | ... | |
| 1376 | 1376 |
assertEquals(orgSet.getDefaultFeatureType().size() + 1, curSet |
| 1377 | 1377 |
.getDefaultFeatureType().size()); |
| 1378 | 1378 |
|
| 1379 |
orgIter = orgSet.iterator();
|
|
| 1380 |
curIter = curSet.iterator();
|
|
| 1379 |
orgIter = orgSet.fastIterator();
|
|
| 1380 |
curIter = curSet.fastIterator();
|
|
| 1381 | 1381 |
|
| 1382 | 1382 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| 1383 | 1383 |
orgIter.dispose(); |
| ... | ... | |
| 1390 | 1390 |
orgIter.dispose(); |
| 1391 | 1391 |
curIter.dispose(); |
| 1392 | 1392 |
|
| 1393 |
orgIter = orgSet.iterator();
|
|
| 1393 |
orgIter = orgSet.fastIterator();
|
|
| 1394 | 1394 |
curIter = curSet.fastIterator(); |
| 1395 | 1395 |
|
| 1396 | 1396 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| ... | ... | |
| 1398 | 1398 |
curIter.dispose(); |
| 1399 | 1399 |
|
| 1400 | 1400 |
orgIter = orgSet.fastIterator(); |
| 1401 |
curIter = curSet.iterator();
|
|
| 1401 |
curIter = curSet.fastIterator();
|
|
| 1402 | 1402 |
|
| 1403 | 1403 |
assertTrue(compareFeatureIterators(orgIter, curIter, orgAttNames)); |
| 1404 | 1404 |
orgIter.dispose(); |
| 1405 | 1405 |
curIter.dispose(); |
| 1406 | 1406 |
|
| 1407 |
curIter = curSet.iterator();
|
|
| 1407 |
curIter = curSet.fastIterator();
|
|
| 1408 | 1408 |
while (curIter.hasNext()) {
|
| 1409 | 1409 |
feature = (Feature) curIter.next(); |
| 1410 | 1410 |
assertEquals("HOLA", feature.get("__ATTR1__"));
|
| ... | ... | |
| 1420 | 1420 |
.size()); |
| 1421 | 1421 |
|
| 1422 | 1422 |
assertEquals(orgSet.getSize(), curSet.getSize()); |
| 1423 |
curIter = curSet.iterator();
|
|
| 1423 |
curIter = curSet.fastIterator();
|
|
| 1424 | 1424 |
while (curIter.hasNext()) {
|
| 1425 | 1425 |
feature = (Feature) curIter.next(); |
| 1426 | 1426 |
assertEquals("HOLA", feature.get("__ATTR1__"));
|
Also available in: Unified diff