Revision 22958 branches/v2_0_0_prep/libraries/libFMap_dataFile/src-test/org/gvsig/fmap/data/feature/file/shp/SHPTest.java

View differences:

SHPTest.java
7 7

  
8 8
import org.gvsig.fmap.data.CloseException;
9 9
import org.gvsig.fmap.data.DataManager;
10
import org.gvsig.fmap.data.DataStoreParameters;
11 10
import org.gvsig.fmap.data.InitializeException;
12
import org.gvsig.fmap.data.OpenException;
13 11
import org.gvsig.fmap.data.ReadException;
14
import org.gvsig.fmap.data.feature.file.DataStoreTest;
15 12
import org.gvsig.fmap.data.feature.Feature;
16 13
import org.gvsig.fmap.data.feature.FeatureAttributeDescriptor;
17 14
import org.gvsig.fmap.data.feature.FeatureCollection;
18 15
import org.gvsig.fmap.data.feature.FeatureStore;
19 16
import org.gvsig.fmap.data.feature.FeatureType;
20
import org.gvsig.fmap.data.feature.file.shp.Register;
21
import org.gvsig.fmap.data.feature.file.shp.SHPStore;
22
import org.gvsig.fmap.data.feature.file.shp.SHPStoreParameters;
17
import org.gvsig.fmap.data.feature.file.DataStoreTest;
23 18

  
24 19
public class SHPTest extends TestCase {
25 20

  
26
	private File fileNormal = new File(DataStoreTest.class.getResource("data/prueba.shp").getFile());
27
	private File fileGeometryNull = new File(DataStoreTest.class.getResource("data/pruebaNull.shp").getFile());
21
	public static final File fileNormal = new File(DataStoreTest.class
22
			.getResource(
23
			"data/prueba.shp").getFile());
24
	public static final File fileGeometryNull = new File(DataStoreTest.class
25
			.getResource("data/pruebaNull.shp").getFile());
28 26

  
29 27

  
30 28
	public static void main(String[] args) {
......
40 38
		shp(fileNormal);
41 39
		shp(fileGeometryNull);
42 40
	}
41

  
42
	public static SHPStoreParameters getParams(File file)
43
			throws InitializeException {
44
		DataManager manager = DataManager.getManager();
45
		SHPStoreParameters shpParameters = null;
46
		shpParameters = (SHPStoreParameters) manager
47
				.createDataStoreParameters(SHPStore.DATASTORE_NAME);
48
		shpParameters.setFile(file);
49
		return shpParameters;
50
	}
51

  
43 52
	private void shp(File file){
44 53
		DataManager manager = DataManager.getManager();
45 54
		FeatureStore store = null;
46 55
		SHPStoreParameters shpParameters=null;
47 56
		try {
48
			shpParameters=(SHPStoreParameters)manager.createDataStoreParameters(SHPStore.DATASTORE_NAME);
57
			shpParameters = getParams(file);
49 58
		} catch (InitializeException e3) {
50 59
			e3.printStackTrace();
51 60
			fail();
52 61
		}
53
		shpParameters.setFile(file);
54
//		shpParameters.setDBFFile(SHP.getDbfFile(file));
55
//		shpParameters.setSHXFile(SHP.getShxFile(file));
56 62

  
57 63
		try {
58
			store= (FeatureStore)manager.createDataStore((DataStoreParameters)shpParameters);
64
			store= (FeatureStore)manager.createDataStore(shpParameters);
59 65
		} catch (InitializeException e) {
60 66
			// TODO Auto-generated catch block
61 67
			e.printStackTrace();
......
120 126
		SHPStoreParameters shpParameters=null;
121 127

  
122 128
		try {
123
			shpParameters=(SHPStoreParameters)manager.createDataStoreParameters(SHPStore.DATASTORE_NAME);
129
			shpParameters = getParams(fileNormal);
124 130
		} catch (InitializeException e) {
125 131
			e.printStackTrace();
126 132
			fail();
127 133
		}
128
		shpParameters.setFile(fileNormal);
129 134

  
130 135

  
131 136
		DataStoreTest.doFileResourceTest(shpParameters);

Also available in: Unified diff