Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 05:48:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Renamed HTML folder.

Browse source 
Corrected names of tests.
This commit is contained in:
NissimHadar 2018-10-05 08:58:14 -07:00
parent d79d092dc8
commit 19f41eac2b
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/auto-tester/src/AWSInterface.cpp
View file

@ -32,8 +32,12 @@ void AWSInterface::createWebPageFromResults(const QString& testResults, const QS
void AWSInterface::createHTMLFile(const QString& testResults, const QString& tempDirectory) {
// For file named `D:/tt/snapshots/TestResults--2018-10-03_15-35-28(9433)[DESKTOP-PMKNLSQ].zip`
// - the HTML will be named `TestResults--2018-10-03_15-35-28(9433)[DESKTOP-PMKNLSQ]`
QString resultsPath = tempDirectory + "/" + resultsFolder + "/";
// - the HTML will be in a folder named `TestResults--2018-10-03_15-35-28(9433)[DESKTOP-PMKNLSQ]`
QStringList pathComponents = testResults.split('/');
QString filename = pathComponents[pathComponents.length() - 1];
_resultsFolder = filename.left(filename.length() - 4);
QString resultsPath = tempDirectory + "/" + _resultsFolder + "/";
QDir().mkdir(resultsPath);
QStringList tokens = testResults.split('/');
QString htmlFilename = resultsPath + tokens[tokens.length() - 1].split('.')[0] + ".html";
@ -151,21 +155,23 @@ void AWSInterface::writeTable(QTextStream& stream) {
for (int i = 0; i < newNames.length(); ++i) {
QDir dir(originalNames[i]);
dir.rename(originalNames[i], _tempDirectory + "/" + resultsFolder + "/" + newNames[i]);
dir.rename(originalNames[i], _tempDirectory + "/" + _resultsFolder + "/" + newNames[i]);
}
QDirIterator it2((_tempDirectory + "/" + resultsFolder).toStdString().c_str());
QDirIterator it2((_tempDirectory + "/" + _resultsFolder).toStdString().c_str());
while (it2.hasNext()) {
QString nextDirectory = it2.next();
// Skip `.` and `..` directories, as well as the HTML directory
if (nextDirectory.right(1) == "." || nextDirectory.contains(QString("/") + resultsFolder + "/TestResults--")) {
if (nextDirectory.right(1) == "." || nextDirectory.contains(QString("/") + _resultsFolder + "/TestResults--")) {
continue;
}
int splitIndex = nextDirectory.lastIndexOf(".");
QString testName = nextDirectory.left(splitIndex).replace(".", " / ");
QString testNumber = nextDirectory.right(nextDirectory.length() - (splitIndex + 1));
QStringList pathComponents = nextDirectory.split('/');
QString filename = pathComponents[pathComponents.length() - 1];
int splitIndex = filename.lastIndexOf(".");
QString testName = filename.left(splitIndex).replace(".", " / ");
QString testNumber = filename.right(filename.length() - (splitIndex + 1));
// The failures are ordered lexicographically, so we know that we can rely on the testName changing to create a new table
if (testName != previousTestName) {

3
tools/auto-tester/src/AWSInterface.h
View file

@ -37,8 +37,7 @@ public:
private:
QString _tempDirectory;
const QString resultsFolder{ "HTML" };
QString _resultsFolder;
};
#endif // hifi_AWSInterface_h