test drive new frameworks

2 files changed, 56 insertions, 69 deletions

diff --git a/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt b/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt
index a69f26f6a85..3c4c3967b50 100644
--- a/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt
+++ b/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt
@@ -4,5 +4,6 @@ vespa_add_executable(eval_fast_rename_optimizer_test_app TEST
     fast_rename_optimizer_test.cpp
     DEPENDS
     vespaeval
+    GTest::GTest
 )
 vespa_add_test(NAME eval_fast_rename_optimizer_test_app COMMAND eval_fast_rename_optimizer_test_app)
diff --git a/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp b/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp
index 3bc1472f2d5..58a3b119847 100644
--- a/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp
+++ b/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp
@@ -1,94 +1,80 @@
 // Copyright 2018 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/eval/eval/tensor_function.h>
 #include <vespa/eval/instruction/replace_type_function.h>
 #include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/eval/test/gen_spec.h>
 #include <vespa/eval/eval/test/eval_fixture.h>
-
+#include <vespa/eval/eval/test/value_compare.h>
+#include <vespa/vespalib/util/unwind_message.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/stash.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using namespace vespalib;
 using namespace vespalib::eval;
 using namespace vespalib::eval::test;
 using namespace vespalib::eval::tensor_function;
 
-const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
-
-EvalFixture::ParamRepo make_params() {
-    return EvalFixture::ParamRepo()
-        .add("x5", GenSpec().idx("x", 5))
-        .add("x5f", GenSpec().idx("x", 5).cells_float())
-        .add("x_m", GenSpec().map("x", {"a", "b", "c"}))
-        .add("xy_mm", GenSpec().map("x", {"a", "b", "c"}).map("y", {"d","e"}))
-        .add("x5y3z_m", GenSpec().idx("x", 5).idx("y", 3).map("z", {"a","b"}))
-        .add("x5yz_m", GenSpec().idx("x", 5).map("y", {"a","b"}).map("z", {"d","e"}))
-        .add("x5y3", GenSpec().idx("x", 5).idx("y", 3));
-}
-EvalFixture::ParamRepo param_repo = make_params();
+struct FunInfo {
+    using LookFor = ReplaceTypeFunction;
+    void verify(const LookFor &fun) const {
+        EXPECT_FALSE(fun.result_is_mutable());
+    }
+};
 
 void verify_optimized(const vespalib::string &expr) {
-    EvalFixture fixture(prod_factory, expr, param_repo, true);
-    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
-    auto info = fixture.find_all<ReplaceTypeFunction>();
-    EXPECT_EQUAL(info.size(), 1u);
+    CellTypeSpace all_types(CellTypeUtils::list_types(), 1);
+    EvalFixture::verify<FunInfo>(expr, {FunInfo{}}, all_types);
 }
 
 void verify_not_optimized(const vespalib::string &expr) {
-    EvalFixture fixture(prod_factory, expr, param_repo, true);
-    EXPECT_EQUAL(fixture.result(), EvalFixture::ref(expr, param_repo));
-    auto info = fixture.find_all<ReplaceTypeFunction>();
-    EXPECT_TRUE(info.empty());
-}
-
-TEST("require that non-transposing dense renames are optimized") {
-    TEST_DO(verify_optimized("rename(x5,x,y)"));
-    TEST_DO(verify_optimized("rename(x5,x,a)"));
-    TEST_DO(verify_optimized("rename(x5y3,y,z)"));
-    TEST_DO(verify_optimized("rename(x5y3,x,a)"));
-    TEST_DO(verify_optimized("rename(x5y3,(x,y),(a,b))"));
-    TEST_DO(verify_optimized("rename(x5y3,(x,y),(z,zz))"));
-    TEST_DO(verify_optimized("rename(x5y3,(x,y),(y,z))"));
-    TEST_DO(verify_optimized("rename(x5y3,(y,x),(b,a))"));
+    CellTypeSpace all_types(CellTypeUtils::list_types(), 1);
+    EvalFixture::verify<FunInfo>(expr, {}, all_types);
 }
 
