From 9ae82e03122a9e1a835d7eb6d3676094a1d12034 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvinrr@icloud.com>
Date: Fri, 19 Apr 2019 15:18:54 -0700
Subject: [PATCH] updated tests
---
tests/pytests/test_dawn_driver.py | 10 +++++-----
tests/pytests/test_kaguya_drivers.py | 10 +++++-----
tests/pytests/test_lro_drivers.py | 10 +++++-----
tests/pytests/test_mdis_driver.py | 10 +++++-----
tests/pytests/test_mro_drivers.py | 10 +++++-----
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tests/pytests/test_dawn_driver.py b/tests/pytests/test_dawn_driver.py
index a847a0a..11de0eb 100644
--- a/tests/pytests/test_dawn_driver.py
+++ b/tests/pytests/test_dawn_driver.py
@@ -4,17 +4,17 @@ from unittest import mock
import pytest
import ale
-from ale.drivers import dawn_driver, base
-from ale.drivers.dawn_driver import DawnPDS3Driver
+from ale.drivers import dawn_drivers, base
+from ale.drivers.dawn_drivers import DawnFcPds3NaifSpiceDriver
# 'Mock' the spice module where it is imported
from conftest import SimpleSpice, get_mockkernels
simplespice = SimpleSpice()
base.spice = simplespice
-dawn_driver.spice = simplespice
+dawn_drivers.spice = simplespice
-DawnPDS3Driver.metakernel = get_mockkernels
+DawnFcPds3NaifSpiceDriver.metakernel = get_mockkernels
@pytest.fixture
def dawn_label():
@@ -421,7 +421,7 @@ END
"""
def test_mdis_creation(dawn_label):
- with DawnPDS3Driver(dawn_label) as m:
+ with DawnFcPds3NaifSpiceDriver(dawn_label) as m:
d = m.to_dict()
assert d['instrument_id'] == 'DAWN_FC2_FILTER_1'
assert d['spacecraft_name'] == 'DAWN'
diff --git a/tests/pytests/test_kaguya_drivers.py b/tests/pytests/test_kaguya_drivers.py
index 026ccfd..b906a5b 100644
--- a/tests/pytests/test_kaguya_drivers.py
+++ b/tests/pytests/test_kaguya_drivers.py
@@ -1,15 +1,15 @@
import pytest
-from ale.drivers import kaguya_driver
-from ale.drivers.kaguya_driver import TcPds3Driver
+from ale.drivers import kaguya_drivers
+from ale.drivers.kaguya_drivers import KaguyaTcPds3NaifSpiceDriver
# 'Mock' the spice module where it is imported
from conftest import SimpleSpice, get_mockkernels
simplespice = SimpleSpice()
-kaguya_driver.spice = simplespice
+kaguya_drivers.spice = simplespice
-TcPds3Driver.metakernel = get_mockkernels
+KaguyaTcPds3NaifSpiceDriver.metakernel = get_mockkernels
@pytest.fixture
def kaguya_tclabel():
@@ -158,6 +158,6 @@ def kaguya_tclabel():
"""
def test_kaguya_creation(kaguya_tclabel):
- with TcPds3Driver(kaguya_tclabel) as m:
+ with KaguyaTcPds3NaifSpiceDriver(kaguya_tclabel) as m:
d = m.to_dict()
assert isinstance(d, dict)
diff --git a/tests/pytests/test_lro_drivers.py b/tests/pytests/test_lro_drivers.py
index 4930672..cfa2192 100644
--- a/tests/pytests/test_lro_drivers.py
+++ b/tests/pytests/test_lro_drivers.py
@@ -4,8 +4,8 @@ from unittest import mock
import pytest
import ale
-from ale.drivers import lro_driver, base
-from ale.drivers.lro_driver import LrocPds3Driver
+from ale.drivers import lro_drivers, base
+from ale.drivers.lro_drivers import LroLrocPds3NaifSpiceDriver
from ale import util
# 'Mock' the spice module where it is imported
@@ -13,9 +13,9 @@ from conftest import SimpleSpice, get_mockkernels
simplespice = SimpleSpice()
base.spice = simplespice
-lro_driver.spice = simplespice
+lro_drivers.spice = simplespice
-LrocPds3Driver.metakernel = get_mockkernels
+LroLrocPds3NaifSpiceDriver.metakernel = get_mockkernels
@pytest.fixture
def lro_lroclabel():
@@ -112,6 +112,6 @@ def lro_lroclabel():
"""
def test_lro_creation(lro_lroclabel):
- with LrocPds3Driver(lro_lroclabel) as m:
+ with LroLrocPds3NaifSpiceDriver(lro_lroclabel) as m:
d = m.to_dict()
assert isinstance(d, dict)
diff --git a/tests/pytests/test_mdis_driver.py b/tests/pytests/test_mdis_driver.py
index efcbd00..67d5066 100644
--- a/tests/pytests/test_mdis_driver.py
+++ b/tests/pytests/test_mdis_driver.py
@@ -4,8 +4,8 @@ from unittest import mock
import pytest
import ale
-from ale.drivers import mdis_driver, base
-from ale.drivers.mdis_driver import MdisPDS3Driver
+from ale.drivers import messenger_drivers, base
+from ale.drivers.messenger_drivers import MessengerMdisPds3NaifSpiceDriver
# 'Mock' the spice module where it is imported
@@ -13,9 +13,9 @@ from conftest import SimpleSpice, get_mockkernels
simplespice = SimpleSpice()
base.spice = simplespice
-mdis_driver.spice = simplespice
+messenger_drivers.spice = simplespice
-MdisPDS3Driver.metakernel = get_mockkernels
+MessengerMdisPds3NaifSpiceDriver.metakernel = get_mockkernels
@pytest.fixture
def mdislabel():
@@ -244,6 +244,6 @@ END
"""
def test_mdis_creation(mdislabel):
- with MdisPDS3Driver(mdislabel) as m:
+ with MessengerMdisPds3NaifSpiceDriver(mdislabel) as m:
d = m.to_dict()
assert isinstance(d, dict)
diff --git a/tests/pytests/test_mro_drivers.py b/tests/pytests/test_mro_drivers.py
index 543d9cc..cdc6428 100644
--- a/tests/pytests/test_mro_drivers.py
+++ b/tests/pytests/test_mro_drivers.py
@@ -1,17 +1,17 @@
import pytest
import ale
-from ale.drivers.mro_driver import CtxPds3Driver
-from ale.drivers import mro_driver, base
+from ale.drivers.mro_drivers import MroCtxPds3LabelNaifSpiceDriver
+from ale.drivers import mro_drivers, base
# 'Mock' the spice module where it is imported
from conftest import SimpleSpice, get_mockkernels
simplespice = SimpleSpice()
base.spice = simplespice
-mro_driver.spice = simplespice
+mro_drivers.spice = simplespice
-CtxPds3Driver.metakernel = get_mockkernels
+MroCtxPds3LabelNaifSpiceDriver.metakernel = get_mockkernels
@pytest.fixture
def mroctx_label():
@@ -63,6 +63,6 @@ def mroctx_label():
def test_ctx_creation(mroctx_label):
- with CtxPds3Driver(mroctx_label) as m:
+ with MroCtxPds3LabelNaifSpiceDriver(mroctx_label) as m:
d = m.to_dict()
assert isinstance(d, dict)
--
GitLab