Revision 21927 branches/Mobile_Compatible_Hito_1/libFMap_mobile_shp_driver/src-test/org/gvsig/data/datastores/vectorial/file/shp/PerformanceTest.java

View differences:

PerformanceTest.java
14 14
import org.gvsig.data.datastores.vectorial.file.shp_jni.JNISHPStore;
15 15
import org.gvsig.data.datastores.vectorial.file.shp_mem.MemSHPStore;
16 16

  
17
import es.prodevelop.gvsig.mobile.fmap.driver.vect.shp.ShpReader;
18

  
17 19
//import es.prodevelop.gvsig.mobile.fmap.layer.newmodel.FPerformanceTestVectorLayer;
18 20
//import es.prodevelop.gvsig.mobile.fmap.util.ResourceReader;
19 21
//import es.prodevelop.gvsig.mobile.fmap.util.Utils;
......
32 34
 */
33 35
public class PerformanceTest extends TestCase {
34 36
	
35
	private static Logger logger = Logger.getLogger(PerformanceTest.class);
37
	private static Logger logger;
36 38
	public static String SD_FOLDER = "Tarjeta SD";
37 39
	
38 40
	private static String resourceDir = "";
......
79 81
	public static final String[] FEATURE_SIZE_TEST_FEATURE_TYPES = {
80 82
		"few", "medium", "many" };
81 83
	public static final String FEATURE_SIZE_TEST_BASE_FILE_NAME = "VerticesPerFeature.shp";
84
	
85
	public PerformanceTest() {
86
		ShpReader.touch();
87
		initLogger();
88
	}
82 89

  
83 90
	public static void main(String[] args) {
84 91
		junit.textui.TestRunner.run(PerformanceTest.class);
......
87 94
	protected void setUp() throws Exception {
88 95
		super.setUp();
89 96
	}
90

  
97
	
91 98
	public void testInitialize() {
92
		initLogger();
93 99

  
94 100
		new SHPStore();
95
		 testShpDriver(SHPStore.DATASTORE_NAME);
101
		doit(SHPStore.DATASTORE_NAME);
96 102
		
97 103
		new MemSHPStore();
98
		testShpDriver(MemSHPStore.DATASTORE_NAME);
104
		doit(MemSHPStore.DATASTORE_NAME);
99 105
		
100 106
		new JNISHPStore();
101
		testShpDriver(JNISHPStore.DATASTORE_NAME);
107
		doit(JNISHPStore.DATASTORE_NAME);
108
		
109
		logger.debug("FIN.");
102 110
	}
103 111

  
104
	private void testShpDriver(String storename) {
112
	private void doit(String storename) {
105 113
		File shpFile = null;
106 114

  
107 115
		int[] sizes = SIZE_TEST_FILE_SIZES;
......
155 163
		String outlogpath = "";
156 164
		
157 165
		if (Utils.USING_PDA) {
158
			outlogpath = getPdaTestFile(SD_FOLDER, "testdata", "performance_" + nowstr).getAbsolutePath();
166
			outlogpath = getPdaTestFile(SD_FOLDER, "testdata", "performance_test_" + nowstr).getAbsolutePath();
159 167
		} else {
160
			outlogpath = getResourceFile("testdata", "performance_" + nowstr).getAbsolutePath();
168
			outlogpath = getResourceFile("testdata", "performance_test_" + nowstr).getAbsolutePath();
161 169
		}
162 170

  
163 171
		System.out.println("Log file: " + outlogpath);
......
173 181
			System.err.println("Error while initializing log4j: " + ex.getMessage());
174 182
		}
175 183
		
184
		logger = Logger.getLogger(PerformanceTest.class);
185
		
176 186
	}
177 187

  
178 188
	private void performance(File file, String st_name) {
179 189

  
180 190
		if (!file.exists()) return;
181
		PerformanceTester lyr = null;
191
		PerformanceMeasure lyr = null;
182 192
		try {
183
			lyr = new PerformanceTester(file, logger, st_name);
193
			lyr = new PerformanceMeasure(file, logger, st_name);
184 194
			for (int i=0; i<REPEAT_TIMES; i++) {
195
				// just to see the progress bar
196
				assertTrue(true);
185 197
				lyr.drawStore();
186 198
			}
187 199
		} catch (Exception e) {

Also available in: Unified diff