Revision 19470 trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/driver/DataStoreTest.java

View differences:

DataStoreTest.java
46 46
		IDriverParameters dp=dsm.createDriverParameters("dbf");
47 47
		((DBFDriverParameters)dp).setDBFFile(dbffile);
48 48

  
49
		driverTest(dp,null,null);
49
		driverTest(dp,null,null,false);
50 50

  
51 51
		IFeatureStore fs = createFeatureStore(dp);
52 52
		assertNotNull("Can't create Feature Store", fs);
......
57 57
		IFeatureCollection fc;
58 58
		Comparable v1,v2;
59 59
		IFeature feature,pfeature;
60
		long count;
60 61

  
61 62

  
62 63
		fc = (IFeatureCollection)fs.getDataCollection();
......
68 69
		assertEquals(2, fc.size());
69 70

  
70 71
		it = fc.iterator();
72
		count=0;
71 73
		while (it.hasNext()){
72 74
			feature = (IFeature)it.next();
73
			assertTrue(feature.getString("NOMBRE").toLowerCase().startsWith("b"));
75
			assertTrue("Filter error",feature.getString("NOMBRE").toLowerCase().startsWith("b"));
76
			count++;
74 77
		}
78
		assertEquals("Iteration error",2,count);
75 79

  
80

  
76 81
		fc = (IFeatureCollection)fs.getDataCollection(null,null,"ASC NOMBRE");
77 82
		assertEquals(9, fc.size());
78 83
//		FIXME: falta test
79 84
		it = fc.iterator();
80

  
85
		count=0;
81 86
		pfeature = (IFeature)it.next();
87
		count++;
82 88
		while (it.hasNext()){
83 89
			feature = (IFeature)it.next();
84 90
			v1 = (Comparable)pfeature.get("NOMBRE");
......
86 92
			pfeature=feature;
87 93
			System.out.println("OJO!!!! NO SE ESTAN HACINEDO COMPROBACIONES DE ORDEN");
88 94
//			assertTrue("Short error", (v1.compareTo(v1) <= 0));
95
			count++;
89 96
		}
97
		assertEquals("Iteration error",9,count);
90 98

  
91 99

  
92 100
		fc = (IFeatureCollection)fs.getDataCollection(null,null,"DESC NOMBRE");
......
94 102
//		FIXME: falta test
95 103
		it = fc.iterator();
96 104

  
105
		count=0;
97 106
		pfeature = (IFeature)it.next();
107
		count++;
98 108
		while (it.hasNext()){
99 109
			feature = (IFeature)it.next();
100 110
			v1 = (Comparable)pfeature.get("NOMBRE");
......
102 112
			pfeature=feature;
103 113
			System.out.println("OJO!!!! NO SE ESTAN HACINEDO COMPROBACIONES DE ORDEN");
104 114
//			assertTrue("Short error", (v1.compareTo(v1) >= 0));
115
			count++;
105 116
		}
117
		assertEquals("Iteration error",9,count);
106 118

  
107 119

  
108 120
		fc = (IFeatureCollection)fs.getDataCollection(null,"lower(NOMBRE) like 'b%'","ASC NOMBRE");
......
111 123

  
112 124
		it = fc.iterator();
113 125

  
126
		count=0;
114 127
		pfeature = (IFeature)it.next();
115 128
		assertTrue(pfeature.getString("NOMBRE").toLowerCase().startsWith("b"));
129
		count++;
116 130
		while (it.hasNext()){
117 131
			feature = (IFeature)it.next();
118
			assertTrue(feature.getString("NOMBRE").toLowerCase().startsWith("b"));
132
			assertTrue("Filter error",feature.getString("NOMBRE").toLowerCase().startsWith("b"));
119 133
			v1 = (Comparable)pfeature.get("NOMBRE");
120 134
			v2 = (Comparable)feature.get("NOMBRE");
121 135
			pfeature=feature;
122 136
			System.out.println("OJO!!!! NO SE ESTAN HACINEDO COMPROBACIONES DE ORDEN");
123 137
//			assertTrue("Short error", (v1.compareTo(v1) <= 0));
138
			count++;
124 139
		}
140
		assertEquals("Iteration error",2,count);
125 141

  
126 142
		try {
127 143
			fs.close();
128 144
		} catch (CloseException e) {
145
			e.printStackTrace();
129 146
			fail("Exception:" + e);
130
			e.printStackTrace();
131 147
		}
132 148

  
133 149

  
......
150 166
		((ShpDriverParameters)dp).setDBFFile(SHP.getDbfFile(shpfile));
151 167

  
152 168

  
153
		driverTest(dp,null,null);
169
		driverTest(dp,null,null,false);
154 170

  
155 171

  
156 172

  
......
169 185
		try {
170 186
			fs = (IFeatureStore)dsm.createDataStore(dsp);
171 187
		} catch (InitializeException e) {
188
			e.printStackTrace();
172 189
			fail("Exception:" + e);
173
			e.printStackTrace();
174 190
		}
175 191
		return fs;
176 192

  
177 193
	}
178 194

  
179 195

  
180
	private void driverTest(IDriverParameters dp,String filter, String order){
196
	private void driverTest(IDriverParameters dp,String filter, String order,boolean testEdit){
181 197
		DataSourceManager dsm=DataSourceManager.getManager();
182 198

  
183 199
		IDataStoreParameters dsp=dsm.createDataStoreParameters(DriverStore.DATASTORE_NAME);
......
187 203

  
188 204
		fs.open();
189 205

  
190
		if (fs.isEditable()) {
206
		if (fs.isEditable() || testEdit) {
191 207
			fs.startEditing();
192 208

  
193 209
			IFeature feature1 = fs.createDefaultFeature(false);
......
213 229
		VisitorExample visitor=new VisitorExample(ft);
214 230
		featureCollection.accept(visitor);
215 231

  
216
		if (fs.isEditable()){
232
		if (fs.isEditable() || testEdit){
217 233
			try {
218 234
				fs.finishEditing();
219 235
			} catch (WriteException e) {
220
				// TODO Auto-generated catch block
221 236
				e.printStackTrace();
237
				fail("Exception: "+e);
222 238
			} catch (ReadException e) {
223
				// TODO Auto-generated catch block
224 239
				e.printStackTrace();
240
				fail("Exception: "+e);
225 241
			}
226 242
		}
227 243
		try {
228 244
			fs.close();
229 245
		} catch (CloseException e) {
230
			// TODO Auto-generated catch block
231 246
			e.printStackTrace();
247
			fail("Exception: "+e);
232 248
		}
233 249
		fs.dispose();
234 250
	}
......
266 282
			}
267 283
		}
268 284

  
269
			}
270
		}
285
	}
286
}

Also available in: Unified diff