Changeset 931
 Timestamp:
 Sep 8, 2011, 11:02:19 PM (12 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/test/matrix.cpp
r914 r931 43 43 vec2 c2(1.0f, 0.0f); 44 44 45 LOLUNIT_ASSERT (a2 ==a2);46 LOLUNIT_ASSERT (!(a2 != a2));47 48 LOLUNIT_ASSERT (a2 !=b2);49 LOLUNIT_ASSERT (!(a2 == b2));50 LOLUNIT_ASSERT (a2 !=c2);51 LOLUNIT_ASSERT (!(a2 == c2));45 LOLUNIT_ASSERT_EQUAL(a2, a2); 46 LOLUNIT_ASSERT_NOT_DIFFERENT(a2, a2); 47 48 LOLUNIT_ASSERT_DIFFERENT(a2, b2); 49 LOLUNIT_ASSERT_NOT_EQUAL(a2, b2); 50 LOLUNIT_ASSERT_DIFFERENT(a2, c2); 51 LOLUNIT_ASSERT_NOT_EQUAL(a2, c2); 52 52 53 53 vec3 a3(1.0f, 2.0f, 3.0f); … … 56 56 vec3 d3(1.0f, 2.0f, 0.0f); 57 57 58 LOLUNIT_ASSERT (a3 ==a3);59 LOLUNIT_ASSERT (!(a3 != a3));60 61 LOLUNIT_ASSERT (a3 !=b3);62 LOLUNIT_ASSERT (!(a3 == b3));63 LOLUNIT_ASSERT (a3 !=c3);64 LOLUNIT_ASSERT (!(a3 == c3));65 LOLUNIT_ASSERT (a3 !=d3);66 LOLUNIT_ASSERT (!(a3 == d3));58 LOLUNIT_ASSERT_EQUAL(a3, a3); 59 LOLUNIT_ASSERT_NOT_DIFFERENT(a3, a3); 60 61 LOLUNIT_ASSERT_DIFFERENT(a3, b3); 62 LOLUNIT_ASSERT_NOT_EQUAL(a3, b3); 63 LOLUNIT_ASSERT_DIFFERENT(a3, c3); 64 LOLUNIT_ASSERT_NOT_EQUAL(a3, c3); 65 LOLUNIT_ASSERT_DIFFERENT(a3, d3); 66 LOLUNIT_ASSERT_NOT_EQUAL(a3, d3); 67 67 68 68 vec4 a4(1.0f, 2.0f, 3.0f, 4.0f); … … 72 72 vec4 e4(1.0f, 2.0f, 3.0f, 0.0f); 73 73 74 LOLUNIT_ASSERT (a4 ==a4);75 LOLUNIT_ASSERT (!(a4 != a4));76 77 LOLUNIT_ASSERT (a4 !=b4);78 LOLUNIT_ASSERT (!(a4 == b4));79 LOLUNIT_ASSERT (a4 !=c4);80 LOLUNIT_ASSERT (!(a4 == c4));81 LOLUNIT_ASSERT (a4 !=d4);82 LOLUNIT_ASSERT (!(a4 == d4));83 LOLUNIT_ASSERT (a4 !=e4);84 LOLUNIT_ASSERT (!(a4 == e4));74 LOLUNIT_ASSERT_EQUAL(a4, a4); 75 LOLUNIT_ASSERT_NOT_DIFFERENT(a4, a4); 76 77 LOLUNIT_ASSERT_DIFFERENT(a4, b4); 78 LOLUNIT_ASSERT_NOT_EQUAL(a4, b4); 79 LOLUNIT_ASSERT_DIFFERENT(a4, c4); 80 LOLUNIT_ASSERT_NOT_EQUAL(a4, c4); 81 LOLUNIT_ASSERT_DIFFERENT(a4, d4); 82 LOLUNIT_ASSERT_NOT_EQUAL(a4, d4); 83 LOLUNIT_ASSERT_DIFFERENT(a4, e4); 84 LOLUNIT_ASSERT_NOT_EQUAL(a4, e4); 85 85 } 86 86 … … 94 94 vec2 f2(4.0f, 4.0f); 95 95 96 LOLUNIT_ASSERT (a2 <=a2);97 LOLUNIT_ASSERT (!(a2 < a2));98 99 LOLUNIT_ASSERT (!(a2 <= b2));100 LOLUNIT_ASSERT (!(a2 < b2));101 LOLUNIT_ASSERT (!(a2 <= c2));102 LOLUNIT_ASSERT (!(a2 < c2));103 LOLUNIT_ASSERT (!(a2 <= d2));104 LOLUNIT_ASSERT (!(a2 < d2));105 LOLUNIT_ASSERT (a2 <=e2);106 LOLUNIT_ASSERT (!(a2 < e2));107 LOLUNIT_ASSERT (a2 <=f2);108 LOLUNIT_ASSERT (a2 <f2);96 LOLUNIT_ASSERT_LEQUAL(a2, a2); 97 LOLUNIT_ASSERT_NOT_LESS(a2, a2); 98 99 LOLUNIT_ASSERT_NOT_LEQUAL(a2, b2); 100 LOLUNIT_ASSERT_NOT_LESS(a2, b2); 101 LOLUNIT_ASSERT_NOT_LEQUAL(a2, c2); 102 LOLUNIT_ASSERT_NOT_LESS(a2, c2); 103 LOLUNIT_ASSERT_NOT_LEQUAL(a2, d2); 104 LOLUNIT_ASSERT_NOT_LESS(a2, d2); 105 LOLUNIT_ASSERT_LEQUAL(a2, e2); 106 LOLUNIT_ASSERT_NOT_LESS(a2, e2); 107 LOLUNIT_ASSERT_LEQUAL(a2, f2); 108 LOLUNIT_ASSERT_LESS(a2, f2); 109 109 } 110 110 … … 114 114 vec2 b(1.0f, 3.0f); 115 115 116 LOLUNIT_ASSERT (a ==b);117 LOLUNIT_ASSERT (a ==b);116 LOLUNIT_ASSERT_EQUAL(a, b); 117 LOLUNIT_ASSERT_EQUAL(a, b); 118 118 } 119 119 … … 127 127 LOLUNIT_ASSERT_EQUAL(b.y, a1.y); 128 128 LOLUNIT_ASSERT_EQUAL(b.z, 0.0f); 129 LOLUNIT_ASSERT (a2 ==a1);129 LOLUNIT_ASSERT_EQUAL(a2, a1); 130 130 131 131 vec4 c(a1); … … 135 135 LOLUNIT_ASSERT_EQUAL(c.z, 0.0f); 136 136 LOLUNIT_ASSERT_EQUAL(c.w, 0.0f); 137 LOLUNIT_ASSERT (a3 ==a1);137 LOLUNIT_ASSERT_EQUAL(a3, a1); 138 138 } 139 139
Note: See TracChangeset
for help on using the changeset viewer.