Add missing signal tests

adazem009 · adazem009 · commit 9cdb494787cf · 2024-08-31T13:02:31.000+02:00
Resolves: #57
diff --git a/test/penlayer/CMakeLists.txt b/test/penlayer/CMakeLists.txt
@@ -10,6 +10,7 @@ target_link_libraries(
   scratchcpp-render
   scratchcpprender_mocks
   ${QT_LIBS}
+  Qt6::Test
 )
 
 add_test(penlayer_test)
diff --git a/test/penlayer/penlayer_test.cpp b/test/penlayer/penlayer_test.cpp
@@ -2,6 +2,7 @@
 #include <QOpenGLExtraFunctions>
 #include <QBuffer>
 #include <QFile>
+#include <QSignalSpy>
 #include <penlayer.h>
 #include <penattributes.h>
 #include <projectloader.h>
@@ -53,6 +54,7 @@ TEST_F(PenLayerTest, Constructors)
 TEST_F(PenLayerTest, Engine)
 {
     PenLayer penLayer;
+    QSignalSpy spy(&penLayer, &PenLayer::engineChanged);
     ASSERT_EQ(penLayer.engine(), nullptr);
 
     EngineMock engine1, engine2;
@@ -61,15 +63,33 @@ TEST_F(PenLayerTest, Engine)
     EXPECT_CALL(engine1, stageWidth()).WillOnce(Return(480));
     penLayer.setEngine(&engine1);
     ASSERT_EQ(penLayer.engine(), &engine1);
+    ASSERT_EQ(spy.count(), 1);
 
     penLayer.setWidth(500);
     penLayer.setHeight(400);
     EXPECT_CALL(engine2, stageWidth()).WillOnce(Return(500));
     penLayer.setEngine(&engine2);
     ASSERT_EQ(penLayer.engine(), &engine2);
+    ASSERT_EQ(spy.count(), 2);
 
     penLayer.setEngine(nullptr);
     ASSERT_EQ(penLayer.engine(), nullptr);
+    ASSERT_EQ(spy.count(), 3);
+}
+
+TEST_F(PenLayerTest, HqPen)
+{
+    PenLayer penLayer;
+    QSignalSpy spy(&penLayer, &PenLayer::hqPenChanged);
+    ASSERT_FALSE(penLayer.hqPen());
+
+    penLayer.setHqPen(true);
+    ASSERT_TRUE(penLayer.hqPen());
+    ASSERT_EQ(spy.count(), 1);
+
+    penLayer.setHqPen(false);
+    ASSERT_FALSE(penLayer.hqPen());
+    ASSERT_EQ(spy.count(), 2);
 }
 
 TEST_F(PenLayerTest, FramebufferObject)
diff --git a/test/projectscene/CMakeLists.txt b/test/projectscene/CMakeLists.txt
@@ -10,6 +10,7 @@ target_link_libraries(
   scratchcpp-render
   scratchcpprender_mocks
   ${QT_LIBS}
+  Qt6::Test
 )
 
 add_test(projectscene_test)
diff --git a/test/projectscene/projectscene_test.cpp b/test/projectscene/projectscene_test.cpp
@@ -1,3 +1,4 @@
+#include <QSignalSpy>
 #include <scratchcpp/keyevent.h>
 #include <projectscene.h>
 #include <enginemock.h>
