Revision 32191

View differences:

branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/persistence/TestPersistenceSaveLoad.java
83 83
		GeocodingPattern pat2 = new DefaultGeocodingPattern();
84 84
		pat2.setXMLEntity(xml);
85 85

  
86
		assertEquals(pat.getPatternname(), pat2.getPatternname());
87
		assertEquals(pat.getSettings().getResultsNumber(), pat2.getSettings()
88
				.getResultsNumber());
89
		assertEquals(pat.getSource().getLayerProvider(), pat2.getSource()
86
		assertEquals(pat.getPatternName(), pat2.getPatternName());
87
		assertEquals(pat.getSettings().getMaxResultsNumber(), pat2.getSettings()
88
				.getMaxResultsNumber());
89
		assertEquals(pat.getDataSource().getLayerProvider(), pat2.getDataSource()
90 90
				.getLayerProvider());
91
		assertEquals(pat.getSource().getStyle().getRelationsLiteral()
92
				.firstKey(), pat2.getSource().getStyle().getRelationsLiteral()
91
		assertEquals(pat.getDataSource().getStyle().getRelationsLiteral()
92
				.firstKey(), pat2.getDataSource().getStyle().getRelationsLiteral()
93 93
				.firstKey());
94 94

  
95 95
	}
......
108 108
		GeocodingPattern pat2 = new DefaultGeocodingPattern();
109 109
		pat2.setXMLEntity(xml);
110 110

  
111
		assertEquals(pat.getPatternname(), pat2.getPatternname());
112
		assertEquals(pat.getSettings().getResultsNumber(), pat2.getSettings()
113
				.getResultsNumber());
114
		assertEquals(pat.getSource().getLayerProvider(), pat2.getSource()
111
		assertEquals(pat.getPatternName(), pat2.getPatternName());
112
		assertEquals(pat.getSettings().getMaxResultsNumber(), pat2.getSettings()
113
				.getMaxResultsNumber());
114
		assertEquals(pat.getDataSource().getLayerProvider(), pat2.getDataSource()
115 115
				.getLayerProvider());
116
		assertEquals(pat.getSource().getStyle().getRelationsLiteral()
117
				.firstKey(), pat2.getSource().getStyle().getRelationsLiteral()
116
		assertEquals(pat.getDataSource().getStyle().getRelationsLiteral()
117
				.firstKey(), pat2.getDataSource().getStyle().getRelationsLiteral()
118 118
				.firstKey());
119
		assertEquals(((SimpleRange) pat.getSource().getStyle())
120
				.getFirstNumber(), ((SimpleRange) pat2.getSource().getStyle())
119
		assertEquals(((SimpleRange) pat.getDataSource().getStyle())
120
				.getFirstNumber(), ((SimpleRange) pat2.getDataSource().getStyle())
121 121
				.getFirstNumber());
122 122

  
123 123
	}
......
136 136
		GeocodingPattern pat2 = new DefaultGeocodingPattern();
137 137
		pat2.setXMLEntity(xml);
138 138

  
139
		assertEquals(pat.getPatternname(), pat2.getPatternname());
140
		assertEquals(pat.getSettings().getResultsNumber(), pat2.getSettings()
141
				.getResultsNumber());
142
		assertEquals(pat.getSource().getLayerProvider(), pat2.getSource()
139
		assertEquals(pat.getPatternName(), pat2.getPatternName());
140
		assertEquals(pat.getSettings().getMaxResultsNumber(), pat2.getSettings()
141
				.getMaxResultsNumber());
142
		assertEquals(pat.getDataSource().getLayerProvider(), pat2.getDataSource()
143 143
				.getLayerProvider());
144
		assertEquals(pat.getSource().getStyle().getRelationsLiteral()
145
				.firstKey(), pat2.getSource().getStyle().getRelationsLiteral()
144
		assertEquals(pat.getDataSource().getStyle().getRelationsLiteral()
145
				.firstKey(), pat2.getDataSource().getStyle().getRelationsLiteral()
146 146
				.firstKey());
147
		assertEquals(((DoubleRange) pat.getSource().getStyle())
148
				.getLastRightNumber(), ((DoubleRange) pat2.getSource()
147
		assertEquals(((DoubleRange) pat.getDataSource().getStyle())
148
				.getLastRightNumber(), ((DoubleRange) pat2.getDataSource()
149 149
				.getStyle()).getLastRightNumber());
150 150

  
151 151
	}
......
164 164
		GeocodingPattern pat2 = new DefaultGeocodingPattern();
165 165
		pat2.setXMLEntity(xml);
166 166

  
167
		assertEquals(pat.getPatternname(), pat2.getPatternname());
168
		assertEquals(pat.getSettings().getResultsNumber(), pat2.getSettings()
169
				.getResultsNumber());
170
		assertEquals(pat.getSource().getLayerProvider(), pat2.getSource()
167
		assertEquals(pat.getPatternName(), pat2.getPatternName());
168
		assertEquals(pat.getSettings().getMaxResultsNumber(), pat2.getSettings()
169
				.getMaxResultsNumber());
170
		assertEquals(pat.getDataSource().getLayerProvider(), pat2.getDataSource()
171 171
				.getLayerProvider());
172
		assertEquals(pat.getSource().getStyle().getRelationsLiteral()
173
				.firstKey(), pat2.getSource().getStyle().getRelationsLiteral()
172
		assertEquals(pat.getDataSource().getStyle().getRelationsLiteral()
173
				.firstKey(), pat2.getDataSource().getStyle().getRelationsLiteral()
174 174
				.firstKey());
175 175
		
176 176

  

Also available in: Unified diff