From 87082606895003905f4913f8a0d3899a115d8933 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 20 Jun 2017 09:45:32 -0400
Subject: [PATCH] Partitionmanager: fix PM-tests build

---
 src/modules/partition/tests/CMakeLists.txt        | 2 +-
 src/modules/partition/tests/PartitionJobTests.cpp | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 12d970fa4..1917a226b 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -29,8 +29,8 @@ include_directories(
 ecm_add_test( ${partitionjobtests_SRCS}
     TEST_NAME partitionjobtests
     LINK_LIBRARIES
-        calapm
         ${CALAMARES_LIBRARIES}
+        kpmcore
         Qt5::Core
         Qt5::Test
         KF5::Service
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index bada4aa9a..2b7ccc653 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -24,7 +24,6 @@
 #include <core/KPMHelpers.h>
 
 // CalaPM
-#include <CalaPM.h>
 #include <backend/corebackend.h>
 #include <backend/corebackendmanager.h>
 #include <fs/filesystemfactory.h>
@@ -166,7 +165,7 @@ PartitionJobTests::initTestCase()
         QSKIP( "Skipping test, CALAMARES_TEST_DISK is not set. It should point to a disk which can be safely formatted" );
     }
 
-    QVERIFY( CalaPM::init() );
+    QVERIFY( KPMHelpers::initKPMcore() );
     FileSystemFactory::init();
 
     refreshDevice();
@@ -212,7 +211,7 @@ PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, Partiti
     qint64 lastSector;
 
     if ( size > 0 )
-        lastSector = firstSector + size / m_device->logicalSectorSize();
+        lastSector = firstSector + size / m_device->logicalSize();
     else
         lastSector = freeSpacePartition->lastSector();
     FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector );
@@ -335,7 +334,7 @@ PartitionJobTests::testResizePartition()
     QFETCH( int, newStartMB );
     QFETCH( int, newSizeMB );
 
-    const qint64 sectorForMB = MB / m_device->logicalSectorSize();
+    const qint64 sectorForMB = MB / m_device->logicalSize();
 
     qint64 oldFirst = sectorForMB * oldStartMB;
     qint64 oldLast  = oldFirst + sectorForMB * oldSizeMB - 1;