Changeset 3e6b93 for src/Parameters/unittests/DiscreteValueTest.cpp

Timestamp:

Feb 4, 2015, 9:56:43 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Parents:

76a109

git-author:

Frederik Heber <heber@…> (09/23/14 16:34:50)

git-committer:

Frederik Heber <heber@…> (02/04/15 21:56:43)

Message:

Changed checking of Parameter::isValid() on set(), not on get().

• this would fix problems with ActionQueue::OutputAs...() commands that need to get() parameter values after usage by the Action. If files were forced to be non-present before, then written by the Action, the Validator will then fail.

File:

• src/Parameters/unittests/DiscreteValueTest.cpp (modified) (2 diffs)

src/Parameters/unittests/DiscreteValueTest.cpp

@@ -175 +175 @@
 
   // setting invalid and getting it, throws
-  test.set(4);
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
-  test.set(0);
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.get(), ParameterValueException);
+  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW(test.set(4), ParameterValueException);
+  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW(test.set(0), ParameterValueException);
 
   // checking all valid ones
@@ -203 +201 @@
 
   // setting invalid and getting it, throws
-  test.setAsString(toString(4));
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.getAsString(), ParameterValueException);
-  test.setAsString(toString(0));
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.getAsString(), ParameterValueException);
+  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW(test.setAsString(toString(4)), ParameterValueException);
+  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW(test.setAsString(toString(0)), ParameterValueException);
 
   // checking all valid ones