Replace EnumOption with EnumerationArrayOption

[alexxy/gromacs.git] / src / gromacs / options / tests / timeunitmanager.cpp

diff --git a/src/gromacs/options/tests/timeunitmanager.cpp b/src/gromacs/options/tests/timeunitmanager.cpp
index 005be26913a85e3f66e3dc0182edd8fd0f509537..7715c9142f41055fa1b69d5914bc4698c8e29635 100644 (file)
--- a/src/gromacs/options/tests/timeunitmanager.cpp
+++ b/src/gromacs/options/tests/timeunitmanager.cpp
@@ -61,10 +61,10 @@ namespace
 TEST(TimeUnitManagerTest, BasicOperations)
 {
     gmx::TimeUnitManager manager;
-    EXPECT_EQ(gmx::TimeUnit_ps, manager.timeUnit());
+    EXPECT_EQ(gmx::TimeUnit::Picoseconds, manager.timeUnit());
     EXPECT_DOUBLE_EQ(1.0, manager.timeScaleFactor());
-    manager.setTimeUnit(gmx::TimeUnit_ns);
-    EXPECT_EQ(gmx::TimeUnit_ns, manager.timeUnit());
+    manager.setTimeUnit(gmx::TimeUnit::Nanoseconds);
+    EXPECT_EQ(gmx::TimeUnit::Nanoseconds, manager.timeUnit());
     EXPECT_DOUBLE_EQ(1e3, manager.timeScaleFactor());
     EXPECT_DOUBLE_EQ(1e-3, manager.inverseTimeScaleFactor());
 }
@@ -86,21 +86,21 @@ TEST(TimeUnitBehaviorTest, ScalesAssignedOptionValue)
     EXPECT_NO_THROW_GMX(assigner.finish());
 
     EXPECT_DOUBLE_EQ(1.5, value);
-    behavior.setTimeUnit(gmx::TimeUnit_ns);
+    behavior.setTimeUnit(gmx::TimeUnit::Nanoseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1500, value);
 
     EXPECT_NO_THROW_GMX(options.finish());
 
-    behavior.setTimeUnit(gmx::TimeUnit_us);
+    behavior.setTimeUnit(gmx::TimeUnit::Microseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1500000, value);
 
-    behavior.setTimeUnit(gmx::TimeUnit_fs);
+    behavior.setTimeUnit(gmx::TimeUnit::Femtoseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(0.0015, value);
 
-    behavior.setTimeUnit(gmx::TimeUnit_ps);
+    behavior.setTimeUnit(gmx::TimeUnit::Picoseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1.5, value);
 }
@@ -124,7 +124,7 @@ TEST(TimeUnitBehaviorTest, DoesNotScaleDefaultValues)
     EXPECT_NO_THROW_GMX(options.finish());
 
     EXPECT_DOUBLE_EQ(2.5, value2);
-    behavior.setTimeUnit(gmx::TimeUnit_ns);
+    behavior.setTimeUnit(gmx::TimeUnit::Nanoseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1.5, value);
     EXPECT_DOUBLE_EQ(2.5, value2);
@@ -151,7 +151,7 @@ TEST(TimeUnitBehaviorTest, ScalesUserInputWithMultipleSources)
     EXPECT_NO_THROW_GMX(options.finish());
 
     EXPECT_DOUBLE_EQ(1.5, value);
-    behavior.setTimeUnit(gmx::TimeUnit_ns);
+    behavior.setTimeUnit(gmx::TimeUnit::Nanoseconds);
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1500, value);
 }
@@ -177,7 +177,7 @@ TEST(TimeUnitBehaviorTest, TimeUnitOptionWorks)
     EXPECT_NO_THROW_GMX(assigner.finish());
 
     EXPECT_DOUBLE_EQ(1.5, value);
-    EXPECT_EQ(gmx::TimeUnit_ns, behavior.timeUnit());
+    EXPECT_EQ(gmx::TimeUnit::Nanoseconds, behavior.timeUnit());
     behavior.optionsFinishing(&options);
     EXPECT_DOUBLE_EQ(1500, value);