Fix variable_and_expressions_with_counters_test (#5171)

Author: gchatelet

ortools/math_opt/cpp/BUILD.bazel

@@ -18,9 +18,7 @@ load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 # External users should depend only on ":math_opt" and include
 # "math_opt.h". Hence other libraries are private.
-package(default_visibility = [
-    "//ortools/math_opt/constraints:__subpackages__",
-])
+package(default_visibility = ["//ortools/math_opt/constraints:__subpackages__"])
 
 cc_library(
     name = "math_opt",
@@ -191,31 +189,6 @@ cc_library(
     ],
 )
 
-# Same as `variable_and_expressions` but activates the counters of instances of
-# LinearExpression. Only for tests.
-cc_library(
-    name = "variable_and_expressions_with_counters",
-    testonly = 1,
-    srcs = ["variable_and_expressions.cc"],
-    hdrs = ["variable_and_expressions.h"],
-    defines = ["MATH_OPT_USE_EXPRESSION_COUNTERS"],
-    deps = [
-        ":formatters",
-        ":key_types",
-        "//ortools/base:map_util",
-        "//ortools/base:strong_int",
-        "//ortools/math_opt/storage:model_storage",
-        "//ortools/math_opt/storage:model_storage_item",
-        "//ortools/math_opt/storage:model_storage_types",
-        "//ortools/util:fp_roundtrip_conv",
-        "@abseil-cpp//absl/base:core_headers",
-        "@abseil-cpp//absl/container:flat_hash_map",
-        "@abseil-cpp//absl/log",
-        "@abseil-cpp//absl/log:check",
-        "@abseil-cpp//absl/strings",
-    ],
-)
-
 cc_test(
     name = "variable_and_expressions_test",
     srcs = ["variable_and_expressions_test.cc"],
@@ -239,7 +212,11 @@ cc_test(
 # instances of LinearExpression and the associated tests.
 cc_test(
     name = "variable_and_expressions_with_counters_test",
-    srcs = ["variable_and_expressions_test.cc"],
+    srcs = [
+        "variable_and_expressions.cc",
+        "variable_and_expressions.h",
+        "variable_and_expressions_test.cc",
+    ],
     defines = ["MATH_OPT_USE_EXPRESSION_COUNTERS"],
     # Does not build with WASM, darwin_x86_64 or Android with duplicated symbols
     # error in:
@@ -254,15 +231,23 @@ cc_test(
         "no_test_wasm",
     ],
     deps = [
+        ":formatters",
+        ":key_types",
         ":matchers",
-        ":variable_and_expressions_with_counters",
         "//ortools/base:gmock",
         "//ortools/base:gmock_main",
+        "//ortools/base:map_util",
+        "//ortools/base:strong_int",
         "//ortools/math_opt/elemental:elements",
         "//ortools/math_opt/storage:model_storage",
+        "//ortools/math_opt/storage:model_storage_item",
+        "//ortools/math_opt/storage:model_storage_types",
         "//ortools/util:fp_roundtrip_conv",
         "//ortools/util:fp_roundtrip_conv_testing",
+        "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:str_format",
     ],
@@ -652,6 +637,7 @@ cc_library(
     deps = [
         "//ortools/math_opt:parameters_cc_proto",
         "//ortools/math_opt/solvers:gurobi_cc_proto",
+        "//ortools/math_opt/solvers:xpress_cc_proto",
         "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/status:statusor",
     ],
@@ -665,6 +651,7 @@ cc_test(
         "//ortools/base:gmock_main",
         "//ortools/math_opt:parameters_cc_proto",
         "//ortools/math_opt/solvers:gurobi_cc_proto",
+        "//ortools/math_opt/solvers:xpress_cc_proto",
     ],
 )
 
@@ -681,6 +668,7 @@ cc_library(
         "//ortools/math_opt/solvers:glpk_cc_proto",
         "//ortools/math_opt/solvers:gurobi_cc_proto",
         "//ortools/math_opt/solvers:highs_cc_proto",
+        "//ortools/math_opt/solvers:xpress_cc_proto",
         "//ortools/math_opt/solvers/gscip:gscip_cc_proto",
         "//ortools/pdlp:solvers_cc_proto",
         "//ortools/port:proto_utils",