napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Fix tests to use "MiB" terminology

Browse Source
This commit is contained in:
Adriaan de Groot 2019-05-09 07:51:35 -04:00
parent d3783ef293
commit 50857dcfec
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/partition/tests/PartitionJobTests.cpp
View File

@ -72,6 +72,7 @@ private:
bool m_mounted; bool m_mounted;
}; };
/// @brief Generate random data of given @p size as a QByteArray
static QByteArray static QByteArray
generateTestData( qint64 size ) generateTestData( qint64 size )
{ {
@ -321,10 +322,10 @@ PartitionJobTests::testCreatePartitionExtended()
void void
PartitionJobTests::testResizePartition_data() PartitionJobTests::testResizePartition_data()
{ {
QTest::addColumn< int >( "oldStartMB" ); QTest::addColumn< int >( "oldStartMiB" );
QTest::addColumn< int >( "oldSizeMB" ); QTest::addColumn< int >( "oldSizeMiB" );
QTest::addColumn< int >( "newStartMB" ); QTest::addColumn< int >( "newStartMiB" );
QTest::addColumn< int >( "newSizeMB" ); QTest::addColumn< int >( "newSizeMiB" );
QTest::newRow("grow") << 10 << 50 << 10 << 70; QTest::newRow("grow") << 10 << 50 << 10 << 70;
QTest::newRow("shrink") << 10 << 70 << 10 << 50; QTest::newRow("shrink") << 10 << 70 << 10 << 50;
@ -335,22 +336,22 @@ PartitionJobTests::testResizePartition_data()
void void
PartitionJobTests::testResizePartition() PartitionJobTests::testResizePartition()
{ {
QFETCH( int, oldStartMB ); QFETCH( int, oldStartMiB );
QFETCH( int, oldSizeMB ); QFETCH( int, oldSizeMiB );
QFETCH( int, newStartMB ); QFETCH( int, newStartMiB );
QFETCH( int, newSizeMB ); QFETCH( int, newSizeMiB );
const qint64 sectorForMB = 1_MiB / m_device->logicalSize(); const qint64 sectorsPerMiB = 1_MiB / m_device->logicalSize();
qint64 oldFirst = sectorForMB * oldStartMB; qint64 oldFirst = sectorsPerMiB * oldStartMiB;
qint64 oldLast = oldFirst + sectorForMB * oldSizeMB - 1; qint64 oldLast = oldFirst + sectorsPerMiB * oldSizeMiB - 1;
qint64 newFirst = sectorForMB * newStartMB; qint64 newFirst = sectorsPerMiB * newStartMiB;
qint64 newLast = newFirst + sectorForMB * newSizeMB - 1; qint64 newLast = newFirst + sectorsPerMiB * newSizeMiB - 1;
// Make the test data file smaller than the full size of the partition to // Make the test data file smaller than the full size of the partition to
// accomodate for the file system overhead // accomodate for the file system overhead
const unsigned long long minSizeMB = qMin( oldSizeMB, newSizeMB ); const unsigned long long minSizeMiB = qMin( oldSizeMiB, newSizeMiB );
const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMB ) * 3 / 4 ); const QByteArray testData = generateTestData( CalamaresUtils::MiBtoBytes( minSizeMiB ) * 3 / 4 );
const QString testName = "test.data"; const QString testName = "test.data";
// Setup: create the test partition // Setup: create the test partition