Changeset View
Changeset View
Standalone View
Standalone View
autotests/plugins/clizipplugin/cliziptest.cpp
Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Line(s) | 49 | { | |||
---|---|---|---|---|---|
64 | plugin->deleteLater(); | 64 | plugin->deleteLater(); | ||
65 | } | 65 | } | ||
66 | 66 | | |||
67 | void CliZipTest::testAddArgs_data() | 67 | void CliZipTest::testAddArgs_data() | ||
68 | { | 68 | { | ||
69 | QTest::addColumn<QString>("archiveName"); | 69 | QTest::addColumn<QString>("archiveName"); | ||
70 | QTest::addColumn<QString>("password"); | 70 | QTest::addColumn<QString>("password"); | ||
71 | QTest::addColumn<int>("compressionLevel"); | 71 | QTest::addColumn<int>("compressionLevel"); | ||
72 | QTest::addColumn<QString>("compressionMethod"); | ||||
72 | QTest::addColumn<QStringList>("expectedArgs"); | 73 | QTest::addColumn<QStringList>("expectedArgs"); | ||
73 | 74 | | |||
74 | QTest::newRow("unencrypted") | 75 | QTest::newRow("unencrypted") | ||
75 | << QStringLiteral("/tmp/foo.zip") | 76 | << QStringLiteral("/tmp/foo.zip") | ||
76 | << QString() << 3 | 77 | << QString() << 3 << QStringLiteral("deflate") | ||
77 | << QStringList { | 78 | << QStringList { | ||
78 | QStringLiteral("-r"), | 79 | QStringLiteral("-r"), | ||
79 | QStringLiteral("/tmp/foo.zip"), | 80 | QStringLiteral("/tmp/foo.zip"), | ||
80 | QStringLiteral("-3") | 81 | QStringLiteral("-3"), | ||
82 | QStringLiteral("-Zdeflate") | ||||
81 | }; | 83 | }; | ||
82 | 84 | | |||
83 | QTest::newRow("encrypted") | 85 | QTest::newRow("encrypted") | ||
84 | << QStringLiteral("/tmp/foo.zip") | 86 | << QStringLiteral("/tmp/foo.zip") | ||
85 | << QStringLiteral("1234") << 3 | 87 | << QStringLiteral("1234") << 3 << QString() | ||
86 | << QStringList { | 88 | << QStringList { | ||
87 | QStringLiteral("-r"), | 89 | QStringLiteral("-r"), | ||
88 | QStringLiteral("/tmp/foo.zip"), | 90 | QStringLiteral("/tmp/foo.zip"), | ||
89 | QStringLiteral("-P1234"), | 91 | QStringLiteral("-P1234"), | ||
90 | QStringLiteral("-3") | 92 | QStringLiteral("-3") | ||
91 | }; | 93 | }; | ||
94 | | ||||
95 | QTest::newRow("comp-method-bzip2") | ||||
96 | << QStringLiteral("/tmp/foo.zip") | ||||
97 | << QString() << 3 << QStringLiteral("bzip2") | ||||
98 | << QStringList { | ||||
99 | QStringLiteral("-r"), | ||||
100 | QStringLiteral("/tmp/foo.zip"), | ||||
101 | QStringLiteral("-3"), | ||||
102 | QStringLiteral("-Zbzip2") | ||||
103 | }; | ||||
92 | } | 104 | } | ||
93 | 105 | | |||
94 | void CliZipTest::testAddArgs() | 106 | void CliZipTest::testAddArgs() | ||
95 | { | 107 | { | ||
96 | QFETCH(QString, archiveName); | 108 | QFETCH(QString, archiveName); | ||
97 | CliPlugin *plugin = new CliPlugin(this, {QVariant(archiveName)}); | 109 | CliPlugin *plugin = new CliPlugin(this, {QVariant(archiveName)}); | ||
98 | QVERIFY(plugin); | 110 | QVERIFY(plugin); | ||
99 | 111 | | |||
100 | const QStringList addArgs = { QStringLiteral("-r"), | 112 | const QStringList addArgs = { QStringLiteral("-r"), | ||
101 | QStringLiteral("$Archive"), | 113 | QStringLiteral("$Archive"), | ||
102 | QStringLiteral("$PasswordSwitch"), | 114 | QStringLiteral("$PasswordSwitch"), | ||
103 | QStringLiteral("$CompressionLevelSwitch"), | 115 | QStringLiteral("$CompressionLevelSwitch"), | ||
116 | QStringLiteral("$CompressionMethodSwitch"), | ||||
104 | QStringLiteral("$Files") }; | 117 | QStringLiteral("$Files") }; | ||
105 | 118 | | |||
106 | QFETCH(QString, password); | 119 | QFETCH(QString, password); | ||
107 | QFETCH(int, compressionLevel); | 120 | QFETCH(int, compressionLevel); | ||
121 | QFETCH(QString, compressionMethod); | ||||
108 | 122 | | |||
109 | QStringList replacedArgs = plugin->substituteAddVariables(addArgs, {}, password, false, compressionLevel, 0); | 123 | QStringList replacedArgs = plugin->substituteAddVariables(addArgs, {}, password, false, compressionLevel, 0, compressionMethod); | ||
110 | 124 | | |||
111 | QFETCH(QStringList, expectedArgs); | 125 | QFETCH(QStringList, expectedArgs); | ||
112 | QCOMPARE(replacedArgs, expectedArgs); | 126 | QCOMPARE(replacedArgs, expectedArgs); | ||
113 | 127 | | |||
114 | plugin->deleteLater(); | 128 | plugin->deleteLater(); | ||
115 | } | 129 | } | ||
116 | 130 | | |||
117 | void CliZipTest::testExtractArgs_data() | 131 | void CliZipTest::testExtractArgs_data() | ||
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines |