summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2016-09-13 19:19:10 (GMT)
committerRalf Habacker <ralf.habacker@freenet.de>2016-09-13 19:55:51 (GMT)
commit348dbe73b5350b56c65bb4e0144a37025dc8da2d (patch)
tree5129af15589592d26eb633576773e707635fd73f
parent41e9adfbbc201e05e2619efe526c82b7ecc8efb9 (diff)
Let unit test class and file names be in sync with other umbrello source code.
-rw-r--r--unittests/CMakeLists.txt42
-rw-r--r--unittests/testbasictypes.cpp (renamed from unittests/TEST_basictypes.cpp)50
-rw-r--r--unittests/testbasictypes.h (renamed from unittests/TEST_basictypes.h)2
-rw-r--r--unittests/testclassifier.cpp (renamed from unittests/TEST_classifier.cpp)0
-rw-r--r--unittests/testclassifier.h (renamed from unittests/TEST_classifier.h)0
-rw-r--r--unittests/testcppwriter.cpp (renamed from unittests/TEST_cppwriter.cpp)12
-rw-r--r--unittests/testcppwriter.h (renamed from unittests/TEST_cppwriter.h)8
-rw-r--r--unittests/testllvm.cpp (renamed from unittests/TEST_llvm.cpp)0
-rw-r--r--unittests/testllvmparser.cpp (renamed from unittests/TEST_llvm_parser.cpp)0
-rw-r--r--unittests/testoptionstate.cpp (renamed from unittests/TEST_optionstate.cpp)8
-rw-r--r--unittests/testoptionstate.h (renamed from unittests/TEST_optionstate.h)8
-rw-r--r--unittests/testpythonwriter.cpp (renamed from unittests/TEST_pythonwriter.cpp)10
-rw-r--r--unittests/testpythonwriter.h (renamed from unittests/TEST_pythonwriter.h)8
-rw-r--r--unittests/testumlobject.cpp (renamed from unittests/TEST_umlobject.cpp)38
-rw-r--r--unittests/testumlobject.h (renamed from unittests/TEST_umlobject.h)8
-rw-r--r--unittests/testumlroledialog.cpp (renamed from unittests/TEST_umlroledialog.cpp)0
16 files changed, 97 insertions, 97 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 81f8077..1a3f713 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -66,52 +66,52 @@ else()
endif()
ecm_add_test(
- TEST_basictypes.cpp
+ testbasictypes.cpp
LINK_LIBRARIES ${LIBS}
- TEST_NAME TEST_basictypes
+ TEST_NAME testbasictypes
)
ecm_add_test(
- TEST_umlobject.cpp
+ testumlobject.cpp
testbase.cpp
LINK_LIBRARIES ${LIBS}
- TEST_NAME TEST_umlobject
+ TEST_NAME testumlobject
)
#ecm_add_test(
-# TEST_classifier.cpp
+# testclassifier.cpp
# testbase.cpp
# LINK_LIBRARIES ${LIBS}
-# TEST_NAME TEST_classifier
+# TEST_NAME testclassifier
#)
ecm_add_test(
- TEST_cppwriter.cpp
+ testcppwriter.cpp
testbase.cpp
LINK_LIBRARIES ${LIBS}
- TEST_NAME TEST_cppwriter
+ TEST_NAME testcppwriter
)
ecm_add_test(
- TEST_pythonwriter.cpp
+ testpythonwriter.cpp
testbase.cpp
LINK_LIBRARIES ${LIBS}
- TEST_NAME TEST_pythonwriter
+ TEST_NAME testpythonwriter
)
ecm_add_test(
- TEST_optionstate.cpp
+ testoptionstate.cpp
testbase.cpp
LINK_LIBRARIES ${LIBS}
- TEST_NAME TEST_optionstate
+ TEST_NAME testoptionstate
)
-set(TEST_umlroledialog_SRCS
- TEST_umlroledialog.cpp
+set(testumlroledialog_SRCS
+ testumlroledialog.cpp
)
-ecm_add_executable(TEST_umlroledialog ${TEST_umlroledialog_SRCS})
-target_link_libraries(TEST_umlroledialog ${LIBS})
+ecm_add_executable(testumlroledialog ${testumlroledialog_SRCS})
+target_link_libraries(testumlroledialog ${LIBS})
find_package(LLVM CONFIG)
find_package(CLANG)
@@ -130,17 +130,17 @@ if(LLVM_FOUND)
endif()
# Now build our tools
- add_executable(test-llvm TEST_llvm.cpp)
+ add_executable(testllvm testllvm.cpp)
# Find the libraries that correspond to the LLVM components
# that we wish to use
llvm_map_components_to_libnames(llvm_libs support core irreader analysis)
# Link against LLVM libraries
- target_link_libraries(test-llvm ${llvm_libs} clangFrontend clangTooling)
+ target_link_libraries(testllvm ${llvm_libs} clangFrontend clangTooling)
- add_executable(TEST_llvm_parser TEST_llvm_parser.cpp)
+ add_executable(testllvmparser testllvmparser.cpp)
llvm_map_components_to_libnames(llvm_libs support)
- target_link_libraries(TEST_llvm_parser ${llvm_libs} clangFrontend clangTooling clangAST clangBasic ${LIBS})
- ecm_mark_nongui_executable(test-llvm TEST_llvm_parser)
+ target_link_libraries(testllvmparser ${llvm_libs} clangFrontend clangTooling clangAST clangBasic ${LIBS})
+ ecm_mark_nongui_executable(testllvm testllvmparser)
endif()
diff --git a/unittests/TEST_basictypes.cpp b/unittests/testbasictypes.cpp
index f5bf7eb..9681098 100644
--- a/unittests/TEST_basictypes.cpp
+++ b/unittests/testbasictypes.cpp
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "TEST_basictypes.h"
+#include "testbasictypes.h"
// app includes
#include "basictypes.h"
@@ -39,7 +39,7 @@ class B : public A
{
};
-void TEST_basictypes::test_dynamic_cast()
+void TestBasicTypes::test_dynamic_cast()
{
QScopedPointer<A> a1(new A);
B* b1 = dynamic_cast<B*> (a1.data());
@@ -49,7 +49,7 @@ void TEST_basictypes::test_dynamic_cast()
QVERIFY(b2);
}
-void TEST_basictypes::test_QString_english()
+void TestBasicTypes::test_QString_english()
{
QLocale _default = QLocale();
QLocale english(QLocale::English);
@@ -72,7 +72,7 @@ void TEST_basictypes::test_QString_english()
QLocale::setDefault(_default);
}
-void TEST_basictypes::test_QString_non_english()
+void TestBasicTypes::test_QString_non_english()
{
QLocale _default = QLocale();
QLocale hungarian(QLocale::Hungarian);
@@ -95,7 +95,7 @@ void TEST_basictypes::test_QString_non_english()
QLocale::setDefault(_default);
}
-void TEST_basictypes::test_DomDocument_english()
+void TestBasicTypes::test_DomDocument_english()
{
QLocale _default = QLocale();
QLocale locale(QLocale::English);
@@ -130,7 +130,7 @@ void TEST_basictypes::test_DomDocument_english()
QLocale::setDefault(_default);
}
-void TEST_basictypes::test_DomDocument_non_english()
+void TestBasicTypes::test_DomDocument_non_english()
{
QLocale _default = QLocale();
QLocale locale(QLocale::Hungarian);
@@ -166,7 +166,7 @@ void TEST_basictypes::test_DomDocument_non_english()
QLocale::setDefault(_default);
}
-void TEST_basictypes::test_ModelType_toString()
+void TestBasicTypes::test_ModelType_toString()
{
Uml::ModelType::Enum model0 = Uml::ModelType::Logical;
QCOMPARE(Uml::ModelType::toString(model0), QString("Logical"));
@@ -180,7 +180,7 @@ void TEST_basictypes::test_ModelType_toString()
QCOMPARE(Uml::ModelType::toString(model4), QString("EntityRelationship"));
}
-void TEST_basictypes::test_ModelType_fromString()
+void TestBasicTypes::test_ModelType_fromString()
{
QString modelStr;
Uml::ModelType::Enum model;
@@ -202,7 +202,7 @@ void TEST_basictypes::test_ModelType_fromString()
QVERIFY(model == Uml::ModelType::EntityRelationship);
}
-void TEST_basictypes::test_ModelType_forLoop()
+void TestBasicTypes::test_ModelType_forLoop()
{
Uml::ModelType::Enum list[Uml::ModelType::N_MODELTYPES];
for (int i = 0; i < Uml::ModelType::N_MODELTYPES; ++i) {
@@ -220,7 +220,7 @@ void TEST_basictypes::test_ModelType_forLoop()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_Visibility_toString()
+void TestBasicTypes::test_Visibility_toString()
{
Uml::Visibility::Enum visibility1 = Uml::Visibility::Public;
QCOMPARE(Uml::Visibility::toString(visibility1), QString("public"));
@@ -236,7 +236,7 @@ void TEST_basictypes::test_Visibility_toString()
QCOMPARE(Uml::Visibility::toString(visibility4, true), QString("~"));
}
-void TEST_basictypes::test_Visibility_fromString()
+void TestBasicTypes::test_Visibility_fromString()
{
Uml::Visibility::Enum visibility;
visibility = Uml::Visibility::fromString("public");
@@ -261,7 +261,7 @@ void TEST_basictypes::test_Visibility_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_DiagramType_toString()
+void TestBasicTypes::test_DiagramType_toString()
{
Uml::DiagramType::Enum diagram0(Uml::DiagramType::Undefined);
QCOMPARE(Uml::DiagramType::toString(diagram0), QString("Undefined"));
@@ -285,7 +285,7 @@ void TEST_basictypes::test_DiagramType_toString()
QCOMPARE(Uml::DiagramType::toString(diagram9), QString("EntityRelationship"));
}
-void TEST_basictypes::test_DiagramType_fromString()
+void TestBasicTypes::test_DiagramType_fromString()
{
Uml::DiagramType::Enum diagram;
diagram = Uml::DiagramType::fromString("Undefined");
@@ -310,7 +310,7 @@ void TEST_basictypes::test_DiagramType_fromString()
QVERIFY(diagram == Uml::DiagramType::EntityRelationship);
}
-void TEST_basictypes::test_DiagramType_forLoop()
+void TestBasicTypes::test_DiagramType_forLoop()
{
Uml::DiagramType::Enum list[Uml::DiagramType::N_DIAGRAMTYPES];
for (int i = 0; i < Uml::DiagramType::N_DIAGRAMTYPES; ++i) {
@@ -333,7 +333,7 @@ void TEST_basictypes::test_DiagramType_forLoop()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_AssociationType_toString_fromString()
+void TestBasicTypes::test_AssociationType_toString_fromString()
{
for (int i = Uml::AssociationType::Generalization; i < Uml::AssociationType::Reserved; ++i) {
Uml::AssociationType::Enum at = Uml::AssociationType::fromString(
@@ -345,7 +345,7 @@ void TEST_basictypes::test_AssociationType_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_SignatureType_toString_fromString()
+void TestBasicTypes::test_SignatureType_toString_fromString()
{
QVERIFY(Uml::SignatureType::NoSig ==
Uml::SignatureType::fromString(Uml::SignatureType::toString(Uml::SignatureType::NoSig)));
@@ -359,7 +359,7 @@ void TEST_basictypes::test_SignatureType_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_TextRole_toString_fromString()
+void TestBasicTypes::test_TextRole_toString_fromString()
{
for (int i = Uml::TextRole::Floating; i < Uml::TextRole::Reserved; ++i) {
Uml::TextRole::Enum at = Uml::TextRole::fromString(
@@ -371,7 +371,7 @@ void TEST_basictypes::test_TextRole_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_Changeability_toString_fromString()
+void TestBasicTypes::test_Changeability_toString_fromString()
{
for (int i = 900; i < 903; ++i) {
Uml::Changeability::Enum at = Uml::Changeability::fromString(
@@ -383,7 +383,7 @@ void TEST_basictypes::test_Changeability_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_SequenceMessage_toString_fromString()
+void TestBasicTypes::test_SequenceMessage_toString_fromString()
{
for (int i = 1000; i < 1004; ++i) {
Uml::SequenceMessage::Enum at = Uml::SequenceMessage::fromString(
@@ -395,7 +395,7 @@ void TEST_basictypes::test_SequenceMessage_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_RoleType_toString_fromString()
+void TestBasicTypes::test_RoleType_toString_fromString()
{
for (int i = Uml::RoleType::A; i <= Uml::RoleType::B; ++i) {
Uml::RoleType::Enum at = Uml::RoleType::fromString(
@@ -407,7 +407,7 @@ void TEST_basictypes::test_RoleType_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_ParameterDirection_toString_fromString()
+void TestBasicTypes::test_ParameterDirection_toString_fromString()
{
for (int i = Uml::ParameterDirection::In; i <= Uml::ParameterDirection::Out; ++i) {
Uml::ParameterDirection::Enum at = Uml::ParameterDirection::fromString(
@@ -419,7 +419,7 @@ void TEST_basictypes::test_ParameterDirection_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_ProgrammingLanguage_toString_fromString()
+void TestBasicTypes::test_ProgrammingLanguage_toString_fromString()
{
for (int i = Uml::ProgrammingLanguage::ActionScript; i < Uml::ProgrammingLanguage::Reserved; ++i) {
Uml::ProgrammingLanguage::Enum at = Uml::ProgrammingLanguage::fromString(
@@ -431,7 +431,7 @@ void TEST_basictypes::test_ProgrammingLanguage_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_Region_toString_fromString()
+void TestBasicTypes::test_Region_toString_fromString()
{
for (int i = Uml::Region::Error; i <= Uml::Region::SouthWest; ++i) {
Uml::Region::Enum at = Uml::Region::fromString(
@@ -443,7 +443,7 @@ void TEST_basictypes::test_Region_toString_fromString()
//-----------------------------------------------------------------------------
-void TEST_basictypes::test_Corner_toString_fromString()
+void TestBasicTypes::test_Corner_toString_fromString()
{
for (int i = Uml::Corner::TopLeft; i <= Uml::Corner::BottomLeft; i *= 2) {
Uml::Corner::Enum at = Uml::Corner::fromString(
@@ -455,4 +455,4 @@ void TEST_basictypes::test_Corner_toString_fromString()
//-----------------------------------------------------------------------------
-QTEST_MAIN(TEST_basictypes)
+QTEST_MAIN(TestBasicTypes)
diff --git a/unittests/TEST_basictypes.h b/unittests/testbasictypes.h
index f47eb5a..fd594cd 100644
--- a/unittests/TEST_basictypes.h
+++ b/unittests/testbasictypes.h
@@ -23,7 +23,7 @@
#include <QObject>
-class TEST_basictypes : public QObject
+class TestBasicTypes : public QObject
{
Q_OBJECT
private slots:
diff --git a/unittests/TEST_classifier.cpp b/unittests/testclassifier.cpp
index 81a223b..81a223b 100644
--- a/unittests/TEST_classifier.cpp
+++ b/unittests/testclassifier.cpp
diff --git a/unittests/TEST_classifier.h b/unittests/testclassifier.h
index d1fc777..d1fc777 100644
--- a/unittests/TEST_classifier.h
+++ b/unittests/testclassifier.h
diff --git a/unittests/TEST_cppwriter.cpp b/unittests/testcppwriter.cpp
index d737c92..3bfc41d 100644
--- a/unittests/TEST_cppwriter.cpp
+++ b/unittests/testcppwriter.cpp
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "TEST_cppwriter.h"
+#include "testcppwriter.h"
// app include
#include "classifier.h"
@@ -37,14 +37,14 @@ public:
}
};
-void TEST_cppwriter::test_language()
+void TestCppWriter::test_language()
{
CppWriter* cpp = new CppWriter();
Uml::ProgrammingLanguage::Enum lang = cpp->language();
QVERIFY(lang == Uml::ProgrammingLanguage::Cpp);
}
-void TEST_cppwriter::test_writeClass()
+void TestCppWriter::test_writeClass()
{
CppWriterTest* cpp = new CppWriterTest();
UMLClassifier* c = new UMLClassifier("Customer", "12345678");
@@ -65,7 +65,7 @@ void TEST_cppwriter::test_writeClass()
QCOMPARE(fileCPP.exists(), true);
}
-void TEST_cppwriter::test_reservedKeywords()
+void TestCppWriter::test_reservedKeywords()
{
CppWriter* cpp = new CppWriter();
QStringList list = cpp->reservedKeywords();
@@ -75,7 +75,7 @@ void TEST_cppwriter::test_reservedKeywords()
QCOMPARE(list.last(), QLatin1String("xor_eq"));
}
-void TEST_cppwriter::test_defaultDatatypes()
+void TestCppWriter::test_defaultDatatypes()
{
CppWriter* cpp = new CppWriter();
QStringList list = cpp->defaultDatatypes();
@@ -85,4 +85,4 @@ void TEST_cppwriter::test_defaultDatatypes()
QCOMPARE(list[5], QLatin1String("string"));
}
-QTEST_MAIN(TEST_cppwriter)
+QTEST_MAIN(TestCppWriter)
diff --git a/unittests/TEST_cppwriter.h b/unittests/testcppwriter.h
index 45230ef..b800d64 100644
--- a/unittests/TEST_cppwriter.h
+++ b/unittests/testcppwriter.h
@@ -18,15 +18,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TEST_CPPWRITER_H
-#define TEST_CPPWRITER_H
+#ifndef TESTCPPWRITER_H
+#define TESTCPPWRITER_H
#include "testbase.h"
/**
* Unit test for class CppWriter (cppwriter.h).
*/
-class TEST_cppwriter: public TestCodeGeneratorBase
+class TestCppWriter: public TestCodeGeneratorBase
{
Q_OBJECT
private slots:
@@ -36,4 +36,4 @@ private slots:
void test_defaultDatatypes();
};
-#endif // TEST_CPPWRITER_H
+#endif // TESTCPPWRITER_H
diff --git a/unittests/TEST_llvm.cpp b/unittests/testllvm.cpp
index 3bd4a34..3bd4a34 100644
--- a/unittests/TEST_llvm.cpp
+++ b/unittests/testllvm.cpp
diff --git a/unittests/TEST_llvm_parser.cpp b/unittests/testllvmparser.cpp
index 122d823..122d823 100644
--- a/unittests/TEST_llvm_parser.cpp
+++ b/unittests/testllvmparser.cpp
diff --git a/unittests/TEST_optionstate.cpp b/unittests/testoptionstate.cpp
index 90b436b..e4d9747 100644
--- a/unittests/TEST_optionstate.cpp
+++ b/unittests/testoptionstate.cpp
@@ -18,11 +18,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "TEST_optionstate.h"
+#include "testoptionstate.h"
#include "optionstate.h"
-void TEST_optionstate::test_create()
+void TestOptionState::test_create()
{
Settings::OptionState options;
QCOMPARE(options.classState.showAtts, false);
@@ -35,7 +35,7 @@ void TEST_optionstate::test_create()
QCOMPARE(optionsA->uiState.useFillColor, false);
}
-void TEST_optionstate::test_saveAndLoad()
+void TestOptionState::test_saveAndLoad()
{
Settings::OptionState options;
options.classState.showAtts = true;
@@ -53,4 +53,4 @@ void TEST_optionstate::test_saveAndLoad()
QCOMPARE(optionsB.uiState.useFillColor, true);
}
-QTEST_MAIN(TEST_optionstate)
+QTEST_MAIN(TestOptionState)
diff --git a/unittests/TEST_optionstate.h b/unittests/testoptionstate.h
index e219112..77642d7 100644
--- a/unittests/TEST_optionstate.h
+++ b/unittests/testoptionstate.h
@@ -18,12 +18,12 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TEST_OPTIONSTATE_H
-#define TEST_OPTIONSTATE_H
+#ifndef TESTOPTIONSTATE_H
+#define TESTOPTIONSTATE_H
#include "testbase.h"
-class TEST_optionstate : public TestBase
+class TestOptionState : public TestBase
{
Q_OBJECT
@@ -32,4 +32,4 @@ private slots:
void test_saveAndLoad();
};
-#endif // TEST_OPTIONSTATE_H
+#endif // TESTOPTIONSTATE_H
diff --git a/unittests/TEST_pythonwriter.cpp b/unittests/testpythonwriter.cpp
index b6fcee1..4135cb9 100644
--- a/unittests/TEST_pythonwriter.cpp
+++ b/unittests/testpythonwriter.cpp
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "TEST_pythonwriter.h"
+#include "testpythonwriter.h"
// app includes
#include "classifier.h"
@@ -37,14 +37,14 @@ public:
}
};
-void TEST_pythonwriter::test_language()
+void TestPythonWriter::test_language()
{
PythonWriter* py = new PythonWriter();
Uml::ProgrammingLanguage::Enum lang = py->language();
QVERIFY(lang == Uml::ProgrammingLanguage::Python);
}
-void TEST_pythonwriter::test_writeClass()
+void TestPythonWriter::test_writeClass()
{
PythonWriterTest* py = new PythonWriterTest();
UMLClassifier* c = new UMLClassifier("Customer", "12345678");
@@ -59,7 +59,7 @@ void TEST_pythonwriter::test_writeClass()
QCOMPARE(file.exists(), true);
}
-void TEST_pythonwriter::test_reservedKeywords()
+void TestPythonWriter::test_reservedKeywords()
{
PythonWriter* py = new PythonWriter();
QStringList list = py->reservedKeywords();
@@ -69,4 +69,4 @@ void TEST_pythonwriter::test_reservedKeywords()
QCOMPARE(list.last(), QLatin1String("zip"));
}
-QTEST_MAIN(TEST_pythonwriter)
+QTEST_MAIN(TestPythonWriter)
diff --git a/unittests/TEST_pythonwriter.h b/unittests/testpythonwriter.h
index fbc2d4d..e00f483 100644
--- a/unittests/TEST_pythonwriter.h
+++ b/unittests/testpythonwriter.h
@@ -18,15 +18,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TEST_PYTHONWRITER_H
-#define TEST_PYTHONWRITER_H
+#ifndef TESTPYTHONWRITER_H
+#define TESTPYTHONWRITER_H
#include "testbase.h"
/**
* Unit test for class PythonWriter (pythonwriter.h).
*/
-class TEST_pythonwriter: public TestCodeGeneratorBase
+class TestPythonWriter: public TestCodeGeneratorBase
{
Q_OBJECT
private slots:
@@ -35,4 +35,4 @@ private slots:
void test_reservedKeywords();
};
-#endif // TEST_PYTHONWRITER_H
+#endif // TESTPYTHONWRITER_H
diff --git a/unittests/TEST_umlobject.cpp b/unittests/testumlobject.cpp
index 0401b26..3334f91 100644
--- a/unittests/TEST_umlobject.cpp
+++ b/unittests/testumlobject.cpp
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "TEST_umlobject.h"
+#include "testumlobject.h"
// app include
#include "attribute.h"
@@ -38,7 +38,7 @@ const bool IS_NOT_IMPL = false;
//-----------------------------------------------------------------------------
-void TEST_UMLObject::test_copyInto()
+void TestUMLObject::test_copyInto()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A");
@@ -56,7 +56,7 @@ void TEST_UMLObject::test_copyInto()
QCOMPARE(at2.umlParent(), at.umlParent());
}
-void TEST_UMLObject::test_clone()
+void TestUMLObject::test_clone()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A");
@@ -65,7 +65,7 @@ void TEST_UMLObject::test_clone()
QCOMPARE(a, b);
}
-void TEST_UMLObject::test_doc()
+void TestUMLObject::test_doc()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A");
@@ -75,7 +75,7 @@ void TEST_UMLObject::test_doc()
QCOMPARE(a.doc(), QLatin1String("new doc"));
}
-void TEST_UMLObject::test_equal()
+void TestUMLObject::test_equal()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A", Uml::ID::Reserved);
@@ -90,7 +90,7 @@ void TEST_UMLObject::test_equal()
QCOMPARE(c == d, false);
}
-void TEST_UMLObject::test_fullyQualifiedName()
+void TestUMLObject::test_fullyQualifiedName()
{
UMLObject* a = new UMLObject("Test A");
cleanupOnExit(a);
@@ -111,7 +111,7 @@ void TEST_UMLObject::test_fullyQualifiedName()
QCOMPARE(a->fullyQualifiedName(QLatin1String("::"), true), QLatin1String("Logical View::Test Parent::Test A"));
}
-void TEST_UMLObject::test_isAbstract()
+void TestUMLObject::test_isAbstract()
{
UMLObject a("Test A");
QCOMPARE(a.isAbstract(), false);
@@ -119,7 +119,7 @@ void TEST_UMLObject::test_isAbstract()
QCOMPARE(a.isAbstract(), true);
}
-void TEST_UMLObject::test_isStatic()
+void TestUMLObject::test_isStatic()
{
UMLObject a("Test A");
QCOMPARE(a.isStatic(), false);
@@ -127,10 +127,10 @@ void TEST_UMLObject::test_isStatic()
QCOMPARE(a.isStatic(), true);
}
-class TestUMLObject : public UMLObject
+class LocalUMLObject : public UMLObject
{
public:
- TestUMLObject(const QString& name = QString(), Uml::ID::Type id = Uml::ID::None)
+ LocalUMLObject(const QString& name = QString(), Uml::ID::Type id = Uml::ID::None)
: UMLObject(name, id)
{
}
@@ -141,7 +141,7 @@ public:
}
};
-void TEST_UMLObject::test_resolveRef()
+void TestUMLObject::test_resolveRef()
{
UMLPackage parent("Test Parent");
UMLStereotype *stereotype = UMLApp::app()->document()->createStereotype("test");
@@ -161,7 +161,7 @@ void TEST_UMLObject::test_resolveRef()
QCOMPARE(a.resolveRef(), true);
// unknown stereotype
- TestUMLObject b("Test B");
+ LocalUMLObject b("Test B");
UMLStereotype stereotype2("test");
b.setUMLPackage(&parent);
b.setSecondaryId(Uml::ID::toString(stereotype2.id()));
@@ -170,7 +170,7 @@ void TEST_UMLObject::test_resolveRef()
QCOMPARE(b.secondary()->name(), QLatin1String("undef"));
}
-void TEST_UMLObject::test_saveAndLoad()
+void TestUMLObject::test_saveAndLoad()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A");
@@ -184,7 +184,7 @@ void TEST_UMLObject::test_saveAndLoad()
QCOMPARE(a, b);
}
-void TEST_UMLObject::test_setBaseType()
+void TestUMLObject::test_setBaseType()
{
UMLObject a("Test A");
QCOMPARE(a.baseType(), UMLObject::ot_UMLObject);
@@ -192,7 +192,7 @@ void TEST_UMLObject::test_setBaseType()
QCOMPARE(a.baseType(), UMLObject::ot_Class);
}
-void TEST_UMLObject::test_setSterotype()
+void TestUMLObject::test_setSterotype()
{
UMLObject a("Test A");
QCOMPARE(a.stereotype(), QLatin1String(""));
@@ -200,7 +200,7 @@ void TEST_UMLObject::test_setSterotype()
QCOMPARE(a.stereotype(), QLatin1String("test"));
}
-void TEST_UMLObject::test_setUMLPackage()
+void TestUMLObject::test_setUMLPackage()
{
UMLPackage parent("Test Parent");
UMLObject a("Test A");
@@ -210,7 +210,7 @@ void TEST_UMLObject::test_setUMLPackage()
}
-void TEST_UMLObject::test_setVisibility()
+void TestUMLObject::test_setVisibility()
{
UMLObject a("Test A");
QVERIFY(a.visibility() == Uml::Visibility::Public);
@@ -224,10 +224,10 @@ void TEST_UMLObject::test_setVisibility()
QVERIFY(a.visibility() == Uml::Visibility::FromParent);
}
-void TEST_UMLObject::test_toString()
+void TestUMLObject::test_toString()
{
QCOMPARE(UMLObject::toString(UMLObject::ot_Class), QLatin1String("ot_Class"));
QCOMPARE(UMLObject::toI18nString(UMLObject::ot_Class), i18n("Class &name:"));
}
-QTEST_MAIN(TEST_UMLObject)
+QTEST_MAIN(TestUMLObject)
diff --git a/unittests/TEST_umlobject.h b/unittests/testumlobject.h
index 5d14d21..1ddfdfa 100644
--- a/unittests/TEST_umlobject.h
+++ b/unittests/testumlobject.h
@@ -18,12 +18,12 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TEST_UMLOBJECT_H
-#define TEST_UMLOBJECT_H
+#ifndef TESTUMLOBJECT_H
+#define TESTUMLOBJECT_H
#include "testbase.h"
-class TEST_UMLObject : public TestBase
+class TestUMLObject : public TestBase
{
Q_OBJECT
private slots:
@@ -43,4 +43,4 @@ private slots:
void test_toString();
};
-#endif // TEST_UMLOBJECT_H
+#endif // TESTUMLOBJECT_H
diff --git a/unittests/TEST_umlroledialog.cpp b/unittests/testumlroledialog.cpp
index 8203097..8203097 100644
--- a/unittests/TEST_umlroledialog.cpp
+++ b/unittests/testumlroledialog.cpp