You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 07:42:39 UTC
svn commit: r1131868 -
/incubator/mesos/trunk/src/tests/test_configuration.cpp
Author: benh
Date: Sun Jun 5 05:42:38 2011
New Revision: 1131868
URL: http://svn.apache.org/viewvc?rev=1131868&view=rev
Log:
Added NO_THROW_EXCEPTIONS to the config tests
Modified:
incubator/mesos/trunk/src/tests/test_configuration.cpp
Modified: incubator/mesos/trunk/src/tests/test_configuration.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/test_configuration.cpp?rev=1131868&r1=1131867&r2=1131868&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/test_configuration.cpp (original)
+++ incubator/mesos/trunk/src/tests/test_configuration.cpp Sun Jun 5 05:42:38 2011
@@ -77,7 +77,7 @@ TEST(ConfigurationTest, CommandLine)
argv[9] = (char*) "--space=Long String";
Configuration conf;
- conf.load(ARGC, argv, false);
+ EXPECT_NO_THROW( conf.load(ARGC, argv, false) );
EXPECT_EQ("text1", conf.getParams()["test1"]);
EXPECT_EQ("1", conf.getParams()["test2"]);
@@ -103,7 +103,7 @@ TEST_WITH_WORKDIR(ConfigurationTest, Con
setenv("MESOS_HOME", ".", 1);
Configuration conf;
- conf.load();
+ EXPECT_NO_THROW( conf.load() );
unsetenv("MESOS_HOME");
EXPECT_EQ("coffee", conf.getParams()["test1"]);
@@ -123,7 +123,7 @@ TEST_WITH_WORKDIR(ConfigurationTest, Con
file.close();
setenv("MESOS_CONF", "conf2", 1);
Configuration conf;
- conf.load();
+ EXPECT_NO_THROW( conf.load() );
unsetenv("MESOS_CONF");
EXPECT_EQ("shake", conf.getParams()["test3"]);
@@ -145,7 +145,7 @@ TEST_WITH_WORKDIR(ConfigurationTest, Con
setenv("MESOS_HOME", ".", 1);
setenv("MESOS_CONF", "conf2", 1);
Configuration conf;
- conf.load();
+ EXPECT_NO_THROW( conf.load() );
unsetenv("MESOS_CONF");
unsetenv("MESOS_HOME");
@@ -174,7 +174,7 @@ TEST_WITH_WORKDIR(ConfigurationTest, Com
argv[3] = (char*) "--d=fromCmdLine";
Configuration conf;
- conf.load(ARGC, argv, false);
+ EXPECT_NO_THROW( conf.load(ARGC, argv, false) );
EXPECT_EQ("1", conf.getParams()["a"]);
EXPECT_EQ("overridden", conf.getParams()["b"]);
@@ -212,7 +212,7 @@ TEST_WITH_WORKDIR(ConfigurationTest, Loa
argv[2] = (char*) "--c=fromCmdLine";
Configuration conf;
- conf.load(ARGC, argv, false);
+ EXPECT_NO_THROW( conf.load(ARGC, argv, false) );
// Clear the environment vars set above
unsetenv("MESOS_HOME");