Bladeren bron

raster3d test suite: do not i18N messages in test suites

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58029 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 11 jaren geleden
bovenliggende
commit
11876b8096

+ 3 - 3
lib/raster3d/test/test_coordinate_transform.c

@@ -14,15 +14,15 @@ int unit_test_coordinate_transform(void)
 {
 {
     int sum = 0;
     int sum = 0;
 
 
-    G_message(_("\n++ Running raster3d coordinate transform unit tests ++"));
+    G_message("\n++ Running raster3d coordinate transform unit tests ++");
 
 
     sum += test_coordinate_transform();
     sum += test_coordinate_transform();
     sum += test_region();
     sum += test_region();
 
 
     if (sum > 0)
     if (sum > 0)
-	G_warning(_("\n-- raster3d coordinate transform unit tests failure --"));
+	G_warning("\n-- raster3d coordinate transform unit tests failure --");
     else
     else
-	G_message(_("\n-- raster3d coordinate transform unit tests finished successfully --"));
+	G_message("\n-- raster3d coordinate transform unit tests finished successfully --");
 
 
     return sum;
     return sum;
 }
 }

+ 12 - 11
lib/raster3d/test/test_main.c

@@ -40,58 +40,59 @@ void set_params(void) {
     param.unit->type = TYPE_STRING;
     param.unit->type = TYPE_STRING;
     param.unit->required = NO;
     param.unit->required = NO;
     param.unit->options = "coord,putget,large";
     param.unit->options = "coord,putget,large";
-    param.unit->description = _("Choose the unit tests to run");
+    param.unit->description = "Choose the unit tests to run";
 
 
     param.integration = G_define_option();
     param.integration = G_define_option();
     param.integration->key = "integration";
     param.integration->key = "integration";
     param.integration->type = TYPE_STRING;
     param.integration->type = TYPE_STRING;
     param.integration->required = NO;
     param.integration->required = NO;
     param.integration->options = "";
     param.integration->options = "";
-    param.integration->description = _("Choose the integration tests to run");
+    param.integration->description = "Choose the integration tests to run";
 
 
     param.depths = G_define_option();
     param.depths = G_define_option();
     param.depths->key = "depths";
     param.depths->key = "depths";
     param.depths->type = TYPE_INTEGER;
     param.depths->type = TYPE_INTEGER;
     param.depths->required = NO;
     param.depths->required = NO;
     param.depths->answer = "20";
     param.depths->answer = "20";
-    param.depths->description = _("The number of depths to be used for the large file put/get value test");
+    param.depths->description = "The number of depths to be used for the large file put/get value test";
 
 
     param.rows = G_define_option();
     param.rows = G_define_option();
     param.rows->key = "rows";
     param.rows->key = "rows";
     param.rows->type = TYPE_INTEGER;
     param.rows->type = TYPE_INTEGER;
     param.rows->required = NO;
     param.rows->required = NO;
     param.rows->answer = "5400";
     param.rows->answer = "5400";
-    param.rows->description = _("The number of rows to be used for the large file put/get value test");
+    param.rows->description = "The number of rows to be used for the large file put/get value test";
 
 
     param.cols = G_define_option();
     param.cols = G_define_option();
     param.cols->key = "cols";
     param.cols->key = "cols";
     param.cols->type = TYPE_INTEGER;
     param.cols->type = TYPE_INTEGER;
     param.cols->required = NO;
     param.cols->required = NO;
     param.cols->answer = "10800";
     param.cols->answer = "10800";
-    param.cols->description = _("The number of columns to be used for the large file put/get value test");
+    param.cols->description = "The number of columns to be used for the large file put/get value test";
 
 
     param.tile_size = G_define_option();
     param.tile_size = G_define_option();
     param.tile_size->key = "tile_size";
     param.tile_size->key = "tile_size";
     param.tile_size->type = TYPE_INTEGER;
     param.tile_size->type = TYPE_INTEGER;
     param.tile_size->required = NO;
     param.tile_size->required = NO;
     param.tile_size->answer = "32";
     param.tile_size->answer = "32";
-    param.tile_size->description = _("The tile size in kilo bytes to be used for the large file put/get value test. Set the tile size to 2048 and the number of row*cols*depths > 130000 to reproduce the tile rle error.");
+    param.tile_size->description = "The tile size in kilo bytes to be used for the large file put/get value test. Set the tile size to 2048 and the number of row*cols*depths > 130000 to reproduce the tile rle error.";
 
 
     param.testunit = G_define_flag();
     param.testunit = G_define_flag();
     param.testunit->key = 'u';
     param.testunit->key = 'u';
-    param.testunit->description = _("Run all unit tests");
+    param.testunit->description = "Run all unit tests";
 
 
     param.testint = G_define_flag();
     param.testint = G_define_flag();
     param.testint->key = 'i';
     param.testint->key = 'i';
-    param.testint->description = _("Run all integration tests");
+    param.testint->description = "Run all integration tests";
 
 
     param.full = G_define_flag();
     param.full = G_define_flag();
     param.full->key = 'a';
     param.full->key = 'a';
-    param.full->description = _("Run all unit and integration tests");
+    param.full->description = "Run all unit and integration tests";
 
 
     param.compression = G_define_flag();
     param.compression = G_define_flag();
     param.compression->key = 'l';
     param.compression->key = 'l';
-    param.compression->description = _("Switch zip compression on");}
+    param.compression->description = "Switch zip compression on";
+}
 
 
 /* ************************************************************************* */
 /* ************************************************************************* */
 /* ************************************************************************* */
 /* ************************************************************************* */
