From 3ced45beb36113f86c9b52a69d5db555265462bd Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Fri, 8 Apr 2022 11:44:09 +0200 Subject: [PATCH] fix test with data --- examples/data/tests/maximization.mps | 19 +++++++++++++++++++ examples/data/tests/small_model.lp | 7 +++++++ examples/tests/model_builder_test.py | 6 +++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 examples/data/tests/maximization.mps create mode 100644 examples/data/tests/small_model.lp diff --git a/examples/data/tests/maximization.mps b/examples/data/tests/maximization.mps new file mode 100644 index 0000000000..c1fe29c12b --- /dev/null +++ b/examples/data/tests/maximization.mps @@ -0,0 +1,19 @@ +* Generated by MPModelProtoExporter +* Name : SupportedMaximizationProblem +* Format : Free +* Constraints : 0 +* Variables : 1 +* Binary : 0 +* Integer : 0 +* Continuous : 1 +NAME SupportedMaximizationProblem +OBJSENSE + MAX +ROWS + N COST +COLUMNS + X_ONE COST 1 +BOUNDS + UP BOUND X_ONE 4 +ENDATA + diff --git a/examples/data/tests/small_model.lp b/examples/data/tests/small_model.lp new file mode 100644 index 0000000000..26c486218a --- /dev/null +++ b/examples/data/tests/small_model.lp @@ -0,0 +1,7 @@ +min: x + y; +bin: b1, b2, b3; +1 <= x <= 42; +constraint_num1: 5 b1 + 3b2 + x <= 7; +4 y + b2 - 3 b3 <= 2; +constraint_num2: -4 b1 + b2 - 3 z <= -2; + diff --git a/examples/tests/model_builder_test.py b/examples/tests/model_builder_test.py index 5c4681cc47..f61d5eb702 100644 --- a/examples/tests/model_builder_test.py +++ b/examples/tests/model_builder_test.py @@ -17,6 +17,7 @@ import math from ortools.model_builder.python import model_builder import unittest +import os class ModelBuilderTest(unittest.TestCase): @@ -123,8 +124,7 @@ ENDATA self.assertEqual(model.name, 'SupportedMaximizationProblem') def test_import_from_mps_file(self): - mps_path = resources.GetResourceFilename('ortools.linear_solver/' - 'testdata/maximization.mps') + mps_path = f'{os.path.dirname(__file__)}/../data/tests/maximization.mps' model = model_builder.ModelBuilder() self.assertTrue(model.import_from_mps_file(mps_path)) self.assertEqual(model.name, 'SupportedMaximizationProblem') @@ -147,7 +147,7 @@ ENDATA self.assertEqual('x', model.var_from_index(0).name) def test_import_from_lp_file(self): - lp_path = resources.GetResourceFilename('testdata/small_model.lp') + lp_path = f'{os.path.dirname(__file__)}/../data/tests/small_model.lp' model = model_builder.ModelBuilder() self.assertTrue(model.import_from_lp_file(lp_path)) self.assertEqual(6, model.num_variables)