Revision 40394
| branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/store/memory/MemoryStoreProviderTest.java | ||
|---|---|---|
| 35 | 35 |
import org.gvsig.fmap.dal.exception.InitializeException; |
| 36 | 36 |
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException; |
| 37 | 37 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 38 |
import org.gvsig.tools.dispose.DisposableIterator; |
|
| 39 | 38 |
import org.gvsig.fmap.dal.feature.EditableFeature; |
| 40 | 39 |
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor; |
| 41 | 40 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
| ... | ... | |
| 43 | 42 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 44 | 43 |
import org.gvsig.fmap.dal.feature.FeatureSet; |
| 45 | 44 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 45 |
import org.gvsig.fmap.geom.Geometry; |
|
| 46 |
import org.gvsig.fmap.geom.Geometry.SUBTYPES; |
|
| 47 |
import org.gvsig.fmap.geom.Geometry.TYPES; |
|
| 46 | 48 |
import org.gvsig.fmap.geom.GeometryLocator; |
| 47 | 49 |
import org.gvsig.fmap.geom.GeometryManager; |
| 48 |
import org.gvsig.fmap.geom.Geometry.SUBTYPES; |
|
| 49 |
import org.gvsig.fmap.geom.Geometry.TYPES; |
|
| 50 | 50 |
import org.gvsig.fmap.geom.exception.CreateGeometryException; |
| 51 |
import org.gvsig.fmap.geom.primitive.Curve; |
|
| 51 | 52 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 53 |
import org.gvsig.fmap.geom.primitive.Surface; |
|
| 54 |
import org.gvsig.tools.dispose.DisposableIterator; |
|
| 52 | 55 |
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
| 53 | 56 |
import org.slf4j.Logger; |
| 54 | 57 |
import org.slf4j.LoggerFactory; |
| 55 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
|
| 56 | 58 |
|
| 57 |
import com.vividsolutions.jts.util.Assert; |
|
| 58 | 59 |
|
| 59 | 60 |
/** |
| 60 | 61 |
* @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a> |
| ... | ... | |
| 157 | 158 |
store.finishEditing(); |
| 158 | 159 |
|
| 159 | 160 |
FeatureSet featureSet = store.getFeatureSet(); |
| 160 |
DisposableIterator it = featureSet.iterator();
|
|
| 161 |
DisposableIterator it = featureSet.fastIterator();
|
|
| 161 | 162 |
while (it.hasNext()){
|
| 162 | 163 |
Feature feature2 = (Feature)it.next(); |
| 163 | 164 |
assertEquals(feature.getType().get(0), feature2.getType().get(0)); |
| ... | ... | |
| 187 | 188 |
|
| 188 | 189 |
EditableFeature feature2 = store.createNewFeature().getEditable(); |
| 189 | 190 |
feature2.set(ID, "1"); |
| 190 |
GeneralPathX gpx=new GeneralPathX(); |
|
| 191 |
gpx.moveTo(0, 0); |
|
| 192 |
gpx.lineTo(1, 0); |
|
| 193 |
gpx.lineTo(1, 1); |
|
| 194 |
gpx.lineTo(0, 1); |
|
| 195 |
gpx.lineTo(0, 0); |
|
| 196 |
gpx.closePath(); |
|
| 197 |
feature2.set(GEOM, geomManager.createCurve(gpx, SUBTYPES.GEOM2D)); |
|
| 191 |
Curve curve = geomManager.createCurve(Geometry.SUBTYPES.GEOM2D); |
|
| 192 |
curve.addVertex(0,0); |
|
| 193 |
curve.addVertex(1,0); |
|
| 194 |
curve.addVertex(1,1); |
|
| 195 |
curve.addVertex(0,1); |
|
| 196 |
curve.addVertex(0,0); |
|
| 197 |
feature2.set(GEOM, curve); |
|
| 198 | 198 |
|
| 199 | 199 |
// Two |
| 200 | 200 |
store.insert(feature2); |
| 201 | 201 |
|
| 202 | 202 |
EditableFeature feature3 = store.createNewFeature().getEditable(); |
| 203 | 203 |
feature3.set(ID, "2"); |
| 204 |
feature3.set(GEOM, geomManager.createSurface(gpx, SUBTYPES.GEOM2D)); |
|
| 204 |
Surface surface = geomManager.createSurface(Geometry.SUBTYPES.GEOM2D); |
|
| 205 |
surface.addVertex(0,0); |
|
| 206 |
surface.addVertex(1,0); |
|
| 207 |
surface.addVertex(1,1); |
|
| 208 |
surface.addVertex(0,1); |
|
| 209 |
surface.addVertex(0,0); |
|
| 210 |
feature3.set(GEOM, surface); |
|
| 205 | 211 |
|
| 206 | 212 |
//Three |
| 207 | 213 |
store.insert(feature3); |
| ... | ... | |
| 212 | 218 |
store.finishEditing(); |
| 213 | 219 |
|
| 214 | 220 |
FeatureSet featureSet = store.getFeatureSet(); |
| 215 |
DisposableIterator it = featureSet.iterator();
|
|
| 221 |
DisposableIterator it = featureSet.fastIterator();
|
|
| 216 | 222 |
|
| 217 | 223 |
//Count the features in the set |
| 218 | 224 |
int i=0; |
| ... | ... | |
| 231 | 237 |
store.edit(); |
| 232 | 238 |
EditableFeature feature4 = store.createNewFeature().getEditable(); |
| 233 | 239 |
feature4.set(ID, "4"); |
| 234 |
feature4.set(GEOM, geomManager.createSurface(gpx, SUBTYPES.GEOM2D)); |
|
| 240 |
surface = geomManager.createSurface(Geometry.SUBTYPES.GEOM2D); |
|
| 241 |
surface.addVertex(0,0); |
|
| 242 |
surface.addVertex(1,0); |
|
| 243 |
surface.addVertex(1,1); |
|
| 244 |
surface.addVertex(0,1); |
|
| 245 |
surface.addVertex(0,0); |
|
| 246 |
feature4.set(GEOM, surface); |
|
| 235 | 247 |
|
| 236 | 248 |
//four |
| 237 | 249 |
store.insert(feature4); |
| ... | ... | |
| 258 | 270 |
|
| 259 | 271 |
EditableFeature feature2 = store.createNewFeature().getEditable(); |
| 260 | 272 |
feature2.set(ID, "1"); |
| 261 |
GeneralPathX gpx=new GeneralPathX(); |
|
| 262 |
gpx.moveTo(0, 0); |
|
| 263 |
gpx.lineTo(1, 0); |
|
| 264 |
gpx.lineTo(1, 1); |
|
| 265 |
gpx.lineTo(0, 1); |
|
| 266 |
gpx.lineTo(0, 0); |
|
| 267 |
gpx.closePath(); |
|
| 268 |
feature2.set(GEOM, geomManager.createCurve(gpx, SUBTYPES.GEOM2D)); |
|
| 273 |
Curve curve = geomManager.createCurve(Geometry.SUBTYPES.GEOM2D); |
|
| 274 |
curve.addVertex(0,0); |
|
| 275 |
curve.addVertex(1,0); |
|
| 276 |
curve.addVertex(1,1); |
|
| 277 |
curve.addVertex(0,1); |
|
| 278 |
curve.addVertex(0,0); |
|
| 279 |
feature2.set(GEOM, curve); |
|
| 269 | 280 |
|
| 270 | 281 |
// Two |
| 271 | 282 |
store.insert(feature2); |
| 272 | 283 |
|
| 273 | 284 |
EditableFeature feature3 = store.createNewFeature().getEditable(); |
| 274 | 285 |
feature3.set(ID, "2"); |
| 275 |
feature3.set(GEOM, geomManager.createSurface(gpx, SUBTYPES.GEOM2D)); |
|
| 286 |
Surface surface = geomManager.createSurface(Geometry.SUBTYPES.GEOM2D); |
|
| 287 |
surface.addVertex(0,0); |
|
| 288 |
surface.addVertex(1,0); |
|
| 289 |
surface.addVertex(1,1); |
|
| 290 |
surface.addVertex(0,1); |
|
| 291 |
surface.addVertex(0,0); |
|
| 292 |
feature3.set(GEOM, surface); |
|
| 276 | 293 |
|
| 277 | 294 |
//Three |
| 278 | 295 |
store.insert(feature3); |
| ... | ... | |
| 287 | 304 |
|
| 288 | 305 |
|
| 289 | 306 |
FeatureSet featureSet = store.getFeatureSet(); |
| 290 |
DisposableIterator it = featureSet.iterator();
|
|
| 307 |
DisposableIterator it = featureSet.fastIterator();
|
|
| 291 | 308 |
|
| 292 | 309 |
//Count the features in the set |
| 293 | 310 |
int i=1; |
| ... | ... | |
| 325 | 342 |
store.edit(); |
| 326 | 343 |
|
| 327 | 344 |
FeatureSet featureSet = store.getFeatureSet(); |
| 328 |
DisposableIterator it = featureSet.iterator();
|
|
| 345 |
DisposableIterator it = featureSet.fastIterator();
|
|
| 329 | 346 |
|
| 330 | 347 |
EditableFeature editableFeature = null; |
| 331 | 348 |
while (it.hasNext()){
|
| ... | ... | |
| 340 | 357 |
|
| 341 | 358 |
//Check the value |
| 342 | 359 |
featureSet = store.getFeatureSet(); |
| 343 |
it = featureSet.iterator();
|
|
| 360 |
it = featureSet.fastIterator();
|
|
| 344 | 361 |
|
| 345 | 362 |
while (it.hasNext()){
|
| 346 | 363 |
Feature feat = (Feature)it.next(); |
| 347 |
Assert.equals("Bye", feat.get(LABEL));
|
|
| 364 |
assertEquals("Bye", feat.get(LABEL));
|
|
| 348 | 365 |
} |
| 349 | 366 |
|
| 350 | 367 |
store.dispose(); |
Also available in: Unified diff