From 2a91cce83656b7e912ded2fcda6cd39fb6364a72 Mon Sep 17 00:00:00 2001
From: Thomas Morris <thomasmorris@princeton.edu>
Date: Tue, 31 Oct 2023 15:29:40 -0400
Subject: [PATCH] update syntax in tests

---
 bloptools/tests/conftest.py          |  4 ++--
 bloptools/tests/test_passive_dofs.py |  2 +-
 bloptools/tests/test_targeting.py    | 34 ----------------------------
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 bloptools/tests/test_targeting.py

diff --git a/bloptools/tests/conftest.py b/bloptools/tests/conftest.py
index e32b19a..fa88e09 100644
--- a/bloptools/tests/conftest.py
+++ b/bloptools/tests/conftest.py
@@ -54,7 +54,7 @@ def agent(db):
         DOF(name="x2", limits=(-8.0, 8.0)),
     ]
 
-    objectives = [Objective(key="himmelblau", minimize=True)]
+    objectives = [Objective(key="himmelblau", target="min")]
 
     agent = Agent(
         dofs=dofs,
@@ -88,7 +88,7 @@ def digestion(db, uid):
         DOF(name="x2", limits=(-5.0, 5.0)),
     ]
 
-    objectives = [Objective(key="ST1", minimize=True), Objective(key="ST2", minimize=True)]
+    objectives = [Objective(key="ST1", target="min"), Objective(key="ST2", target="min")]
 
     agent = Agent(
         dofs=dofs,
diff --git a/bloptools/tests/test_passive_dofs.py b/bloptools/tests/test_passive_dofs.py
index 3db1c06..5347238 100644
--- a/bloptools/tests/test_passive_dofs.py
+++ b/bloptools/tests/test_passive_dofs.py
@@ -15,7 +15,7 @@ def test_passive_dofs(RE, db):
     ]
 
     objectives = [
-        Objective(key="himmelblau", minimize=True),
+        Objective(key="himmelblau", target="min"),
     ]
 
     agent = Agent(
diff --git a/bloptools/tests/test_targeting.py b/bloptools/tests/test_targeting.py
deleted file mode 100644
index 3db1c06..0000000
--- a/bloptools/tests/test_targeting.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import pytest
-
-from bloptools.bayesian import DOF, Agent, BrownianMotion, Objective
-from bloptools.utils import functions
-
-
-@pytest.mark.test_func
-def test_passive_dofs(RE, db):
-    dofs = [
-        DOF(name="x1", limits=(-5.0, 5.0)),
-        DOF(name="x2", limits=(-5.0, 5.0)),
-        DOF(name="x3", limits=(-5.0, 5.0), active=False),
-        DOF(BrownianMotion(name="brownian1"), read_only=True),
-        DOF(BrownianMotion(name="brownian2"), read_only=True, active=False),
-    ]
-
-    objectives = [
-        Objective(key="himmelblau", minimize=True),
-    ]
-
-    agent = Agent(
-        dofs=dofs,
-        objectives=objectives,
-        digestion=functions.constrained_himmelblau_digestion,
-        db=db,
-        verbose=True,
-        tolerate_acquisition_errors=False,
-    )
-
-    RE(agent.learn("qr", n=32))
-
-    agent.plot_objectives()
-    agent.plot_acquisition()
-    agent.plot_validity()