diff --git a/libs/libkis/Action.h b/libs/libkis/Action.h --- a/libs/libkis/Action.h +++ b/libs/libkis/Action.h @@ -45,7 +45,7 @@ */ Action(const QString &name, QAction *action, QObject *parent = 0); ~Action() override; - + bool operator==(const Action &other) const; bool operator!=(const Action &other) const; @@ -59,7 +59,7 @@ /** * set the user-visible text of the action to @param text. */ - void settext(QString text); + void setText(QString text); /** * @return the internal name of the action. diff --git a/libs/libkis/Action.cpp b/libs/libkis/Action.cpp --- a/libs/libkis/Action.cpp +++ b/libs/libkis/Action.cpp @@ -65,7 +65,7 @@ return d->action->text(); } -void Action::settext(QString text) +void Action::setText(QString text) { if (!d->action) return; d->action->setText(text); diff --git a/plugins/extensions/pykrita/sip/krita/Action.sip b/plugins/extensions/pykrita/sip/krita/Action.sip --- a/plugins/extensions/pykrita/sip/krita/Action.sip +++ b/plugins/extensions/pykrita/sip/krita/Action.sip @@ -12,7 +12,7 @@ bool operator!=(const Action &other) const; public Q_SLOTS: QString text() const; - void settext(QString text); + void setText(QString text); QString name() const; void setName(QString value); bool isCheckable() const; diff --git a/plugins/extensions/pykrita/tests/actionTests/action_test.py b/plugins/extensions/pykrita/tests/actionTests/action_test.py --- a/plugins/extensions/pykrita/tests/actionTests/action_test.py +++ b/plugins/extensions/pykrita/tests/actionTests/action_test.py @@ -9,10 +9,73 @@ def setUp(self): self.instance = Action() + self.instance.triggered.connect(self.slotTriggered) + self.triggered = False - def testCreateNewAction(self): + def testConstructor(self): self.assertEqual(bool(self.instance), True) - def testCreateNewActionWithQAction(self): + def testConstructorWithStringQAction(self): new_action = Action("test", QAction("test")) self.assertEqual(bool(new_action), True) + + def testEqualOperator(self): + new_action = self.instance + self.assertEqual(new_action==self.instance, True) + + def testInequalityOperator(self): + new_action = Action() + self.assertEqual(new_action!=self.instance, True) + + def testTextProperties(self): + self.instance.setText("test") + self.assertEqual(self.instance.text()=="test", True) + + def testNameProperties(self): + self.instance.setName("test") + self.assertEqual(self.instance.name()=="test", True) + + def testCheckableInitialState(self): + self.assertEqual(self.instance.isCheckable(), False) + + def testCheckableToTrue(self): + self.instance.setCheckable(True) + self.assertEqual(self.instance.isCheckable(), True) + + def testCheckableToFalse(self): + self.instance.setCheckable(False) + self.assertEqual(self.instance.isCheckable(), False) + + def testCheckedInitialState(self): + self.assertEqual(self.instance.isChecked(), False) + + def testCheckedToTrue(self): + self.instance.setCheckable(True) + self.instance.setChecked(True) + self.assertEqual(self.instance.isChecked(), True) + + def testCheckedToFalse(self): + self.instance.setChecked(False) + self.assertEqual(self.instance.isChecked(), False) + + def testCheckedToFalseNotCheckable(self): + self.instance.setChecked(True) + self.assertEqual(self.instance.isChecked(), False) + + def testVisibleInitialState(self): + self.assertEqual(self.instance.isVisible(), True) + + def testVisibleToTrue(self): + self.instance.setVisible(True) + self.assertEqual(self.instance.isVisible(), True) + + def testVisibleToFalse(self): + self.instance.setVisible(False) + self.assertEqual(self.instance.isVisible(), False) + + def testTrigger(self): + self.instance.trigger() + self.assertEqual(self.triggered, True) + + def slotTriggered(self): + self.triggered = True