Revision 17651

View differences:

trunk/libraries/libRaster/src-test/org/gvsig/raster/dataset/io/rmf/TestRmfWrite.java
41 41
import org.gvsig.raster.datastruct.ViewPortData;
42 42
import org.gvsig.raster.datastruct.serializer.ColorTableRmfSerializer;
43 43
import org.gvsig.raster.datastruct.serializer.HistogramRmfSerializer;
44
import org.gvsig.raster.datastruct.serializer.NoDataRmfSerializer;
44 45
/**
45 46
 * Test de escritura de ficheros rmf.
46 47
 * Escribe un fichero rmf con distintos bloques y a continuaci?n le pasa un
......
152 153
		GeoPointRmfSerializer ser4 = new GeoPointRmfSerializer(new GeoPoint[]{p1, p2}, p1.leftViewPort);
153 154
		manager.addClient(ser4);
154 155

  
156
		// Valor NoData
157
		NoDataRmfSerializer ser5 = new NoDataRmfSerializer(Double.valueOf(5450.0));
158
		manager.addClient(ser5);
159

  
155 160
		try {
156 161
			manager.write();
157 162
		} catch (FileNotFoundException e) {
trunk/libraries/libRaster/src-test/org/gvsig/raster/dataset/io/rmf/TestRmfRead.java
36 36
import org.gvsig.raster.datastruct.HistogramClass;
37 37
import org.gvsig.raster.datastruct.serializer.ColorTableRmfSerializer;
38 38
import org.gvsig.raster.datastruct.serializer.HistogramRmfSerializer;
39
import org.gvsig.raster.datastruct.serializer.NoDataRmfSerializer;
39 40

  
40 41
/**
41 42
 * Test de lectura para ficheros rmf.
......
82 83
		StatisticsRmfSerializer ser2 = new StatisticsRmfSerializer();
83 84
		GeoInfoRmfSerializer ser3 = new GeoInfoRmfSerializer(f1);
84 85
		GeoPointRmfSerializer ser4 = new GeoPointRmfSerializer();
86
		NoDataRmfSerializer ser5 = new NoDataRmfSerializer();
85 87

  
86 88
		manager.addClient(ser);
87 89
		manager.addClient(ser1);
88 90
		manager.addClient(ser2);
89 91
		manager.addClient(ser3);
90 92
		manager.addClient(ser4);
93
		manager.addClient(ser5);
91 94

  
92 95
		try {
93 96
			manager.read(null);
94 97
			for (int i = 0; i < manager.getClientsCount(); i++) {
95 98
				IRmfBlock client = manager.getClient(i);
96
				if(client instanceof HistogramRmfSerializer)
97
					testHistogram((Histogram)manager.getClient(i).getResult());
99
				if (client instanceof HistogramRmfSerializer)
100
					testHistogram((Histogram) client.getResult());
98 101
				if (client instanceof ColorTableRmfSerializer) {
99
					ColorTable colorTable = (ColorTable)manager.getClient(i).getResult();
102
					ColorTable colorTable = (ColorTable) client.getResult();
100 103
					colorTable.setInterpolated(false);
101 104
					testColorTable(colorTable);
102 105
				}
103
				if(client instanceof StatisticsRmfSerializer)
104
					testStatistics((DatasetStatistics)manager.getClient(i).getResult());
105
				if(client instanceof GeoInfoRmfSerializer)
106
					testGeoInfo((RasterDataset)manager.getClient(i).getResult());
107
				if(client instanceof GeoPointRmfSerializer)
108
					testGeoPoints((GeoPoint[])manager.getClient(i).getResult());
106
				if (client instanceof StatisticsRmfSerializer)
107
					testStatistics((DatasetStatistics) client.getResult());
108
				if (client instanceof NoDataRmfSerializer)
109
					testNoData((Double) client.getResult());
110
//				if (client instanceof GeoInfoRmfSerializer)
111
//					testGeoInfo((RasterDataset) client.getResult());
112
				if (client instanceof GeoPointRmfSerializer)
113
					testGeoPoints((GeoPoint[]) client.getResult());
109 114
			}
110 115

  
111 116
		} catch (ParsingException e) {
......
180 185
		}
181 186
	}
182 187

  
188
	public void testNoData(Double noData) {
189
		assertEquals((int) noData.doubleValue(), 5450);
190
	}
191

  
183 192
	public void testStatistics(DatasetStatistics ds) {
184 193
		int bandCount = ds.getBandCount();
185 194
		double[] max = ds.getMax();

Also available in: Unified diff