fix up the test

This commit is contained in:
Aaron Seigo 2011-05-26 18:56:24 +02:00
parent 62429fbeb9
commit a5effc3b48

View File

@ -307,12 +307,12 @@ void PlasmoidPackageTest::createAndInstallPackage()
QString plasmoid("plasmoid_to_package"); QString plasmoid("plasmoid_to_package");
createTestPackage(plasmoid); createTestPackage(plasmoid);
QString packagePath = mPackageRoot + '/' + "package.zip"; const QString packagePath = mPackageRoot + '/' + "testpackage.plasmoid";
Plasma::PackageMetadata metadata(
QString(KDESRCDIR) + "/packagemetadatatest.desktop"); KZip creator(packagePath);
QVERIFY(Plasma::Package::createPackage(metadata, creator.addLocalDirectory(packagePath, ".");
mPackageRoot + '/' + plasmoid + "/contents", creator.close();
packagePath));
QVERIFY(QFile::exists(packagePath)); QVERIFY(QFile::exists(packagePath));
KZip package(packagePath); KZip package(packagePath);
@ -328,7 +328,8 @@ void PlasmoidPackageTest::createAndInstallPackage()
QVERIFY(contents->entry("code")); QVERIFY(contents->entry("code"));
QVERIFY(contents->entry("images")); QVERIFY(contents->entry("images"));
QVERIFY(Plasma::Package::installPackage(packagePath, mPackageRoot, "plasma-applet-")); Plasma::PackageStructure::Ptr plasmoidStructure(Plasma::Applet::packageStructure());
QVERIFY(plasmoidStructure->installPackage(packagePath, mPackageRoot));
QString installedPackage = mPackageRoot + "/test"; QString installedPackage = mPackageRoot + "/test";
QVERIFY(QFile::exists(installedPackage)); QVERIFY(QFile::exists(installedPackage));