Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at 01c6078 [master] test geo_in_rectangle: migrate out of range error tests to grntest style

Kouhei Sutou null+****@clear*****
Sat Dec 7 22:28:22 JST 2013

• Previous message: [Groonga-commit] [Still Failing] groonga/groonga#2557 (master - 86c84e4)
• Next message: [Groonga-commit] [Still Failing] groonga/groonga#2558 (master - 125a117)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2013-12-07 22:28:22 +0900 (Sat, 07 Dec 2013)

  New Revision: 01c6078ed2794082cc14b9abd2a17865d7eb4fbd
  https://github.com/groonga/groonga/commit/01c6078ed2794082cc14b9abd2a17865d7eb4fbd

  Message:
    test geo_in_rectangle: migrate out of range error tests to grntest style

  Added files:
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.test
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.expected
    test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.test
  Modified files:
    lib/geo.c
    test/command/fixture/geo/in_rectangle/ddl.grn
    test/command/fixture/geo/in_rectangle/north_east.grn
    test/command/fixture/geo/in_rectangle/north_west.grn
    test/command/fixture/geo/in_rectangle/south_east.grn
    test/unit/story/test-taiyaki.c

  Modified: lib/geo.c (+2 -2)
===================================================================
--- lib/geo.c    2013-12-07 22:11:20 +0900 (0aa605b)
+++ lib/geo.c    2013-12-07 22:28:22 +0900 (2a2c67d)
@@ -1088,7 +1088,7 @@ in_rectangle_data_validate(grn_ctx *ctx,
   if (top_left->longitude <= GRN_GEO_MIN_LONGITUDE) {
     ERR(GRN_INVALID_ARGUMENT,
         "%s: top left point's longitude is too small: "
-        "<%d>(max:%d): (%d,%d) (%d,%d)",
+        "<%d>(min:%d): (%d,%d) (%d,%d)",
         process_name,
         GRN_GEO_MIN_LONGITUDE, top_left->longitude,
         top_left->latitude, top_left->longitude,
@@ -1121,7 +1121,7 @@ in_rectangle_data_validate(grn_ctx *ctx,
   if (bottom_right->longitude <= GRN_GEO_MIN_LONGITUDE) {
     ERR(GRN_INVALID_ARGUMENT,
         "%s: bottom right point's longitude is too small: "
-        "<%d>(max:%d): (%d,%d) (%d,%d)",
+        "<%d>(min:%d): (%d,%d) (%d,%d)",
         process_name,
         GRN_GEO_MIN_LONGITUDE, bottom_right->longitude,
         top_left->latitude, top_left->longitude,

  Modified: test/command/fixture/geo/in_rectangle/ddl.grn (+2 -1)
===================================================================
--- test/command/fixture/geo/in_rectangle/ddl.grn    2013-12-07 22:11:20 +0900 (a7044dd)
+++ test/command/fixture/geo/in_rectangle/ddl.grn    2013-12-07 22:28:22 +0900 (7b248e9)
@@ -1,6 +1,7 @@
+#@disable-logging
 table_create LandMarks TABLE_NO_KEY
 column_create LandMarks point COLUMN_SCALAR WGS84GeoPoint
 
 table_create Points TABLE_PAT_KEY WGS84GeoPoint
 column_create Points land_mark_index COLUMN_INDEX LandMarks point
-
+#@enable-logging

  Modified: test/command/fixture/geo/in_rectangle/north_east.grn (+1 -2)
===================================================================
--- test/command/fixture/geo/in_rectangle/north_east.grn    2013-12-07 22:11:20 +0900 (6a4a831)
+++ test/command/fixture/geo/in_rectangle/north_east.grn    2013-12-07 22:28:22 +0900 (08b24f6)
@@ -1,6 +1,6 @@
-#@disable-logging
 #@include fixture/geo/in_rectangle/ddl.grn
 
+#@disable-logging
 load --table LandMarks
 [
 ["point"],
@@ -261,5 +261,4 @@ load --table LandMarks
 ["15x14"],
 ["15x15"]
 ]
-
 #@enable-logging

  Modified: test/command/fixture/geo/in_rectangle/north_west.grn (+1 -2)
===================================================================
--- test/command/fixture/geo/in_rectangle/north_west.grn    2013-12-07 22:11:20 +0900 (ede42be)
+++ test/command/fixture/geo/in_rectangle/north_west.grn    2013-12-07 22:28:22 +0900 (dfff91e)
@@ -1,6 +1,6 @@
-#@disable-logging
 #@include fixture/geo/in_rectangle/ddl.grn
 
+#@disable-logging
 load --table LandMarks
 [
 ["point"],
@@ -261,5 +261,4 @@ load --table LandMarks
 ["15x-15"],
 ["15x-16"]
 ]
-
 #@enable-logging

  Modified: test/command/fixture/geo/in_rectangle/south_east.grn (+1 -2)
===================================================================
--- test/command/fixture/geo/in_rectangle/south_east.grn    2013-12-07 22:11:20 +0900 (38f7c2a)
+++ test/command/fixture/geo/in_rectangle/south_east.grn    2013-12-07 22:28:22 +0900 (b23c070)
@@ -1,6 +1,6 @@
-#@disable-logging
 #@include fixture/geo/in_rectangle/ddl.grn
 
+#@disable-logging
 load --table LandMarks
 [
 ["point"],
@@ -261,5 +261,4 @@ load --table LandMarks
 ["-16x14"],
 ["-16x15"]
 ]
-
 #@enable-logging

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.expected    2013-12-07 22:28:22 +0900 (50371d4)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "90.0x0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): bottom right point's latitude is too big: <324000000>(max:324000000): (0,0) (324000000,0)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): bottom right point's latitude is too big: <324000000>(max:324000000): (0,0) (324000000,0)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_latitude.test    2013-12-07 22:28:22 +0900 (ee3788a)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "90.0x0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.expected    2013-12-07 22:28:22 +0900 (1edd5a9)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "0x180.0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): bottom right point's longitude is too big: <648000000>(max:648000000): (0,0) (0,648000000)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): bottom right point's longitude is too big: <648000000>(max:648000000): (0,0) (0,648000000)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_max_longitude.test    2013-12-07 22:28:22 +0900 (9f34da4)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "0x180.0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.expected    2013-12-07 22:28:22 +0900 (c750902)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "-90.0x0")'
+[
+  [
+    [
+      -38,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): the Southern Hemisphere is not implemented."
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): the Southern Hemisphere is not implemented.

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_latitude.test    2013-12-07 22:28:22 +0900 (0db513e)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "-90.0x0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.expected    2013-12-07 22:28:22 +0900 (025ae5b)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "0x-180.0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): bottom right point's longitude is too small: <-648000000>(min:-648000000): (0,0) (0,-648000000)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): bottom right point's longitude is too small: <-648000000>(min:-648000000): (0,0) (0,-648000000)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/bottom_right_over_min_longitude.test    2013-12-07 22:28:22 +0900 (7740472)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x0", "0x-180.0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.expected    2013-12-07 22:28:22 +0900 (7a6eae9)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "90.0x0", "0x0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): top left point's latitude is too big: <324000000>(max:324000000): (324000000,0) (0,0)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): top left point's latitude is too big: <324000000>(max:324000000): (324000000,0) (0,0)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_latitude.test    2013-12-07 22:28:22 +0900 (16f3841)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "90.0x0", "0x0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.expected    2013-12-07 22:28:22 +0900 (9b5f952)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x180.0", "0x0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): top left point's longitude is too big: <648000000>(max:648000000): (0,648000000) (0,0)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): top left point's longitude is too big: <648000000>(max:648000000): (0,648000000) (0,0)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_max_longitude.test    2013-12-07 22:28:22 +0900 (bbc2e29)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x180.0", "0x0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.expected    2013-12-07 22:28:22 +0900 (50f81ec)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "-90.0x0", "0x0")'
+[
+  [
+    [
+      -38,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): the Southern Hemisphere is not implemented."
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): the Southern Hemisphere is not implemented.

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_latitude.test    2013-12-07 22:28:22 +0900 (9c96595)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "-90.0x0", "0x0")'

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.expected (+15 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.expected    2013-12-07 22:28:22 +0900 (79f8f8d)
@@ -0,0 +1,15 @@
+select LandMarks --filter 'geo_in_rectangle(point, "0x-180.0", "0x0")'
+[
+  [
+    [
+      -22,
+      0.0,
+      0.0
+    ],
+    "geo_in_rectangle(): top left point's longitude is too small: <-648000000>(min:-648000000): (0,-648000000) (0,0)"
+  ],
+  [
+
+  ]
+]
+#|e| geo_in_rectangle(): top left point's longitude is too small: <-648000000>(min:-648000000): (0,-648000000) (0,0)

  Added: test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.test (+3 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/select/filter/geo_in_rectangle/invalid/top_left_over_min_longitude.test    2013-12-07 22:28:22 +0900 (2e84050)
@@ -0,0 +1,3 @@
+#@include fixture/geo/in_rectangle/ddl.grn
+
+select LandMarks --filter 'geo_in_rectangle(point, "0x-180.0", "0x0")'

  Modified: test/unit/story/test-taiyaki.c (+0 -83)
===================================================================
--- test/unit/story/test-taiyaki.c    2013-12-07 22:11:20 +0900 (08ead7a)
+++ test/unit/story/test-taiyaki.c    2013-12-07 22:28:22 +0900 (b3170d6)
@@ -22,11 +22,6 @@
 #include "../lib/grn-assertions.h"
 
 void test_in_circle(void);
-void test_in_rectangle_over_border(void);
-void test_in_rectangle_over_top_left_latitude(void);
-void test_in_rectangle_over_top_left_longitude(void);
-void test_in_rectangle_over_bottom_right_latitude(void);
-void test_in_rectangle_over_bottom_right_longitude(void);
 void test_sort(void);
 void test_filter_by_tag_and_sort_by_distance_from_tokyo_tocho(void);
 void test_in_circle_and_tag(void);
@@ -132,84 +127,6 @@ test_in_circle(void)
 }
 
 void
-test_in_rectangle_over_border(void)
-{
-  grn_test_assert_send_command_error(
-    context,
-    GRN_FUNCTION_NOT_IMPLEMENTED,
-    "geo_in_rectangle(): the Southern Hemisphere is not implemented.",
-    "select Shops "
-    "--sortby '+name' "
-    "--output_columns 'name, location' "
-    "--filter 'geo_in_rectangle(location, "
-    "\"35.73360x-139.7394\", \"-35.62614x139.7714\")'");
-}
-
-void
-test_in_rectangle_over_top_left_latitude(void)
-{
-  grn_test_assert_send_command_error(
-    context,
-    GRN_INVALID_ARGUMENT,
-    "geo_in_rectangle(): top left point's latitude is too big: "
-    "<324000000>(max:324000000): "
-    "(324000000,503061840) (128254104,50317704",
-    "select Shops "
-    "--sortby '+name' "
-    "--output_columns 'name, location' "
-    "--filter "
-    "'geo_in_rectangle(location, \"90.0x139.7394\", \"35.62614x139.7714\")'");
-}
-
-void
-test_in_rectangle_over_top_left_longitude(void)
-{
-  grn_test_assert_send_command_error(
-    context,
-    GRN_INVALID_ARGUMENT,
-    "geo_in_rectangle(): top left point's longitude is too big: "
-    "<648000000>(max:648000000): "
-    "(128640960,648000000) (128254104,5031770",
-    "select Shops "
-    "--sortby '+name' "
-    "--output_columns 'name, location' "
-    "--filter "
-    "'geo_in_rectangle(location, \"35.73360x180.0\", \"35.62614x139.7714\")'");
-}
-
-void
-test_in_rectangle_over_bottom_right_latitude(void)
-{
-  grn_test_assert_send_command_error(
-    context,
-    GRN_INVALID_ARGUMENT,
-    "geo_in_rectangle(): bottom right point's latitude is too big: "
-    "<324000000>(max:324000000): "
-    "(128640960,503061840) (324000000,5031",
-    "select Shops "
-    "--sortby '+name' "
-    "--output_columns 'name, location' "
-    "--filter "
-    "'geo_in_rectangle(location, \"35.73360x139.7394\", \"90.0x139.7714\")'");
-}
-
-void
-test_in_rectangle_over_bottom_right_longitude(void)
-{
-  grn_test_assert_send_command_error(
-    context,
-    GRN_INVALID_ARGUMENT,
-    "geo_in_rectangle(): bottom right point's longitude is too big: "
-    "<648000000>(max:648000000): "
-    "(128640960,503061840) (128254104,648",
-    "select Shops "
-    "--sortby '+name' "
-    "--output_columns 'name, location' "
-    "--filter "
-    "'geo_in_rectangle(location, \"35.73360x139.7394\", \"35.62614x180.0\")'");
-}
-
-void
 test_sort(void)
 {
   gdouble yurakucho_latitude = 35.67487;
-------------- next part --------------
HTML����������������������������...
ダウンロード 

• Previous message: [Groonga-commit] [Still Failing] groonga/groonga#2557 (master - 86c84e4)
• Next message: [Groonga-commit] [Still Failing] groonga/groonga#2558 (master - 125a117)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]