summaryrefslogtreecommitdiff
path: root/test/array_funTest.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-04-25 17:04:32 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2009-04-25 17:04:32 +0000
commit1ea7fca02b99437b14d01d76597f3fc730f8282e (patch)
tree410ed39bf4b9d762f79dbfd0085f2ee8666f7469 /test/array_funTest.cc
parent8a1d530336f2af18192cca84638094a7262ef5f2 (diff)
2009-04-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Rewritten expr * src/array_fun.h * test/array_funTest.cc
Diffstat (limited to 'test/array_funTest.cc')
-rw-r--r--test/array_funTest.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/array_funTest.cc b/test/array_funTest.cc
index e00f1c8d..3854f325 100644
--- a/test/array_funTest.cc
+++ b/test/array_funTest.cc
@@ -36,28 +36,28 @@ CPPUNIT_TEST_SUITE_REGISTRATION(array_funTest);
void array_funTest::testArray_negate()
{
unsigned char a[] = { 0xaa, 0x55 };
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~arrayRef(a))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~array(a))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~array((unsigned char*)a))[1]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~~arrayRef(a))[0]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~~arrayRef(a))[1]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~~array(a))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~~array(a))[1]);
}
void array_funTest::testArray_and()
{
unsigned char a1[] = { 0xaa, 0x55 };
unsigned char a2[] = { 0x1a, 0x25 };
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x0a, (arrayRef(a1)&arrayRef(a2))[0]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x05, (arrayRef(a1)&arrayRef(a2))[1]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x0a, (array(a1)&array(a2))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x05, (array(a1)&array(a2))[1]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (arrayRef(a1)&~arrayRef(a2))[0]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (arrayRef(a1)&~arrayRef(a2))[1]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (array(a1)&~array(a2))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (array(a1)&~array(a2))[1]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (~arrayRef(a2)&arrayRef(a1))[0]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (~arrayRef(a2)&arrayRef(a1))[1]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (~array(a2)&array(a1))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (~array(a2)&array(a1))[1]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x45, (~arrayRef(a1)&~arrayRef(a2))[0]);
- CPPUNIT_ASSERT_EQUAL((unsigned char)0x8a, (~arrayRef(a1)&~arrayRef(a2))[1]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x45, (~array(a1)&~array(a2))[0]);
+ CPPUNIT_ASSERT_EQUAL((unsigned char)0x8a, (~array(a1)&~array(a2))[1]);
}
void array_funTest::testArrayLength()