(c-api) Tests refactoring.

8 files changed, 13 insertions, 15 deletions

diff --git a/capi/qtests/empty.svg b/capi/qtests/images/empty.svg
index 78dc968..78dc968 100644
--- a/capi/qtests/empty.svg
+++ b/capi/qtests/images/empty.svg
diff --git a/capi/qtests/invalid.svg b/capi/qtests/images/invalid.svg
index 96322cc..96322cc 100644
--- a/capi/qtests/invalid.svg
+++ b/capi/qtests/images/invalid.svg
diff --git a/capi/qtests/test.svg b/capi/qtests/images/test.svg
index d75f48f..d75f48f 100644
--- a/capi/qtests/test.svg
+++ b/capi/qtests/images/test.svg
diff --git a/capi/qtests/text.svg b/capi/qtests/images/text.svg
index 5e9f2dd..5e9f2dd 100644
--- a/capi/qtests/text.svg
+++ b/capi/qtests/images/text.svg
diff --git a/capi/qtests/vb.svg b/capi/qtests/images/vb.svg
index 7049b09..7049b09 100644
--- a/capi/qtests/vb.svg
+++ b/capi/qtests/images/vb.svg
diff --git a/capi/qtests/test_renderFile_result.png b/capi/qtests/results/test_renderFile.png
index 4710e9d..4710e9d 100644
--- a/capi/qtests/test_renderFile_result.png
+++ b/capi/qtests/results/test_renderFile.png
diff --git a/capi/qtests/test_renderFileWithText_result.png b/capi/qtests/results/test_renderFileWithText.png
index cd4a4a7..cd4a4a7 100644
--- a/capi/qtests/test_renderFileWithText_result.png
+++ b/capi/qtests/results/test_renderFileWithText.png
diff --git a/capi/qtests/tst_resvgqt.cpp b/capi/qtests/tst_resvgqt.cpp
index debbff4..73a2557 100644
--- a/capi/qtests/tst_resvgqt.cpp
+++ b/capi/qtests/tst_resvgqt.cpp
@@ -37,7 +37,7 @@ void ResvgQtTests::initTestCase()
 
 void ResvgQtTests::test_parseFile()
 {
-    ResvgRenderer render(localPath("test.svg"));
+    ResvgRenderer render(localPath("images/test.svg"));
     QVERIFY(render.isValid());
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.defaultSize(), QSize(200, 200));
@@ -45,14 +45,14 @@ void ResvgQtTests::test_parseFile()
 
 void ResvgQtTests::test_parseInvalidFile()
 {
-    ResvgRenderer render(localPath("invalid.svg"));
+    ResvgRenderer render(localPath("images/invalid.svg"));
     QVERIFY(!render.isValid());
     QVERIFY(render.isEmpty());
 }
 
 void ResvgQtTests::test_emptyFile()
 {
-    ResvgRenderer render(localPath("empty.svg"));
+    ResvgRenderer render(localPath("images/empty.svg"));
     QVERIFY(render.isValid());
     QVERIFY(render.isEmpty());
 }
@@ -60,7 +60,7 @@ void ResvgQtTests::test_emptyFile()
 void ResvgQtTests::test_renderFile()
 {
 #ifdef LOCAL_BUILD
-    ResvgRenderer render(localPath("test.svg"));
+    ResvgRenderer render(localPath("images/test.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.defaultSize(), QSize(200, 200));
 
@@ -71,16 +71,16 @@ void ResvgQtTests::test_renderFile()
     render.render(&p);
     p.end();
 
-    img.save("test_renderFile.png");
+    img.save("test.png");
 
-    QCOMPARE(img, QImage(localPath("test_renderFile_result.png")));
+    QCOMPARE(img, QImage(localPath("results/test_renderFile.png")));
 #endif
 }
 
 void ResvgQtTests::test_renderFileWithText()
 {
 #ifdef LOCAL_BUILD
-    ResvgRenderer render(localPath("text.svg"));
+    ResvgRenderer render(localPath("images/text.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.defaultSize(), QSize(200, 200));
 
@@ -91,36 +91,34 @@ void ResvgQtTests::test_renderFileWithText()
     render.render(&p);
     p.end();
 
-    img.save("test_renderFileWithText.png");
-
-    QCOMPARE(img, QImage(localPath("test_renderFileWithText_result.png")));
+    QCOMPARE(img, QImage(localPath("results/test_renderFileWithText.png")));
 #endif
 }
 
 void ResvgQtTests::test_imageSize()
 {
-    ResvgRenderer render(localPath("vb.svg"));
+    ResvgRenderer render(localPath("images/vb.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.defaultSize(), QSize(200, 400));
 }
 
 void ResvgQtTests::test_imageViewBox()
 {
-    ResvgRenderer render(localPath("vb.svg"));
+    ResvgRenderer render(localPath("images/vb.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.viewBox(), QRect(50, 100, 200, 400));
 }
 
 void ResvgQtTests::test_imageBoundingBox()
 {
-    ResvgRenderer render(localPath("test.svg"));
+    ResvgRenderer render(localPath("images/test.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.boundingBox().toRect(), QRect(20, 20, 160, 160));
 }
 
 void ResvgQtTests::test_elementExists()
 {
-    ResvgRenderer render(localPath("test.svg"));
+    ResvgRenderer render(localPath("images/test.svg"));
     QVERIFY(!render.isEmpty());
 
     // Existing element.
@@ -137,7 +135,7 @@ void ResvgQtTests::test_elementExists()
 
 void ResvgQtTests::test_transformForElement()
 {
-    ResvgRenderer render(localPath("test.svg"));
+    ResvgRenderer render(localPath("images/test.svg"));
     QVERIFY(!render.isEmpty());
     QCOMPARE(render.transformForElement("circle1"), QTransform(2, 0, 0, 2, 0, 0));
     QCOMPARE(render.transformForElement("invalid"), QTransform());