diff --git a/src/Math/Test/Vector2Test.cpp b/src/Math/Test/Vector2Test.cpp index 297e0e67a..a5ec5b443 100644 --- a/src/Math/Test/Vector2Test.cpp +++ b/src/Math/Test/Vector2Test.cpp @@ -30,6 +30,7 @@ typedef Math::Vector2 Vector2; Vector2Test::Vector2Test() { addTests(&Vector2Test::construct, + &Vector2Test::access, &Vector2Test::axes, &Vector2Test::scales, &Vector2Test::debug, @@ -40,6 +41,16 @@ void Vector2Test::construct() { CORRADE_COMPARE(Vector2(1, 2), (Vector<2, float>(1.0f, 2.0f))); } +void Vector2Test::access() { + Vector2 vec(1.0f, -2.0f); + const Vector2 cvec(1.0f, -2.0f); + + CORRADE_COMPARE(vec.x(), 1.0f); + CORRADE_COMPARE(vec.y(), -2.0f); + CORRADE_COMPARE(cvec.x(), 1.0f); + CORRADE_COMPARE(cvec.y(), -2.0f); +} + void Vector2Test::axes() { CORRADE_COMPARE(Vector2::xAxis(5.0f), Vector2(5.0f, 0.0f)); CORRADE_COMPARE(Vector2::yAxis(6.0f), Vector2(0.0f, 6.0f)); diff --git a/src/Math/Test/Vector2Test.h b/src/Math/Test/Vector2Test.h index 48bcc1b9f..1e35c4704 100644 --- a/src/Math/Test/Vector2Test.h +++ b/src/Math/Test/Vector2Test.h @@ -24,6 +24,7 @@ class Vector2Test: public Corrade::TestSuite::Tester { Vector2Test(); void construct(); + void access(); void axes(); void scales(); diff --git a/src/Math/Test/Vector3Test.cpp b/src/Math/Test/Vector3Test.cpp index 7ef022ff7..ea2f3409a 100644 --- a/src/Math/Test/Vector3Test.cpp +++ b/src/Math/Test/Vector3Test.cpp @@ -31,6 +31,7 @@ typedef Math::Vector2 Vector2; Vector3Test::Vector3Test() { addTests(&Vector3Test::construct, + &Vector3Test::access, &Vector3Test::cross, &Vector3Test::axes, &Vector3Test::scales, @@ -45,6 +46,18 @@ void Vector3Test::construct() { CORRADE_COMPARE(Vector3(Vector<2, float>(1.0f, 2.0f), 3), (Vector<3, float>(1.0f, 2.0f, 3.0f))); } +void Vector3Test::access() { + Vector3 vec(1.0f, -2.0f, 5.0f); + const Vector3 cvec(1.0f, -2.0f, 5.0f); + + CORRADE_COMPARE(vec.x(), 1.0f); + CORRADE_COMPARE(vec.y(), -2.0f); + CORRADE_COMPARE(vec.z(), 5.0f); + CORRADE_COMPARE(cvec.x(), 1.0f); + CORRADE_COMPARE(cvec.y(), -2.0f); + CORRADE_COMPARE(cvec.z(), 5.0f); +} + void Vector3Test::cross() { Vector3 a(1, -1, 1); Vector3 b(4, 3, 7); diff --git a/src/Math/Test/Vector3Test.h b/src/Math/Test/Vector3Test.h index 1542c6a06..706b3c68a 100644 --- a/src/Math/Test/Vector3Test.h +++ b/src/Math/Test/Vector3Test.h @@ -24,6 +24,7 @@ class Vector3Test: public Corrade::TestSuite::Tester { Vector3Test(); void construct(); + void access(); void cross(); void axes(); void scales(); diff --git a/src/Math/Test/Vector4Test.cpp b/src/Math/Test/Vector4Test.cpp index 33d52deb0..04f93d1e5 100644 --- a/src/Math/Test/Vector4Test.cpp +++ b/src/Math/Test/Vector4Test.cpp @@ -32,6 +32,7 @@ typedef Math::Vector2 Vector2; Vector4Test::Vector4Test() { addTests(&Vector4Test::construct, + &Vector4Test::access, &Vector4Test::threeComponent, &Vector4Test::twoComponent, &Vector4Test::debug, @@ -44,6 +45,20 @@ void Vector4Test::construct() { CORRADE_COMPARE(Vector4(Vector<3, float>(1.0f, 2.0f, 3.0f), 4), (Vector<4, float>(1.0f, 2.0f, 3.0f, 4.0f))); } +void Vector4Test::access() { + Vector4 vec(1.0f, -2.0f, 5.0f, 0.5f); + const Vector4 cvec(1.0f, -2.0f, 5.0f, 0.5f); + + CORRADE_COMPARE(vec.x(), 1.0f); + CORRADE_COMPARE(vec.y(), -2.0f); + CORRADE_COMPARE(vec.z(), 5.0f); + CORRADE_COMPARE(vec.w(), 0.5f); + CORRADE_COMPARE(cvec.x(), 1.0f); + CORRADE_COMPARE(cvec.y(), -2.0f); + CORRADE_COMPARE(cvec.z(), 5.0f); + CORRADE_COMPARE(cvec.w(), 0.5f); +} + void Vector4Test::threeComponent() { CORRADE_COMPARE(Vector4(1.0f, 2.0f, 3.0f, 4.0f).xyz(), Vector3(1.0f, 2.0f, 3.0f)); } diff --git a/src/Math/Test/Vector4Test.h b/src/Math/Test/Vector4Test.h index e06ce248a..7e8cc5ae2 100644 --- a/src/Math/Test/Vector4Test.h +++ b/src/Math/Test/Vector4Test.h @@ -23,6 +23,7 @@ class Vector4Test: public Corrade::TestSuite::Tester { public: Vector4Test(); + void access(); void construct(); void threeComponent(); void twoComponent(); diff --git a/src/Test/ColorTest.cpp b/src/Test/ColorTest.cpp index 176270f2b..903da1e3d 100644 --- a/src/Test/ColorTest.cpp +++ b/src/Test/ColorTest.cpp @@ -33,7 +33,9 @@ typedef Magnum::Color3 Color3f; typedef Magnum::Color4 Color4f; ColorTest::ColorTest() { - addTests(&ColorTest::fromDenormalized, + addTests(&ColorTest::access, + + &ColorTest::fromDenormalized, &ColorTest::fromNormalized, &ColorTest::fromHue, @@ -52,6 +54,30 @@ ColorTest::ColorTest() { &ColorTest::configuration); } +void ColorTest::access() { + Color3f c3(15, 255, 10); + const Color3f cc3(15, 255, 10); + + CORRADE_COMPARE(c3.r(), 15); + CORRADE_COMPARE(c3.g(), 255); + CORRADE_COMPARE(c3.b(), 10); + CORRADE_COMPARE(cc3.r(), 15); + CORRADE_COMPARE(cc3.g(), 255); + CORRADE_COMPARE(cc3.b(), 10); + + Color4 c4(125, 98, 51, 22); + const Color4f cc4(125, 98, 51, 22); + + CORRADE_COMPARE(c4.r(), 125); + CORRADE_COMPARE(c4.g(), 98); + CORRADE_COMPARE(c4.b(), 51); + CORRADE_COMPARE(c4.a(), 22); + CORRADE_COMPARE(cc4.r(), 125); + CORRADE_COMPARE(cc4.g(), 98); + CORRADE_COMPARE(cc4.b(), 51); + CORRADE_COMPARE(cc4.a(), 22); +} + void ColorTest::fromDenormalized() { CORRADE_COMPARE(Color3f::fromDenormalized(Color3(75, 115, 224)), Color3f(0.294118, 0.45098, 0.878431)); } diff --git a/src/Test/ColorTest.h b/src/Test/ColorTest.h index 47b18101d..172211f29 100644 --- a/src/Test/ColorTest.h +++ b/src/Test/ColorTest.h @@ -23,6 +23,8 @@ class ColorTest: public Corrade::TestSuite::Tester { public: ColorTest(); + void access(); + void fromDenormalized(); void fromNormalized();