Browse Source

Fix a failing test.

master
Andrius Štikonas 6 months ago
parent
commit
660aa6a55e
2 changed files with 22 additions and 28 deletions
  1. +18
    -24
      test/testdevice.cpp
  2. +4
    -4
      test/testdevice.h

+ 18
- 24
test/testdevice.cpp View File

@@ -36,19 +36,21 @@ int main(int argc, char **argv)
if (argc == 2)
init = KPMCoreInitializer(argv[1]);
return init.isValid() ? true : false;
return init.isValid() ? EXIT_SUCCESS : EXIT_FAILURE;

CoreBackend *backend = CoreBackendManager::self()->backend();
if (!backend) {
qWarning() << "Failed to load backend plugin";
return false;
return EXIT_FAILURE;
}
TestDevice device;
if (!device.testDeviceName() || !device.testDeviceNode() || !device.testDeviceSize() || !device.testDeviceTotalSectors())
return false;
device.testDeviceName();
device.testDeviceNode();
device.testDeviceSize();
device.testDeviceTotalSectors();
return app.exec();
}
@@ -73,58 +75,50 @@ TestDevice::~TestDevice()
devices.clear();
}

bool TestDevice::testDeviceName()
void TestDevice::testDeviceName()
{
if (devices.isEmpty()) {
return false;
exit(EXIT_FAILURE);
} else {
for (const auto &device : devices) {
if (device->name() == QString())
return false;
exit(EXIT_FAILURE);
}
}
return true;
}

bool TestDevice::testDeviceNode()
void TestDevice::testDeviceNode()
{
if (devices.isEmpty()) {
return false;
exit(EXIT_FAILURE);
} else {
for (const auto &device : devices) {
if (device->deviceNode() == QString())
return false;
exit(EXIT_FAILURE);
}
}
return true;
}

bool TestDevice::testDeviceSize()
void TestDevice::testDeviceSize()
{
if (devices.isEmpty()) {
return false;
exit(EXIT_FAILURE);
} else {
for (const auto &device : devices) {
if (device->logicalSize() < 0)
return false;
exit(EXIT_FAILURE);
}
}
return true;
}

bool TestDevice::testDeviceTotalSectors()
void TestDevice::testDeviceTotalSectors()
{
if (devices.isEmpty()) {
return false;
exit(EXIT_FAILURE);
} else {
for (const auto &device : devices) {
if (device->totalLogical() < 0)
return false;
exit(EXIT_FAILURE);
}
}
return true;
}

+ 4
- 4
test/testdevice.h View File

@@ -32,10 +32,10 @@ public:
TestDevice();
~TestDevice();

bool testDeviceName();
bool testDeviceNode();
bool testDeviceSize();
bool testDeviceTotalSectors();
void testDeviceName();
void testDeviceNode();
void testDeviceSize();
void testDeviceTotalSectors();
private:
OperationStack *operationStack;


Loading…
Cancel
Save