Revision 32307 trunk/libraries/libGeocoding/src-test/org/gvsig/normalization/operations/TestNormalizeStringsFromFile.java

View differences:

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

  
30 30
import java.io.File;
31
import java.io.FileReader;
32 31
import java.io.IOException;
33 32
import java.util.ArrayList;
34 33

  
35 34
import junit.framework.TestCase;
36 35

  
37 36
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;
37
import org.gvsig.normalization.patterns.NormalizationPattern;
41 38

  
42 39
import com.hardcode.gdbms.driver.exceptions.CloseDriverException;
43 40
import com.iver.andami.PluginServices;
......
51 48
public class TestNormalizeStringsFromFile extends TestCase {
52 49

  
53 50
	private static final Logger log = PluginServices.getLogger();
54
	Patternnormalization pat = new Patternnormalization();
51
	NormalizationPattern pat = new NormalizationPattern();
55 52
	ArrayList<String> chains = new ArrayList<String>();
56 53
	File file;
57 54
	DBFDriver test = null;
......
61 58
		File f = new File(
62 59
				"./src-test/org/gvsig/normalization/operations/testdata/normFile.xml");
63 60
		try {
64
			IStorage storage = new StorageXML();
65
			FileReader red = new FileReader(f);
66
			storage.load(red);
67
			pat.setstate(storage);
68
			// pat = (Patternnormalization) Patternnormalization.unmarshal(red);
61
			pat.loadFromXML(f);
69 62
		} catch (Exception e) {
70
			log.error("Error parsing the xml pattern", e);
63
			e.printStackTrace();
71 64
		}
65

  
72 66
		chains.add("TEST1;TEST2;TEST3");
73 67
		chains.add("TEST4;TEST5;TEST6");
74 68
		chains.add("TEST7;TEST8;TEST9");

Also available in: Unified diff