Commit 4e1a93f8 authored by Steven Murray's avatar Steven Murray
Browse files

More fixes for cc7

parent 97984aa5
......@@ -79,7 +79,7 @@ TEST_F(cta_threading_DaemonTest, parseEmptyCmdLine) {
cta::server::Daemon daemon(dummyStdOut, dummyStdErr, log);
ASSERT_NO_THROW(daemon.parseCommandLine(m_argc, m_argv));
ASSERT_EQ(false, daemon.getForeground());
ASSERT_FALSE(daemon.getForeground());
}
TEST_F(cta_threading_DaemonTest, parseFOnCmdLine) {
......
......@@ -52,7 +52,7 @@ TEST_F(cta_SmartFdTest, testClosedCallback) {
using namespace cta;
ASSERT_EQ(-1, s_fd);
ASSERT_EQ(false, s_closedCallbackWasCalled);
ASSERT_FALSE(s_closedCallbackWasCalled);
int fd = socket(PF_LOCAL, SOCK_STREAM, 0);
ASSERT_NE(-1, fd);
......
......@@ -29,7 +29,7 @@ TEST_P(BackendAbstractTest, BasicReadWrite) {
const std::string testSecondValue = "1234";
const std::string testObjectName = "testObject";
// Check we can verify the absence of an object
ASSERT_EQ(false, m_os->exists(testObjectName));
ASSERT_FALSE(m_os->exists(testObjectName));
// Check that an update attempt fails on a non-existing object
ASSERT_THROW(m_os->atomicOverwrite(testObjectName, testSecondValue), cta::exception::Exception);
// Check the creation of the object
......@@ -48,7 +48,7 @@ TEST_P(BackendAbstractTest, BasicReadWrite) {
// Check we can delete the object
ASSERT_NO_THROW(m_os->remove(testObjectName));
// Check that the object is actually gone
ASSERT_EQ(false, m_os->exists(testObjectName));
ASSERT_FALSE(m_os->exists(testObjectName));
}
TEST_P(BackendAbstractTest, LockingInterface) {
......
......@@ -65,7 +65,7 @@ TEST(ObjectStore, RootEntryBasicAccess) {
re.fetch();
re.removeAgentRegisterAndCommit();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST(ObjectStore, RootEntryAdminHosts) {
......@@ -131,7 +131,7 @@ TEST(ObjectStore, RootEntryAdminHosts) {
cta::objectstore::ScopedExclusiveLock lock(re);
re.fetch();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST(ObjectStore, RootEntryAdminUsers) {
......@@ -209,7 +209,7 @@ TEST(ObjectStore, RootEntryAdminUsers) {
cta::objectstore::ScopedExclusiveLock lock(re);
re.fetch();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST(ObjectStore, RootEntryStorageClassesAndArchiveRoutes) {
......@@ -359,7 +359,7 @@ TEST(ObjectStore, RootEntryStorageClassesAndArchiveRoutes) {
cta::objectstore::ScopedExclusiveLock lock(re);
re.fetch();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST(ObjectStore, RootEntryibraries) {
......@@ -423,7 +423,7 @@ TEST(ObjectStore, RootEntryibraries) {
cta::objectstore::ScopedExclusiveLock lock(re);
re.fetch();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST (ObjectStore, RootEntryTapePools) {
......@@ -483,7 +483,7 @@ TEST (ObjectStore, RootEntryTapePools) {
re.removeTapePoolAndCommit("tapePool1");
ASSERT_FALSE(be.exists(tpAddr1));
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST (ObjectStore, RootEntryDriveRegister) {
......@@ -537,7 +537,7 @@ TEST (ObjectStore, RootEntryDriveRegister) {
re.fetch();
re.removeAgentRegisterAndCommit();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST(ObjectStore, RootEntryAgentRegister) {
......@@ -577,14 +577,14 @@ TEST(ObjectStore, RootEntryAgentRegister) {
// Remove it
ASSERT_NO_THROW(re.removeAgentRegisterAndCommit());
// Check that the object is gone
ASSERT_EQ(false, be.exists(arAddr));
ASSERT_FALSE(be.exists(arAddr));
}
// Delete the root entry
cta::objectstore::RootEntry re(be);
cta::objectstore::ScopedExclusiveLock lock(re);
re.fetch();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
TEST (ObjectStore, RootEntrySchedulerGlobalLock) {
......@@ -638,7 +638,7 @@ TEST (ObjectStore, RootEntrySchedulerGlobalLock) {
re.fetch();
re.removeAgentRegisterAndCommit();
re.removeIfEmpty();
ASSERT_EQ(false, re.exists());
ASSERT_FALSE(re.exists());
}
}
......@@ -48,6 +48,6 @@ TEST(ObjectStore, TapeBasicAccess) {
cta::objectstore::ScopedExclusiveLock lock(t);
t.fetch();
t.removeIfEmpty();
ASSERT_EQ(false, t.exists());
ASSERT_FALSE(t.exists());
}
}
\ No newline at end of file
......@@ -86,9 +86,9 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, acs) {
std::unique_ptr<DismountCmdLine> cmdLine;
ASSERT_NO_THROW(cmdLine.reset(new DismountCmdLine(args->argc, args->argv)));
ASSERT_EQ(false, cmdLine->getHelp());
ASSERT_EQ(false, cmdLine->getDebug());
ASSERT_EQ(false, cmdLine->getForce());
ASSERT_FALSE(cmdLine->getHelp());
ASSERT_FALSE(cmdLine->getDebug());
ASSERT_FALSE(cmdLine->getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine->getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -108,18 +108,18 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, copy_constructor) {
args->argv[3] = NULL;
DismountCmdLine cmdLine1(args->argc, args->argv);
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getForce());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
cmdLine1.getDriveLibrarySlot().str());
DismountCmdLine cmdLine2(cmdLine1);
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getForce());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -139,9 +139,9 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, assignment) {
args1->argv[3] = NULL;
DismountCmdLine cmdLine1(args1->argc, args1->argv);
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getForce());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -157,9 +157,9 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, assignment) {
args2->argv[3] = NULL;
DismountCmdLine cmdLine2(args2->argc, args2->argv);
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getForce());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
......@@ -167,17 +167,17 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, assignment) {
cmdLine1 = cmdLine2;
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getForce());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
cmdLine1.getDriveLibrarySlot().str());
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getForce());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
......@@ -199,9 +199,9 @@ TEST_F(castor_mediachanger_DismountCmdLineTest, scsi) {
std::unique_ptr<DismountCmdLine> cmdLine;
ASSERT_NO_THROW(cmdLine.reset(new DismountCmdLine(args->argc, args->argv)));
ASSERT_EQ(false, cmdLine->getHelp());
ASSERT_EQ(false, cmdLine->getDebug());
ASSERT_EQ(false, cmdLine->getForce());
ASSERT_FALSE(cmdLine->getHelp());
ASSERT_FALSE(cmdLine->getDebug());
ASSERT_FALSE(cmdLine->getForce());
ASSERT_EQ(TAPE_LIBRARY_TYPE_SCSI,
cmdLine->getDriveLibrarySlot().getLibraryType());
}
......
......@@ -86,9 +86,9 @@ TEST_F(castor_mediachanger_MountCmdLineTest, acs) {
std::unique_ptr<MountCmdLine> cmdLine;
ASSERT_NO_THROW(cmdLine.reset(new MountCmdLine(args->argc, args->argv)));
ASSERT_EQ(false, cmdLine->getHelp());
ASSERT_EQ(false, cmdLine->getDebug());
ASSERT_EQ(false, cmdLine->getReadOnly());
ASSERT_FALSE(cmdLine->getHelp());
ASSERT_FALSE(cmdLine->getDebug());
ASSERT_FALSE(cmdLine->getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine->getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -108,18 +108,18 @@ TEST_F(castor_mediachanger_MountCmdLineTest, copy_constructor) {
args->argv[3] = NULL;
MountCmdLine cmdLine1(args->argc, args->argv);
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getReadOnly());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
cmdLine1.getDriveLibrarySlot().str());
MountCmdLine cmdLine2(cmdLine1);
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getReadOnly());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -139,9 +139,9 @@ TEST_F(castor_mediachanger_MountCmdLineTest, assignment) {
args1->argv[3] = NULL;
MountCmdLine cmdLine1(args1->argc, args1->argv);
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getReadOnly());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs1,2,3,4"),
......@@ -157,9 +157,9 @@ TEST_F(castor_mediachanger_MountCmdLineTest, assignment) {
args2->argv[3] = NULL;
MountCmdLine cmdLine2(args2->argc, args2->argv);
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getReadOnly());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
......@@ -167,17 +167,17 @@ TEST_F(castor_mediachanger_MountCmdLineTest, assignment) {
cmdLine1 = cmdLine2;
ASSERT_EQ(false, cmdLine1.getHelp());
ASSERT_EQ(false, cmdLine1.getDebug());
ASSERT_EQ(false, cmdLine1.getReadOnly());
ASSERT_FALSE(cmdLine1.getHelp());
ASSERT_FALSE(cmdLine1.getDebug());
ASSERT_FALSE(cmdLine1.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine1.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
cmdLine1.getDriveLibrarySlot().str());
ASSERT_EQ(false, cmdLine2.getHelp());
ASSERT_EQ(false, cmdLine2.getDebug());
ASSERT_EQ(false, cmdLine2.getReadOnly());
ASSERT_FALSE(cmdLine2.getHelp());
ASSERT_FALSE(cmdLine2.getDebug());
ASSERT_FALSE(cmdLine2.getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_ACS,
cmdLine2.getDriveLibrarySlot().getLibraryType());
ASSERT_EQ(std::string("acs5,6,7,8"),
......@@ -199,9 +199,9 @@ TEST_F(castor_mediachanger_MountCmdLineTest, scsi) {
std::unique_ptr<MountCmdLine> cmdLine;
ASSERT_NO_THROW(cmdLine.reset(new MountCmdLine(args->argc, args->argv)));
ASSERT_EQ(false, cmdLine->getHelp());
ASSERT_EQ(false, cmdLine->getDebug());
ASSERT_EQ(false, cmdLine->getReadOnly());
ASSERT_FALSE(cmdLine->getHelp());
ASSERT_FALSE(cmdLine->getDebug());
ASSERT_FALSE(cmdLine->getReadOnly());
ASSERT_EQ(TAPE_LIBRARY_TYPE_SCSI,
cmdLine->getDriveLibrarySlot().getLibraryType());
}
......
......@@ -79,7 +79,7 @@ TEST_F(castor_server_DaemonTest, parseEmptyCmdLine) {
castor::server::Daemon daemon(dummyStdOut, dummyStdErr, log);
ASSERT_NO_THROW(daemon.parseCommandLine(m_argc, m_argv));
ASSERT_EQ(false, daemon.getForeground());
ASSERT_FALSE(daemon.getForeground());
}
TEST_F(castor_server_DaemonTest, parseFOnCmdLine) {
......
......@@ -522,9 +522,9 @@ namespace unitTests {
buff[12] = 0x12;
buff[13] = 0x34;
ASSERT_EQ(true, sense.isCurrent());
ASSERT_EQ(false, sense.isDeferred());
ASSERT_FALSE(sense.isDeferred());
ASSERT_EQ(true, sense.isFixedFormat());
ASSERT_EQ(false, sense.isDescriptorFormat());
ASSERT_FALSE(sense.isDescriptorFormat());
ASSERT_EQ(0x12, sense.getASC());
ASSERT_EQ(0x34, sense.getASCQ());
ASSERT_EQ(0xE, sense.getSenseKey());
......@@ -534,10 +534,10 @@ namespace unitTests {
buff[2] = 0xFA;
buff[12] = 0x12;
buff[13] = 0x34;
ASSERT_EQ(false, sense.isCurrent());
ASSERT_FALSE(sense.isCurrent());
ASSERT_EQ(true, sense.isDeferred());
ASSERT_EQ(true, sense.isFixedFormat());
ASSERT_EQ(false, sense.isDescriptorFormat());
ASSERT_FALSE(sense.isDescriptorFormat());
ASSERT_EQ(0x12, sense.getASC());
ASSERT_EQ(0x34, sense.getASCQ());
ASSERT_EQ(0xA, sense.getSenseKey());
......@@ -548,8 +548,8 @@ namespace unitTests {
buff[2] = 0x56;
buff[3] = 0x78;
ASSERT_EQ(true, sense.isCurrent());
ASSERT_EQ(false, sense.isDeferred());
ASSERT_EQ(false, sense.isFixedFormat());
ASSERT_FALSE(sense.isDeferred());
ASSERT_FALSE(sense.isFixedFormat());
ASSERT_EQ(true, sense.isDescriptorFormat());
ASSERT_EQ(0x56, sense.getASC());
ASSERT_EQ(0x78, sense.getASCQ());
......@@ -560,9 +560,9 @@ namespace unitTests {
buff[1] = 0xFC;
buff[2] = 0x0b;
buff[3] = 0x08;
ASSERT_EQ(false, sense.isCurrent());
ASSERT_FALSE(sense.isCurrent());
ASSERT_EQ(true, sense.isDeferred());
ASSERT_EQ(false, sense.isFixedFormat());
ASSERT_FALSE(sense.isFixedFormat());
ASSERT_EQ(true, sense.isDescriptorFormat());
ASSERT_EQ(0x0b, sense.getASC());
ASSERT_EQ(0x08, sense.getASCQ());
......
......@@ -230,7 +230,7 @@ namespace unitTests
tapeserver::daemon::RecallTaskInjector rti(mm, tapeRead, diskWrite, trm, 6, blockSize, lc);
ASSERT_EQ(false, rti.synchronousInjection());
ASSERT_FALSE(rti.synchronousInjection());
ASSERT_EQ(0U, diskWrite.m_tasks.size());
ASSERT_EQ(0U, tapeRead.m_tasks.size());
ASSERT_EQ(1, trm.getJobs);
......
......@@ -57,7 +57,7 @@ TEST_F(castor_utils_SmartFdTest, testClosedCallback) {
using namespace castor::utils;
ASSERT_EQ(-1, s_fd);
ASSERT_EQ(false, s_closedCallbackWasCalled);
ASSERT_FALSE(s_closedCallbackWasCalled);
int fd = socket(PF_LOCAL, SOCK_STREAM, 0);
ASSERT_NE(-1, fd);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment