Add type identification methods to Drawable

Author: adazem009

include/scratchcpp/drawable.h

@@ -17,6 +17,12 @@ class LIBSCRATCHCPP_EXPORT Drawable
         Drawable();
         Drawable(const Drawable &) = delete;
 
+        /*! Returns true if this Drawable is a Target. */
+        virtual bool isTarget() const { return false; }
+
+        /*! Returns true if this Drawable is a TextBubble. */
+        virtual bool isTextBubble() const { return false; }
+
         int layerOrder() const;
         virtual void setLayerOrder(int newLayerOrder);
 

include/scratchcpp/target.h

@@ -31,6 +31,8 @@ class LIBSCRATCHCPP_EXPORT Target : public Drawable
         Target(const Target &) = delete;
         virtual ~Target() { }
 
+        bool isTarget() const override final;
+
         /*! Returns true if this Target is the stage. */
         virtual bool isStage() const { return false; }
 

include/scratchcpp/textbubble.h

@@ -23,6 +23,8 @@ class TextBubble : public Drawable
         TextBubble();
         TextBubble(const TextBubble &) = delete;
 
+        bool isTextBubble() const override final;
+
         Type type() const;
         virtual void setType(Type type);
         sigslot::signal<Type> &typeChanged() const;

src/scratch/target.cpp

@@ -29,6 +29,12 @@ Target::Target() :
 {
 }
 
+/*! Returns true. */
+bool Target::isTarget() const
+{
+    return true;
+}
+
 /*! Returns the name of the target. */
 const std::string &Target::name() const
 {

src/scratch/textbubble.cpp

@@ -13,6 +13,12 @@ TextBubble::TextBubble() :
 {
 }
 
+/*! Returns true. */
+bool TextBubble::isTextBubble() const
+{
+    return true;
+}
+
 /*! Returns the type of the TextBubble (say or think). */
 TextBubble::Type TextBubble::type() const
 {

test/scratch_classes/drawable_test.cpp

@@ -4,6 +4,18 @@
 
 using namespace libscratchcpp;
 
+TEST(DrawableTest, IsTarget)
+{
+    Drawable drawable;
+    ASSERT_FALSE(drawable.isTarget());
+}
+
+TEST(DrawableTest, IsTextBubble)
+{
+    Drawable drawable;
+    ASSERT_FALSE(drawable.isTextBubble());
+}
+
 TEST(DrawableTest, LayerOrder)
 {
     Drawable drawable;

test/scratch_classes/target_test.cpp

@@ -25,6 +25,18 @@ using ::testing::WithArgs;
 using ::testing::Invoke;
 using ::testing::_;
 
+TEST(TargetTest, IsTarget)
+{
+    Target target;
+    ASSERT_TRUE(target.isTarget());
+}
+
+TEST(TargetTest, IsTextBubble)
+{
+    Target target;
+    ASSERT_FALSE(target.isTextBubble());
+}
+
 TEST(TargetTest, IsStage)
 {
     Target target;

test/scratch_classes/textbubble_test.cpp

@@ -4,6 +4,18 @@
 
 using namespace libscratchcpp;
 
+TEST(TextBubbleTest, IsTarget)
+{
+    TextBubble bubble;
+    ASSERT_FALSE(bubble.isTarget());
+}
+
+TEST(TextBubbleTest, IsTextBubble)
+{
+    TextBubble bubble;
+    ASSERT_TRUE(bubble.isTextBubble());
+}
+
 TEST(TextBubbleTest, BubbleType)
 {
     TextBubble bubble;