Remove IEngine to Engine casts from Compiler test

Author: adazem009

test/compiler/compiler_test.cpp

@@ -105,12 +105,10 @@ TEST_F(CompilerTest, EmptyProject)
     ProjectPrivate p("empty_project.sb3", ScratchVersion::Scratch3);
     ASSERT_TRUE(p.load());
     auto engine = p.engine;
-    // TODO: Remove the cast
-    ASSERT_EQ(std::static_pointer_cast<Engine>(engine)->targets().size(), 1);
+    ASSERT_EQ(engine->targets().size(), 1);
     ASSERT_EQ(engine->extensions().size(), 0);
     ASSERT_EQ(engine->broadcasts().size(), 0);
-    // TODO: Remove the IEngine to Engine cast
-    Stage *stage = dynamic_cast<Stage *>(std::static_pointer_cast<Engine>(engine)->targetAt(0));
+    Stage *stage = dynamic_cast<Stage *>(engine->targetAt(0));
     ASSERT_EQ(stage->blocks().size(), 0);
 }
 
@@ -119,15 +117,13 @@ TEST_F(CompilerTest, ResolveIds)
     ProjectPrivate p("resolve_id_test.sb3", ScratchVersion::Scratch3);
     ASSERT_TRUE(p.load());
     auto engine = p.engine;
-    // TODO: Remove the cast
-    ASSERT_EQ(std::static_pointer_cast<Engine>(engine)->targets().size(), 2);
+    ASSERT_EQ(engine->targets().size(), 2);
     ASSERT_EQ(engine->extensions().size(), 0);
     ASSERT_EQ(engine->broadcasts().size(), 1);
 
     // Stage
-    // TODO: Remove the IEngine to Engine casts
-    ASSERT_NE(std::static_pointer_cast<Engine>(engine)->findTarget("Stage"), -1);
-    Stage *stage = dynamic_cast<Stage *>(std::static_pointer_cast<Engine>(engine)->targetAt(std::static_pointer_cast<Engine>(engine)->findTarget("Stage")));
+    ASSERT_NE(engine->findTarget("Stage"), -1);
+    Stage *stage = dynamic_cast<Stage *>(engine->targetAt(engine->findTarget("Stage")));
     ASSERT_TRUE(stage);
     ASSERT_EQ(stage->blocks().size(), 2);
     auto block = stage->greenFlagBlocks().at(0);
@@ -145,9 +141,8 @@ TEST_F(CompilerTest, ResolveIds)
     ASSERT_FALSE(block->next());
 
     // Sprite1
-    // TODO: Remove the IEngine to Engine casts
-    ASSERT_NE(std::static_pointer_cast<Engine>(engine)->findTarget("Sprite1"), -1);
-    Sprite *sprite1 = dynamic_cast<Sprite *>(std::static_pointer_cast<Engine>(engine)->targetAt(std::static_pointer_cast<Engine>(engine)->findTarget("Sprite1")));
+    ASSERT_NE(engine->findTarget("Sprite1"), -1);
+    Sprite *sprite1 = dynamic_cast<Sprite *>(engine->targetAt(engine->findTarget("Sprite1")));
     ASSERT_TRUE(sprite1);
     ASSERT_EQ(sprite1->blocks().size(), 5);
     block = sprite1->greenFlagBlocks().at(0);