--- a/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java	Fri Nov 27 13:09:48 2009 +0000
+++ b/geo-backend/src/test/java/de/intevation/gnv/geobackend/base/query/QueryExecutorTestCase.java	Fri Nov 27 13:13:34 2009 +0000
@@ -82,61 +82,7 @@
     
     public void  testChooseFis(){
         try {
-            this.testQuery(4, "choose_fis_query", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-        try {
-            this.testQuery(33, "choose_fis_query_2", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-        try {
-            this.testQuery(4, "choose_fis_query_3", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-    }
-    
-    public void  testChooseFisAttributeFirst(){
-        try {
-            this.testQuery(33, "choose_fis_query", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-    }
-    
-    
-    public void  testAreaFilterInstPoint(){
-        try {
-            //this.testQuery(2, "test_vehicle_orig", null);
-            this.testQuery(4, "test_track_area", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-    }
-    
-    public void  testChooseFisSpatialFirst(){
-        try {
-            this.testQuery(4, "choose_fis_query", null);
-        } catch (QueryException e) {
-            log.error(e, e);
-            //fail();
-        }
-    }
-    
-    public void  testODVQueries(){
-        try {
-            //this.testQuery(47875, "query_odv_data_timeseriespoint", null);
-            //this.testQuery(5, "query_odv_data_vp_timeseriespoint", null);
-            //this.testQuery(672, "query_odv_data_mesh", null);
-            this.testQuery(8, "query_odv_data_vp_mesh", null);
-            
+            this.testQuery(1, "choose_fis_query", null);
         } catch (QueryException e) {
             log.error(e, e);
             fail();
@@ -207,7 +153,6 @@
                 for (int i = 0; i < columns; i++){
                     String columnName = resultDescriptor.getColumnName(i);
                     Object value = tmpResult.getString(columnName);
-                    if (value != null)
                     log.debug(columnName + " ==> "+value.toString());
                 }
             }