Fix tests

mitchcurtis · Mar 4, 2018 · 8741540 · 8741540
1 parent 6db6de5
commit 8741540
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/qml/ui/Shortcuts.qml b/app/qml/ui/Shortcuts.qml
@@ -22,7 +22,7 @@ Item {
     Shortcut {
         objectName: "newShortcut"
         sequence: settings.newShortcut
-        onActivated: {print("@@@");doIfChangesDiscarded(function() { newProjectPopup.open() }, true)}
+        onActivated: doIfChangesDiscarded(function() { newProjectPopup.open() }, true)
         enabled: canvasHasActiveFocus
     }
 

diff --git a/tests/testhelper.cpp b/tests/testhelper.cpp
@@ -1039,7 +1039,7 @@ bool TestHelper::createNewProject(Project::Type projectType, const QVariantMap &
         VERIFY(!newImageProjectPopup->property("visible").toBool());
     }
 
-    return !updateVariables(true, projectType);
+    return updateVariables(true, projectType);
 }
 
 bool TestHelper::createNewTilesetProject(int tileWidth, int tileHeight, int tilesetTilesWide, int tilesetTilesHigh,

diff --git a/tests/testutils.h b/tests/testutils.h
@@ -22,9 +22,7 @@ do { \
 
 #define VERIFY2(statement, description) \
 do { \
-    if (statement) { \
-        return true; \
-    } else { \
+    if (!static_cast<bool>(statement)) { \
         failureMessage = description; \
         return false; \
     } \