@@ -11,20 +12,24 @@ using ::testing::Return;
 TEST(ProjectSceneTest, Engine)
 {
     ProjectScene scene;
+    QSignalSpy spy(&scene, &ProjectScene::engineChanged);
     ASSERT_EQ(scene.engine(), nullptr);
 
     EngineMock engine;
     scene.setEngine(&engine);
     ASSERT_EQ(scene.engine(), &engine);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST(ProjectSceneTest, StageScale)
 {
     ProjectScene scene;
+    QSignalSpy spy(&scene, &ProjectScene::stageScaleChanged);
     ASSERT_EQ(scene.stageScale(), 1);
 
     scene.setStageScale(5.79);
     ASSERT_EQ(scene.stageScale(), 5.79);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST(ProjectSceneTest, HandleMouseMove)
diff --git a/test/renderedtarget/renderedtarget_test.cpp b/test/renderedtarget/renderedtarget_test.cpp
@@ -623,31 +623,37 @@ TEST_F(RenderedTargetTest, SpriteDragging)
 TEST_F(RenderedTargetTest, Engine)
 {
     RenderedTarget target;
+    QSignalSpy spy(&target, &RenderedTarget::engineChanged);
     ASSERT_EQ(target.engine(), nullptr);
 
     EngineMock engine;
     target.setEngine(&engine);
     ASSERT_EQ(target.engine(), &engine);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(RenderedTargetTest, StageModel)
 {
     RenderedTarget target;
+    QSignalSpy spy(&target, &RenderedTarget::stageModelChanged);
     ASSERT_EQ(target.stageModel(), nullptr);
 
     StageModel model;
     target.setStageModel(&model);
     ASSERT_EQ(target.stageModel(), &model);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(RenderedTargetTest, SpriteModel)
 {
     RenderedTarget target;
+    QSignalSpy spy(&target, &RenderedTarget::spriteModelChanged);
     ASSERT_EQ(target.spriteModel(), nullptr);
 
     SpriteModel model;
     target.setSpriteModel(&model);
     ASSERT_EQ(target.spriteModel(), &model);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(RenderedTargetTest, ScratchTarget)
@@ -672,20 +678,24 @@ TEST_F(RenderedTargetTest, ScratchTarget)
 TEST_F(RenderedTargetTest, MouseArea)
 {
     RenderedTarget target;
+    QSignalSpy spy(&target, &RenderedTarget::mouseAreaChanged);
     ASSERT_EQ(target.mouseArea(), nullptr);
 
     SceneMouseArea mouseArea;
     target.setMouseArea(&mouseArea);
     ASSERT_EQ(target.mouseArea(), &mouseArea);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(RenderedTargetTest, StageScale)
 {
     RenderedTarget target;
+    QSignalSpy spy(&target, &RenderedTarget::stageScaleChanged);
     ASSERT_EQ(target.stageScale(), 1);
 
     target.setStageScale(6.4);
     ASSERT_EQ(target.stageScale(), 6.4);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(RenderedTargetTest, GraphicEffects)
diff --git a/test/textbubbleshape/CMakeLists.txt b/test/textbubbleshape/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(
   GTest::gtest_main
   scratchcpp-render
   ${QT_LIBS}
+  Qt6::Test
 )
 
 add_test(textbubbleshape_test)
diff --git a/test/textbubbleshape/textbubbleshape_test.cpp b/test/textbubbleshape/textbubbleshape_test.cpp
@@ -1,5 +1,6 @@
 #include <QOpenGLContext>
 #include <QOffscreenSurface>
+#include <QSignalSpy>
 #include <textbubbleshape.h>
 
 #include "../common.h"
@@ -41,56 +42,70 @@ TEST_F(TextBubbleShapeTest, Constructors)
 TEST_F(TextBubbleShapeTest, Type)
 {
     TextBubbleShape bubble;
+    QSignalSpy spy(&bubble, &TextBubbleShape::typeChanged);
     ASSERT_EQ(bubble.type(), TextBubbleShape::Type::Say);
 
     bubble.setType(TextBubbleShape::Type::Think);
     ASSERT_EQ(bubble.type(), TextBubbleShape::Type::Think);
+    ASSERT_EQ(spy.count(), 1);
 
     bubble.setType(TextBubbleShape::Type::Think);
     ASSERT_EQ(bubble.type(), TextBubbleShape::Type::Think);
+    ASSERT_EQ(spy.count(), 1);
 
     bubble.setType(TextBubbleShape::Type::Say);
     ASSERT_EQ(bubble.type(), TextBubbleShape::Type::Say);
+    ASSERT_EQ(spy.count(), 2);
 }
 
 TEST_F(TextBubbleShapeTest, OnSpriteRight)
 {
     TextBubbleShape bubble;
+    QSignalSpy spy(&bubble, &TextBubbleShape::onSpriteRightChanged);
     ASSERT_TRUE(bubble.onSpriteRight());
 
     bubble.setOnSpriteRight(false);
     ASSERT_FALSE(bubble.onSpriteRight());
+    ASSERT_EQ(spy.count(), 1);
 
     bubble.setOnSpriteRight(false);
     ASSERT_FALSE(bubble.onSpriteRight());
+    ASSERT_EQ(spy.count(), 1);
 
     bubble.setOnSpriteRight(true);
     ASSERT_TRUE(bubble.onSpriteRight());
+    ASSERT_EQ(spy.count(), 2);
 }
 
 TEST_F(TextBubbleShapeTest, StageScale)
 {
     TextBubbleShape bubble;
+    QSignalSpy spy(&bubble, &TextBubbleShape::stageScaleChanged);
     ASSERT_EQ(bubble.stageScale(), 1);
 
     bubble.setStageScale(6.48);
     ASSERT_EQ(bubble.stageScale(), 6.48);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(TextBubbleShapeTest, NativeWidth)
 {
     TextBubbleShape bubble;
+    QSignalSpy spy(&bubble, &TextBubbleShape::nativeWidthChanged);
     ASSERT_EQ(bubble.nativeWidth(), 0);
 
     bubble.setNativeWidth(48.1);
     ASSERT_EQ(bubble.nativeWidth(), 48.1);
+    ASSERT_EQ(spy.count(), 1);
 }
 
 TEST_F(TextBubbleShapeTest, NativeHeight)
 {
     TextBubbleShape bubble;
+    QSignalSpy spy(&bubble, &TextBubbleShape::nativeHeightChanged);
     ASSERT_EQ(bubble.nativeHeight(), 0);
 
     bubble.setNativeHeight(87.5);
     ASSERT_EQ(bubble.nativeHeight(), 87.5);
+    ASSERT_EQ(spy.count(), 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ target_link_libraries(`
`10`	`10`	`scratchcpp-render`
`11`	`11`	`scratchcpprender_mocks`
`12`	`12`	`${QT_LIBS}`
	`13`	`+ Qt6::Test`
`13`	`14`	`)`
`14`	`15`
`15`	`16`	`add_test(penlayer_test)`
Original file line number	Diff line number	Diff line change
`@@ -623,31 +623,37 @@ TEST_F(RenderedTargetTest, SpriteDragging)`
`623`	`623`	`TEST_F(RenderedTargetTest, Engine)`
`624`	`624`	`{`
`625`	`625`	`RenderedTarget target;`
	`626`	`+ QSignalSpy spy(&target, &RenderedTarget::engineChanged);`
`626`	`627`	`ASSERT_EQ(target.engine(), nullptr);`
`627`	`628`
`628`	`629`	`EngineMock engine;`
`629`	`630`	`target.setEngine(&engine);`
`630`	`631`	`ASSERT_EQ(target.engine(), &engine);`
	`632`	`+ ASSERT_EQ(spy.count(), 1);`
`631`	`633`	`}`
`632`	`634`
`633`	`635`	`TEST_F(RenderedTargetTest, StageModel)`
`634`	`636`	`{`
`635`	`637`	`RenderedTarget target;`
	`638`	`+ QSignalSpy spy(&target, &RenderedTarget::stageModelChanged);`
`636`	`639`	`ASSERT_EQ(target.stageModel(), nullptr);`
`637`	`640`
`638`	`641`	`StageModel model;`
`639`	`642`	`target.setStageModel(&model);`
`640`	`643`	`ASSERT_EQ(target.stageModel(), &model);`
	`644`	`+ ASSERT_EQ(spy.count(), 1);`
`641`	`645`	`}`
`642`	`646`
`643`	`647`	`TEST_F(RenderedTargetTest, SpriteModel)`
`644`	`648`	`{`
`645`	`649`	`RenderedTarget target;`
	`650`	`+ QSignalSpy spy(&target, &RenderedTarget::spriteModelChanged);`
`646`	`651`	`ASSERT_EQ(target.spriteModel(), nullptr);`
`647`	`652`
`648`	`653`	`SpriteModel model;`
`649`	`654`	`target.setSpriteModel(&model);`
`650`	`655`	`ASSERT_EQ(target.spriteModel(), &model);`
	`656`	`+ ASSERT_EQ(spy.count(), 1);`
`651`	`657`	`}`
`652`	`658`
`653`	`659`	`TEST_F(RenderedTargetTest, ScratchTarget)`
`@@ -672,20 +678,24 @@ TEST_F(RenderedTargetTest, ScratchTarget)`
`672`	`678`	`TEST_F(RenderedTargetTest, MouseArea)`
`673`	`679`	`{`
`674`	`680`	`RenderedTarget target;`
	`681`	`+ QSignalSpy spy(&target, &RenderedTarget::mouseAreaChanged);`
`675`	`682`	`ASSERT_EQ(target.mouseArea(), nullptr);`
`676`	`683`
`677`	`684`	`SceneMouseArea mouseArea;`
`678`	`685`	`target.setMouseArea(&mouseArea);`
`679`	`686`	`ASSERT_EQ(target.mouseArea(), &mouseArea);`
	`687`	`+ ASSERT_EQ(spy.count(), 1);`
`680`	`688`	`}`
`681`	`689`
`682`	`690`	`TEST_F(RenderedTargetTest, StageScale)`
`683`	`691`	`{`
`684`	`692`	`RenderedTarget target;`
	`693`	`+ QSignalSpy spy(&target, &RenderedTarget::stageScaleChanged);`
`685`	`694`	`ASSERT_EQ(target.stageScale(), 1);`
`686`	`695`
`687`	`696`	`target.setStageScale(6.4);`
`688`	`697`	`ASSERT_EQ(target.stageScale(), 6.4);`
	`698`	`+ ASSERT_EQ(spy.count(), 1);`
`689`	`699`	`}`
`690`	`700`
`691`	`701`	`TEST_F(RenderedTargetTest, GraphicEffects)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ target_link_libraries(`
`8`	`8`	`GTest::gtest_main`
`9`	`9`	`scratchcpp-render`
`10`	`10`	`${QT_LIBS}`
	`11`	`+ Qt6::Test`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`add_test(textbubbleshape_test)`