Revision 22975 trunk/extensions/extNormalization/src-test/org/gvsig/normalization/operations/TestNormAlgorithm.java

View differences:

TestNormAlgorithm.java
28 28
package org.gvsig.normalization.operations;
29 29

  
30 30
import java.io.File;
31
import java.io.FileNotFoundException;
32 31
import java.io.FileReader;
33 32
import java.util.List;
34 33

  
35 34
import junit.framework.TestCase;
36 35

  
37 36
import org.apache.log4j.Logger;
38
import org.exolab.castor.xml.MarshalException;
39
import org.exolab.castor.xml.ValidationException;
40
import org.gvsig.geocoding.patterns.normalization.Patternnormalization;
37
import org.gvsig.patterns.normalization.Patternnormalization;
38
import org.gvsig.tools.storage.IStorage;
39
import org.gvsig.tools.storage.StorageXML;
41 40

  
42 41
public class TestNormAlgorithm extends TestCase {
43 42

  
......
90 89
		assertEquals("%", (String) r2.get(5));
91 90

  
92 91
		log.info("SubTest 3.");
93
		String c3 = "Av;Germanias;15;2;Moncada;Valencia";
92
		String c3 = "Av;Germanias;25;3;Moncada;Valencia";
94 93

  
95 94
		File f3 = new File(
96 95
				"src-test/org/gvsig/normalization/operations/testdata/patSplitChain3.xml");
......
101 100

  
102 101
		assertEquals("Av", (String) r3.get(0));
103 102
		assertEquals("Germanias", (String) r3.get(1));
104
		assertEquals(15, Integer.parseInt((String) r3.get(2)));
105
		assertEquals(2, Integer.parseInt((String) r3.get(3)));
103
		assertEquals(25, Integer.parseInt((String) r3.get(2)));
104
		assertEquals(3, Integer.parseInt((String) r3.get(3)));
106 105
		assertEquals("Moncada", (String) r3.get(4));
107 106
		assertEquals("Valencia", (String) r3.get(5));
108 107

  
......
219 218
		log.info("TestNormAlgorithm. Test tokens fixed finished");
220 219

  
221 220
	}
222
	
221

  
223 222
	public void testSplitSeparators() {
224
		
223

  
225 224
		log.info("TestNormAlgorithm. Test tokens with separators");
226
		
225

  
227 226
		String chain = "esto;/es;;; una_prueba;  de un/   split de una cadena_de texto";
228 227

  
229 228
		int parts = 4;
......
241 240
		assertEquals("un/   split de una cadena_de texto", result.get(3));
242 241

  
243 242
		log.info("TestNormAlgorithm. Test tokens with separators finished");
244
		
243

  
245 244
	}
246 245

  
247 246
	private List<String> parser(File f, String chain) {
248
		Patternnormalization pat = null;
247
		Patternnormalization pat = new Patternnormalization();
248
		IStorage storage = new StorageXML();
249

  
249 250
		try {
250
			FileReader red = new FileReader(f);
251
			pat = (Patternnormalization) Patternnormalization.unmarshal(red);
252
		} catch (MarshalException e) {
251
			FileReader reader = new FileReader(f);
252
			storage.load(reader);
253
			pat.setstate(storage);			
254
		} catch (Exception e) {
253 255
			e.printStackTrace();
254
		} catch (ValidationException e) {
255
			e.printStackTrace();
256
		} catch (FileNotFoundException e) {
257
			e.printStackTrace();
258 256
		}
259 257
		NormAlgorithm na = new NormAlgorithm(pat);
260 258

  

Also available in: Unified diff