diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-07-15 12:33:00 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-07-15 15:39:25 +0000 |
commit | 7dc8a816fca0242fc00c0ee613252747b29d1f80 (patch) | |
tree | f39f07544e79ecc013e1d8ec940c9aa0c7d3ceb3 | |
parent | 39641e98e5770f460632075c71bac6fa3010e5a5 (diff) |
remove now-duplicate test
-rw-r--r-- | searchlib/src/tests/common/location/CMakeLists.txt | 8 | ||||
-rw-r--r-- | searchlib/src/tests/common/location/location_test.cpp | 94 |
2 files changed, 0 insertions, 102 deletions
diff --git a/searchlib/src/tests/common/location/CMakeLists.txt b/searchlib/src/tests/common/location/CMakeLists.txt index 0e36db46db9..ea0d96529e1 100644 --- a/searchlib/src/tests/common/location/CMakeLists.txt +++ b/searchlib/src/tests/common/location/CMakeLists.txt @@ -1,12 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_location_test_app TEST - SOURCES - location_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_location_test_app COMMAND searchlib_location_test_app) - vespa_add_executable(searchlib_geo_location_test_app TEST SOURCES geo_location_test.cpp diff --git a/searchlib/src/tests/common/location/location_test.cpp b/searchlib/src/tests/common/location/location_test.cpp deleted file mode 100644 index aac772b7dd0..00000000000 --- a/searchlib/src/tests/common/location/location_test.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/searchlib/common/location.h> -#include <vespa/searchlib/common/geo_location_parser.h> -#include <vespa/searchlib/attribute/attributeguard.h> - -using search::common::Location; -using search::common::GeoLocationParser; - -Location parse(const char *str) { - GeoLocationParser parser; - if (!EXPECT_TRUE(parser.parseOldFormat(str))) { - fprintf(stderr, " parse error: %s\n", parser.getParseError()); - } - return Location(parser.getGeoLocation()); -} - -TEST("require that bounding boxes can be parsed") { - Location loc = parse("[2,10,20,30,40]"); - EXPECT_EQUAL(false, loc.getRankOnDistance()); - EXPECT_EQUAL(true, loc.getPruneOnDistance()); - EXPECT_EQUAL(0u, loc.x_aspect.multiplier); - EXPECT_EQUAL(0, loc.point.x); - EXPECT_EQUAL(0, loc.point.y); - EXPECT_EQUAL(std::numeric_limits<uint32_t>::max(), loc.radius); - EXPECT_EQUAL(10, loc.bounding_box.x.lo); - EXPECT_EQUAL(20, loc.bounding_box.y.lo); - EXPECT_EQUAL(30, loc.bounding_box.x.hi); - EXPECT_EQUAL(40, loc.bounding_box.y.hi); -} - -TEST("require that circles can be parsed") { - Location loc = parse("(2,10,20,5,0,0,0)"); - EXPECT_EQUAL(true, loc.getRankOnDistance()); - EXPECT_EQUAL(true, loc.getPruneOnDistance()); - EXPECT_EQUAL(0u, loc.x_aspect.multiplier); - EXPECT_EQUAL(10, loc.point.x); - EXPECT_EQUAL(20, loc.point.y); - EXPECT_EQUAL(5u, loc.radius); - EXPECT_EQUAL(5, loc.bounding_box.x.lo); - EXPECT_EQUAL(15, loc.bounding_box.y.lo); - EXPECT_EQUAL(15, loc.bounding_box.x.hi); - EXPECT_EQUAL(25, loc.bounding_box.y.hi); -} - -TEST("require that circles can have aspect ratio") { - Location loc = parse("(2,10,20,5,0,0,0,2147483648)"); - EXPECT_EQUAL(true, loc.getRankOnDistance()); - EXPECT_EQUAL(true, loc.getPruneOnDistance()); - EXPECT_EQUAL(2147483648u, loc.x_aspect.multiplier); - EXPECT_EQUAL(10, loc.point.x); - EXPECT_EQUAL(20, loc.point.y); - EXPECT_EQUAL(5u, loc.radius); - EXPECT_EQUAL(-1, loc.bounding_box.x.lo); - EXPECT_EQUAL(15, loc.bounding_box.y.lo); - EXPECT_EQUAL(21, loc.bounding_box.x.hi); - EXPECT_EQUAL(25, loc.bounding_box.y.hi); -} - -TEST("require that bounding box can be specified after circle") { - Location loc = parse("(2,10,20,5,0,0,0)[2,10,20,30,40]"); - EXPECT_EQUAL(true, loc.getRankOnDistance()); - EXPECT_EQUAL(true, loc.getPruneOnDistance()); - EXPECT_EQUAL(0u, loc.x_aspect.multiplier); - EXPECT_EQUAL(10, loc.point.x); - EXPECT_EQUAL(20, loc.point.y); - EXPECT_EQUAL(5u, loc.radius); - EXPECT_EQUAL(10, loc.bounding_box.x.lo); - EXPECT_EQUAL(20, loc.bounding_box.y.lo); - EXPECT_EQUAL(15, loc.bounding_box.x.hi); - EXPECT_EQUAL(25, loc.bounding_box.y.hi); -} - -TEST("require that circles can be specified after bounding box") { - Location loc = parse("[2,10,20,30,40](2,10,20,5,0,0,0)"); - EXPECT_EQUAL(true, loc.getRankOnDistance()); - EXPECT_EQUAL(true, loc.getPruneOnDistance()); - EXPECT_EQUAL(0u, loc.x_aspect.multiplier); - EXPECT_EQUAL(10, loc.point.x); - EXPECT_EQUAL(20, loc.point.y); - EXPECT_EQUAL(5u, loc.radius); - EXPECT_EQUAL(10, loc.bounding_box.x.lo); - EXPECT_EQUAL(20, loc.bounding_box.y.lo); - EXPECT_EQUAL(15, loc.bounding_box.x.hi); - EXPECT_EQUAL(25, loc.bounding_box.y.hi); -} - -TEST("require that santa search gives non-wrapped bounding box") { - Location loc = parse("(2,122163600,89998536,290112,4,2000,0,109704)"); - EXPECT_GREATER_EQUAL(loc.bounding_box.x.hi, loc.bounding_box.x.lo); - EXPECT_GREATER_EQUAL(loc.bounding_box.y.hi, loc.bounding_box.y.lo); -} - -TEST_MAIN() { TEST_RUN_ALL(); } |