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/BaseTestFeatureStore.java

View differences:

BaseTestFeatureStore.java
682 682
			set = store.getFeatureSet(query);
683 683
			FeatureType type = set.getDefaultFeatureType();
684 684

  
685
			DisposableIterator it = set.iterator();
685
			DisposableIterator it = set.fastIterator();
686 686
			Feature feature;
687 687
			printFeatureTypeColNames(type, 15);
688 688
			while (it.hasNext()) {
......
712 712
			}
713 713
			set = store.getFeatureSet(query);
714 714

  
715
			DisposableIterator it = set.iterator();
715
			DisposableIterator it = set.fastIterator();
716 716
			DisposableIterator fit = set.fastIterator();
717 717

  
718 718
			assertTrue(this.compareFeatureIterators(it, fit));
......
832 832

  
833 833
		assertEquals(set.getSize(), store.getFeatureSelection().getSize());
834 834

  
835
		DisposableIterator iter = set.iterator();
835
		DisposableIterator iter = set.fastIterator();
836 836
		while (iter.hasNext()) {
837 837
			assertTrue(store.getFeatureSelection().isSelected(
838 838
					(Feature) iter.next()));
......
842 842
		store.getFeatureSelection().reverse();
843 843
		assertTrue(store.getFeatureSelection().isEmpty());
844 844
		assertEquals(0, store.getFeatureSelection().getSize());
845
		iter = set.iterator();
845
		iter = set.fastIterator();
846 846
		while (iter.hasNext()) {
847 847
			assertFalse(store.getFeatureSelection().isSelected(
848 848
					(Feature) iter.next()));
......
896 896
			if (getRandom().nextBoolean()) {
897 897
				iter = set.fastIterator();
898 898
			} else {
899
				iter = set.iterator();
899
				iter = set.fastIterator();
900 900
			}
901 901
			if (getRandom().nextBoolean()) {
902 902
				iter1 = set1.fastIterator();
903 903
			} else {
904
				iter1 = set1.iterator();
904
				iter1 = set1.fastIterator();
905 905
			}
906 906

  
907 907
			assertTrue(compareFeatureIterators(iter, iter1, names));
......
923 923
			if (getRandom().nextBoolean()) {
924 924
				iter = set.fastIterator();
925 925
			} else {
926
				iter = set.iterator();
926
				iter = set.fastIterator();
927 927
			}
928 928
			if (getRandom().nextBoolean()) {
929 929
				iter1 = set1.fastIterator();
930 930
			} else {
931
				iter1 = set1.iterator();
931
				iter1 = set1.fastIterator();
932 932
			}
933 933

  
934 934
			assertTrue(compareFeatureIterators(iter, iter1, names));
......
940 940
			assertTrue(checksAttributesPositions(iter1, names));
941 941
			iter1.dispose();
942 942

  
943
			iter1 = set1.iterator();
943
			iter1 = set1.fastIterator();
944 944
			assertTrue(checksAttributesPositions(iter1, names));
945 945
			iter1.dispose();
946 946

  
......
1046 1046
			if (getRandom().nextBoolean()) {
1047 1047
				iter1 = set1.fastIterator();
1048 1048
			} else {
1049
				iter1 = set1.iterator();
1049
				iter1 = set1.fastIterator();
1050 1050
			}
1051 1051

  
1052 1052
			assertTrue(checkSort(iter1, query));
......
1245 1245
			if (getRandom().nextBoolean()) {
1246 1246
				iter = set.fastIterator();
1247 1247
			} else {
1248
				iter = set.iterator();
1248
				iter = set.fastIterator();
1249 1249
			}
1250 1250
			if (getRandom().nextBoolean()) {
1251 1251
				iter1 = set1.fastIterator();
1252 1252
			} else {
1253
				iter1 = set1.iterator();
1253
				iter1 = set1.fastIterator();
1254 1254
			}
1255 1255
			while (iter.hasNext()) {
1256 1256
				feature = (Feature) iter.next();
......
1294 1294
			if (getRandom().nextBoolean()) {
1295 1295
				iter = set.fastIterator();
1296 1296
			} else {
1297
				iter = set.iterator();
1297
				iter = set.fastIterator();
1298 1298
			}
1299 1299
			if (getRandom().nextBoolean()) {
1300 1300
				iter1 = set1.fastIterator();
1301 1301
			} else {
1302
				iter1 = set1.iterator();
1302
				iter1 = set1.fastIterator();
1303 1303
			}
1304 1304
			while (iter.hasNext()) {
1305 1305
				feature = (Feature) iter.next();
......
1341 1341
			if (getRandom().nextBoolean()) {
1342 1342
				iter = set.fastIterator();
1343 1343
			} else {
1344
				iter = set.iterator();
1344
				iter = set.fastIterator();
1345 1345
			}
1346 1346
			if (getRandom().nextBoolean()) {
1347 1347
				iter1 = set1.fastIterator();
1348 1348
			} else {
1349
				iter1 = set1.iterator();
1349
				iter1 = set1.fastIterator();
1350 1350
			}
1351 1351
			while (iter.hasNext()) {
1352 1352
				feature = (Feature) iter.next();
......
1387 1387
			if (getRandom().nextBoolean()) {
1388 1388
				iter = set.fastIterator();
1389 1389
			} else {
1390
				iter = set.iterator();
1390
				iter = set.fastIterator();
1391 1391
			}
1392 1392
			if (getRandom().nextBoolean()) {
1393 1393
				iter1 = set1.fastIterator();
1394 1394
			} else {
1395
				iter1 = set1.iterator();
1395
				iter1 = set1.fastIterator();
1396 1396
			}
1397 1397
			while (iter.hasNext()) {
1398 1398
				feature = (Feature) iter.next();
......
1437 1437
			if (getRandom().nextBoolean()) {
1438 1438
				iter = set.fastIterator();
1439 1439
			} else {
1440
				iter = set.iterator();
1440
				iter = set.fastIterator();
1441 1441
			}
1442 1442
			if (getRandom().nextBoolean()) {
1443 1443
				iter1 = set1.fastIterator();
1444 1444
			} else {
1445
				iter1 = set1.iterator();
1445
				iter1 = set1.fastIterator();
1446 1446
			}
1447 1447
			while (iter.hasNext()) {
1448 1448
				feature = (Feature) iter.next();

Also available in: Unified diff