@@ -108,7 +109,7 @@ int main(int argc, char *argv[]) {
 
 
     module = G_define_module();
     module = G_define_module();
     module->description
     module->description
-            = _("Performs unit and integration tests for the raster3d library");
+            = "Performs unit and integration tests for the raster3d library";
 
 
     /* Get parameters from user */
     /* Get parameters from user */
     set_params();
     set_params();

+ 3 - 3
lib/raster3d/test/test_put_get_value.c

@@ -35,7 +35,7 @@ int unit_test_put_get_value()
 {
 {
     int sum = 0;
     int sum = 0;
 
 
-    G_message(_("\n++ Running raster3d put/get value unit tests ++"));
+    G_message("\n++ Running raster3d put/get value unit tests ++");
 
 
     //sum += test_put_get_value_dcell();
     //sum += test_put_get_value_dcell();
     //sum += test_put_get_value_fcell();
     //sum += test_put_get_value_fcell();
@@ -43,9 +43,9 @@ int unit_test_put_get_value()
 
 
 
 
     if (sum > 0)
     if (sum > 0)
-	G_warning(_("\n-- raster3d put/get value unit tests failure --"));
+	G_warning("\n-- raster3d put/get value unit tests failure --");
     else
     else
-	G_message(_("\n-- raster3d put/get value unit tests finished successfully --"));
+	G_message("\n-- raster3d put/get value unit tests finished successfully --");
 
 
     return sum;
     return sum;
 }
 }

+ 3 - 3
lib/raster3d/test/test_put_get_value_large_file.c

@@ -34,7 +34,7 @@ int unit_test_put_get_value_large_file(int depths, int rows, int cols, int tile_
 {
 {
     int sum = 0;
     int sum = 0;
 
 
-    G_message(_("\n++ Running raster3d put/get value large file unit tests ++"));
+    G_message("\n++ Running raster3d put/get value large file unit tests ++");
 
 
     sum += test_large_file_random(depths, rows, cols, tile_size);
     sum += test_large_file_random(depths, rows, cols, tile_size);
     sum += test_large_file_sparse_random(depths, rows, cols, tile_size);
     sum += test_large_file_sparse_random(depths, rows, cols, tile_size);
@@ -45,9 +45,9 @@ int unit_test_put_get_value_large_file(int depths, int rows, int cols, int tile_
 
 
 
 
     if (sum > 0)
     if (sum > 0)
-	G_warning(_("\n-- raster3d put/get value large file unit tests failure --"));
+	G_warning("\n-- raster3d put/get value large file unit tests failure --");
     else
     else
-	G_message(_("\n-- raster3d put/get value large file unit tests finished successfully --"));
+	G_message("\n-- raster3d put/get value large file unit tests finished successfully --");
 
 
     return sum;
     return sum;
 }
 }