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

View differences:

TestFilterString.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.io.IOException;
34 33
import java.util.ArrayList;
......
36 35
import junit.framework.TestCase;
37 36

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

  
44 42
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
45 43
import com.iver.cit.gvsig.fmap.drivers.dbf.DBFDriver;
......
51 49
 * 
52 50
 */
53 51
public class TestFilterString extends TestCase {
54
	
52

  
55 53
	private static final Logger log = Logger.getLogger(TestFilterString.class);
56 54

  
57

  
58 55
	public void testFilterString() {
59 56

  
60 57
		log.info("TestFilterString: start the test");
......
131 128
	}
132 129

  
133 130
	private Patternnormalization parserPat(File f) {
134
		Patternnormalization pat = null;
131
		Patternnormalization pat = new Patternnormalization();
132
		IStorage storage = new StorageXML();
135 133
		try {
136 134
			FileReader red = new FileReader(f);
137
			pat = (Patternnormalization) Patternnormalization.unmarshal(red);
138
		} catch (MarshalException e) {
135
			storage.load(red);
136
			pat.setstate(storage);
137
		} catch (Exception e) {
139 138
			e.printStackTrace();
140
		} catch (ValidationException e) {
141
			e.printStackTrace();
142
		} catch (FileNotFoundException e) {
143
			e.printStackTrace();
144 139
		}
145

  
146 140
		return pat;
147 141
	}
148 142

  

Also available in: Unified diff