-TEST("require that transposing dense renames are not optimized") {
-    TEST_DO(verify_not_optimized("rename(x5y3,x,z)"));
-    TEST_DO(verify_not_optimized("rename(x5y3,y,a)"));
-    TEST_DO(verify_not_optimized("rename(x5y3,(x,y),(y,x))"));
-    TEST_DO(verify_not_optimized("rename(x5y3,(x,y),(b,a))"));
-    TEST_DO(verify_not_optimized("rename(x5y3,(y,x),(a,b))"));
+TEST(FastRenameTest, non_transposing_dense_renames_are_optimized) {
+    UNWIND_DO(verify_optimized("rename(x5,x,y)"));
+    UNWIND_DO(verify_optimized("rename(x5,x,a)"));
+    UNWIND_DO(verify_optimized("rename(x5y3,y,z)"));
+    UNWIND_DO(verify_optimized("rename(x5y3,x,a)"));
+    UNWIND_DO(verify_optimized("rename(x5y3,(x,y),(a,b))"));
+    UNWIND_DO(verify_optimized("rename(x5y3,(x,y),(z,zz))"));
+    UNWIND_DO(verify_optimized("rename(x5y3,(x,y),(y,z))"));
+    UNWIND_DO(verify_optimized("rename(x5y3,(y,x),(b,a))"));
 }
 
-TEST("require that non-dense renames may be optimized") {
-    TEST_DO(verify_optimized("rename(x_m,x,y)"));
-    TEST_DO(verify_optimized("rename(xy_mm,(x,y),(a,b))"));
-    TEST_DO(verify_optimized("rename(xy_mm,(x,y),(y,z))"));
-    TEST_DO(verify_not_optimized("rename(xy_mm,(x,y),(b,a))"));
-    TEST_DO(verify_not_optimized("rename(xy_mm,(x,y),(y,x))"));
-
-    TEST_DO(verify_optimized("rename(x5y3z_m,(z),(a))"));
-    TEST_DO(verify_optimized("rename(x5y3z_m,(x,y,z),(b,c,a))"));
-    TEST_DO(verify_optimized("rename(x5y3z_m,(z),(a))"));
-    TEST_DO(verify_optimized("rename(x5y3z_m,(x,y,z),(b,c,a))"));
-    TEST_DO(verify_not_optimized("rename(x5y3z_m,(y),(a))"));
-    TEST_DO(verify_not_optimized("rename(x5y3z_m,(x,z),(z,x))"));
-
-    TEST_DO(verify_optimized("rename(x5yz_m,(x,y),(y,x))"));
-    TEST_DO(verify_optimized("rename(x5yz_m,(x,y,z),(c,a,b))"));
-    TEST_DO(verify_optimized("rename(x5yz_m,(y,z),(a,b))"));
-    TEST_DO(verify_not_optimized("rename(x5yz_m,(z),(a))"));
-    TEST_DO(verify_not_optimized("rename(x5yz_m,(y,z),(z,y))"));
+TEST(FastRenameTest, transposing_dense_renames_are_not_optimized) {
+    UNWIND_DO(verify_not_optimized("rename(x5y3,x,z)"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3,y,a)"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3,(x,y),(y,x))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3,(x,y),(b,a))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3,(y,x),(a,b))"));
 }
 
-TEST("require that chained optimized renames are compacted into a single operation") {
-    TEST_DO(verify_optimized("rename(rename(x5,x,y),y,z)"));
+TEST(FastRenameTest, non_dense_renames_may_be_optimized) {
+    UNWIND_DO(verify_optimized("rename(x3_1,x,y)"));
+    UNWIND_DO(verify_optimized("rename(x3_1y2_1,(x,y),(a,b))"));
+    UNWIND_DO(verify_optimized("rename(x3_1y2_1,(x,y),(y,z))"));
+    UNWIND_DO(verify_not_optimized("rename(x3_1y2_1,(x,y),(b,a))"));
+    UNWIND_DO(verify_not_optimized("rename(x3_1y2_1,(x,y),(y,x))"));
+
+    UNWIND_DO(verify_optimized("rename(x5y3z2_1,(z),(a))"));
+    UNWIND_DO(verify_optimized("rename(x5y3z2_1,(x,y,z),(b,c,a))"));
+    UNWIND_DO(verify_optimized("rename(x5y3z2_1,(z),(a))"));
+    UNWIND_DO(verify_optimized("rename(x5y3z2_1,(x,y,z),(b,c,a))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3z2_1,(y),(a))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y3z2_1,(x,z),(z,x))"));
+
+    UNWIND_DO(verify_optimized("rename(x5y2_1z9_3,(x,y),(y,x))"));
+    UNWIND_DO(verify_optimized("rename(x5y2_1z9_3,(x,y,z),(c,a,b))"));
+    UNWIND_DO(verify_optimized("rename(x5y2_1z9_3,(y,z),(a,b))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y2_1z9_3,(z),(a))"));
+    UNWIND_DO(verify_not_optimized("rename(x5y2_1z9_3,(y,z),(z,y))"));
 }
 
-TEST("require that optimization works for float cells") {
-    TEST_DO(verify_optimized("rename(x5f,x,y)"));
+TEST(FastRenameTest, chained_optimized_renames_are_compacted_into_a_single_operation) {
+    UNWIND_DO(verify_optimized("rename(rename(x5,x,y),y,z)"));
 }
 
 bool is_stable(const vespalib::string &from_spec, const vespalib::string &to_spec,
@@ -99,31 +85,31 @@ bool is_stable(const vespalib::string &from_spec, const vespalib::string &to_spe
     return FastRenameOptimizer::is_stable_rename(from_type, to_type, from, to);
 }
 
-TEST("require that rename is stable if dimension order is preserved") {
+TEST(FastRenameTest, rename_is_stable_if_dimension_order_is_preserved) {
     EXPECT_TRUE(is_stable("tensor(a{},b{})", "tensor(a{},c{})", {"b"}, {"c"}));
     EXPECT_TRUE(is_stable("tensor(c[3],d[5])", "tensor(c[3],e[5])", {"d"}, {"e"}));
     EXPECT_TRUE(is_stable("tensor(a{},b{},c[3],d[5])", "tensor(a{},b{},c[3],e[5])", {"d"}, {"e"}));
     EXPECT_TRUE(is_stable("tensor(a{},b{},c[3],d[5])", "tensor(e{},f{},g[3],h[5])", {"a", "b", "c", "d"}, {"e", "f", "g", "h"}));
 }
 
-TEST("require that rename is unstable if nontrivial indexed dimensions change order") {
+TEST(FastRenameTest, rename_is_unstable_if_nontrivial_indexed_dimensions_change_order) {
     EXPECT_FALSE(is_stable("tensor(c[3],d[5])", "tensor(d[5],e[3])", {"c"}, {"e"}));
     EXPECT_FALSE(is_stable("tensor(c[3],d[5])", "tensor(c[5],d[3])", {"c", "d"}, {"d", "c"}));
 }
 
-TEST("require that rename is unstable if mapped dimensions change order") {
+TEST(FastRenameTest, rename_is_unstable_if_mapped_dimensions_change_order) {
     EXPECT_FALSE(is_stable("tensor(a{},b{})", "tensor(b{},c{})", {"a"}, {"c"}));
     EXPECT_FALSE(is_stable("tensor(a{},b{})", "tensor(a{},b{})", {"a", "b"}, {"b", "a"}));
 }
 
-TEST("require that rename can be stable if indexed and mapped dimensions change order") {
+TEST(FastRenameTest, rename_can_be_stable_if_indexed_and_mapped_dimensions_change_order) {
     EXPECT_TRUE(is_stable("tensor(a{},b{},c[3],d[5])", "tensor(a[3],b[5],c{},d{})", {"a", "b", "c", "d"}, {"c", "d", "a", "b"}));
     EXPECT_TRUE(is_stable("tensor(a{},b{},c[3],d[5])", "tensor(c[3],d[5],e{},f{})", {"a", "b"}, {"e", "f"}));
 }
 
-TEST("require that rename can be stable if trivial dimension is moved") {
+TEST(FastRenameTest, rename_can_be_stable_if_trivial_dimension_is_moved) {
     EXPECT_TRUE(is_stable("tensor(a[1],b{},c[3])", "tensor(b{},bb[1],c[3])", {"a"}, {"bb"}));
     EXPECT_TRUE(is_stable("tensor(a[1],b{},c[3])", "tensor(b{},c[3],cc[1])", {"a"}, {"cc"}));
 }
 
-TEST_MAIN() { TEST_RUN_ALL(); }
+GTEST_MAIN_RUN_ALL_TESTS()