diff --git a/FractionTask.pro b/FractionTask.pro index ca37b88..f970894 100644 --- a/FractionTask.pro +++ b/FractionTask.pro @@ -6,8 +6,9 @@ CONFIG -= app_bundle TEMPLATE = app -SOURCES += tst_testcasename.cpp \ - fraction.cpp +SOURCES += \ + fraction.cpp \ + tst_fractiontest.cpp HEADERS += \ fraction.hpp diff --git a/FractionTask.pro.user b/FractionTask.pro.user index a02da4d..782784a 100644 --- a/FractionTask.pro.user +++ b/FractionTask.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -54,7 +54,24 @@ ProjectExplorer.Project.PluginSettings - + + + -fno-delayed-template-parsing + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 2 + + C:/Users/$5NP000-N4QVBFC8R26B/Documents/FractionTask/FractionTask.pro + + + + true + + ProjectExplorer.Project.Target.0 @@ -293,19 +310,19 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/$5NP000-N4QVBFC8R26B/Documents/FractionTask/FractionTask.pro + C:/Users/$5NP000-N4QVBFC8R26B/Documents/FractionTask/FractionTask.pro false false true + true false false true - + C:/Users/$5NP000-N4QVBFC8R26B/Documents/build-FractionTask-Desktop_Qt_5_15_0_MinGW_64_bit-Debug 1 diff --git a/fraction.cpp b/fraction.cpp index 5d912fc..09f22c8 100644 --- a/fraction.cpp +++ b/fraction.cpp @@ -1,6 +1,5 @@ -#include "fraction.h" +#include "fraction.hpp" Fraction::Fraction() { - } diff --git a/fraction.hpp b/fraction.hpp index 903227b..c7e4691 100644 --- a/fraction.hpp +++ b/fraction.hpp @@ -1,11 +1,7 @@ -#ifndef FRACTION_H -#define FRACTION_H - +#pragma once class Fraction { public: - Fraction(); + Fraction(int, int); }; - -#endif // FRACTION_H diff --git a/tst_fractiontest.cpp b/tst_fractiontest.cpp new file mode 100644 index 0000000..5c3e5fe --- /dev/null +++ b/tst_fractiontest.cpp @@ -0,0 +1,66 @@ +#include + +#include "fraction.hpp" + +class FractionTest : public QObject +{ + Q_OBJECT + +public: + FractionTest(); + ~FractionTest(); + +private slots: + void test_constructor(); + void test_equivalence(); +}; + +FractionTest::FractionTest() +{ + +} + +FractionTest::~FractionTest() +{ + +} + +void FractionTest::test_constructor() +{ + Fraction f1 = Fraction(1, 2); + QVERIFY(f1 == 0.5f); + QVERIFY(f1 == 0.5); + QVERIFY(f1.numerator() == 1); + QVERIFY(f1.denominator() == 2); + + Fraction f2 = Fraction(2,4); + QVERIFY(f1 == f2); + QVERIFY(f2 == 0.5f); + QVERIFY(f2 == 0.5); + QVERIFY(f2.numerator() == 1); + QVERIFY(f2.denominator() == 2); +} + +void FractionTest::test_equivalence() +{ + Fraction f1 = Fraction(1, 1); + Fraction f2 = Fraction(1, 1); + QVERIFY(f1 == f2); + + QVERIFY(f1 == 1); + QVERIFY(f1 == 1.0); + QVERIFY(f1 == 1.0f); + + QVERIFY(f2 == 1); + QVERIFY(f2 == 1.0); + QVERIFY(f2 == 1.0f); + + Fraction f3 = Fraction(2, 3); + QVERIFY(f3 != 1); + QVERIFY(f3 != 1.0); + QVERIFY(f3 != 1.0f); +} + +QTEST_APPLESS_MAIN(FractionTest) + +#include "tst_fractiontest.moc" diff --git a/tst_testcasename.cpp b/tst_testcasename.cpp deleted file mode 100644 index b026e3d..0000000 --- a/tst_testcasename.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include - -// add necessary includes here - -class TestCaseName : public QObject -{ - Q_OBJECT - -public: - TestCaseName(); - ~TestCaseName(); - -private slots: - void test_case1(); - -}; - -TestCaseName::TestCaseName() -{ - -} - -TestCaseName::~TestCaseName() -{ - -} - -void TestCaseName::test_case1() -{ - -} - -QTEST_APPLESS_MAIN(TestCaseName) - -#include "tst_testcasename.moc"