Revision 32307 trunk/libraries/libGeocoding/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.FileReader;
31
import java.io.FileNotFoundException;
32 32
import java.io.IOException;
33
import java.io.UnsupportedEncodingException;
33 34
import java.util.ArrayList;
34 35

  
35 36
import junit.framework.TestCase;
36 37

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

  
42 43
import com.iver.cit.gvsig.fmap.drivers.dbf.DBFDriver;
44
import com.iver.cit.gvsig.fmap.layers.XMLException;
43 45

  
44 46
/**
45 47
 * 
......
51 53

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

  
54
	public void testFilterString() {
56
	public void testFilterString() throws MarshalException,
57
			FileNotFoundException, UnsupportedEncodingException,
58
			ValidationException, XMLException {
55 59

  
56 60
		log.info("TestFilterString: start the test");
57 61

  
......
63 67

  
64 68
		assertNotNull(fPat);
65 69

  
66
		Patternnormalization pat = parserPat(fPat);
70
		NormalizationPattern pat = parserPat(fPat);
67 71
		assertNotNull(pat);
68 72

  
69 73
		File outputFile = null;
......
126 130
		log.info("TestFilterString: test finished");
127 131
	}
128 132

  
129
	private Patternnormalization parserPat(File f) {
130
		Patternnormalization pat = new Patternnormalization();
131
		IStorage storage = new StorageXML();
132
		try {
133
			FileReader red = new FileReader(f);
134
			storage.load(red);
135
			pat.setstate(storage);
136
		} catch (Exception e) {
137
			e.printStackTrace();
138
		}
133
	private NormalizationPattern parserPat(File f) throws MarshalException,
134
			FileNotFoundException, UnsupportedEncodingException,
135
			ValidationException, XMLException {
136
		NormalizationPattern pat = new NormalizationPattern();
137
		pat.loadFromXML(f);
139 138
		return pat;
140 139
	}
141 140

  

Also available in: Unified diff