Changeset 6995

Timestamp:

May 6, 2008, 3:42:40 PM (14 years ago)

Author:

ebihara

Message:

ImageMagickに対応するようテストを書き換え

File:

• OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/test/img_test.php (modified) (4 diffs)

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/test/img_test.php

@@ -50 +50 @@
 {
     global $img;
+    global $use_IM;
 
     exec('rm -f ' . OPENPNE_VAR_DIR . '/img_cache/*/*/*.*');
@@ -58 +59 @@
     $img->set_requests($var);
     $img->generate_img();
+    while (@ob_end_clean());
 
     $cache_fullpath = OPENPNE_VAR_DIR . '/img_cache/' . $cache_path;
@@ -69 +71 @@
     }
 
-    return md5($content);
+    if ($use_IM) {
+        return strlen($content);
+    } else {
+        return md5($content);
+    }
 }
 
@@ -109 +115 @@
     array(240, 320), array(600, 600),
 );
-$result = array(
-    'c5de8b831ec0a1dc642fccb642437b77', '0abdfe335c52afb13091ca500794bc29', '8cd315e468efbc7fe9c2772c3318cfbe',
-    '0abdfe335c52afb13091ca500794bc29', 'f00458cb1f422c4f5fa8077fb42be3c3', 'cb120bd7308cea5e047e48f69c96b5cb',
-    'aef2ea7c9f85cf0092c4fee3405e0551', 'cb120bd7308cea5e047e48f69c96b5cb', 'd6b3c89d3ae59868d117f29b8a852a8e',
-    'dabb969b1fe2fccc3c9c2f06f3ce8ed9', 'fe7a6b1676d918cca8332710359c20fd', 'dabb969b1fe2fccc3c9c2f06f3ce8ed9',
-    '2cd5ef383c8f86534a766c3eb9e313df', 'a43e1895bc24566a133bc247e1a42fd4', 'e75c9d9c852e34a70aecc912087bf78f',
-    'a43e1895bc24566a133bc247e1a42fd4', 'f0f8785b5bd15ff896eef24f790fc8a7', 'bccef60fab661c4ac9ef63777e66eb92',
-    'e319c35f1c189a4d7d73aefcfe676965', 'bccef60fab661c4ac9ef63777e66eb92', 'd4f79f015c9ea53b0a92cbd67c28f0bf', 
-    '5ed2494e1e302983acd143ba64fb5ed4', '3ee512881f42706042e97fbe52d075d8', '7cade5d9d1d868afac29d38b6370e707', 
-    '42ea793922db78acc2e3efa16e73afc5', '3ee512881f42706042e97fbe52d075d8', '291aabe8d676a48d9f0cb7e515077875', 
-    '745b69f713223a63e8c44819632e0169', 'd989820ef0302a202fdcacd6f1de5e5f', '291aabe8d676a48d9f0cb7e515077875', 
-    '4b4c67ecbb0c1393c26d22a0c97751d4', 'b1a4c77a05cf88070e21a49af4ed2b27', '38ca972eb7ab33f9420c5444b20d052e', 
-    '4b4c67ecbb0c1393c26d22a0c97751d4', '9323d1a47e21ee31cc02af1eba4c17c2', '9498923d686e0ea66277b7204dc34ee9', 
-    '1fc523ad0a6d18382c2ca4600bc9ca72', '9323d1a47e21ee31cc02af1eba4c17c2', 'e436eb304499e5e15f3f9ee2e9093f8a', 
-    '4c269b61882ff3674081a9a514db9657', '9faf4b16332ccf83cfd14795474c8c52', 'e436eb304499e5e15f3f9ee2e9093f8a', 
-    '38b82de91c622128f4d24efcf0df997b', '6502a234ceb0d35afe02d285a382c647', '6502a234ceb0d35afe02d285a382c647', 
-    '57b462d05ddb18068c18d97bd91596b2', '40cb96c2f847fc5b8707579cb0570c5b', 'd6bfd3d757c72d23cfa4b6ee412dbda8', 
-    'd6bfd3d757c72d23cfa4b6ee412dbda8', '63adcdeb146793ca7d9aca8f722aff9e', '0d219d207a220486236fbfe5a9424935', 
-    '66364645ce88ab7d121c67a2676c52c7', '66364645ce88ab7d121c67a2676c52c7', '11912f1da2ad05bac279d575187b7d35', 
-    '270515856d84f802885d4917710ea40d', '11190f8824172256a3c71920049bc382', '11190f8824172256a3c71920049bc382', 
-    '5e6a79c698c26c30e0ad37c7e5141e6a', '9470ea645b8d8163a864dc3ec095ff83', 'c897c461d88f2e62613634206119c209', 
-    'c897c461d88f2e62613634206119c209', 'd9853434b29709152ea57f04e3bc00fb', 'a2e5bf47674a57dfeb234278a71bef53',
-);
+
+if ($use_IM) {
+    $result = array(
+        14344, 16309, 5441, 16309, 6025, 30763, 7700, 30763, 7864, 53278, 11415, 53278, 10673, 104853, 23083,
+        104853, 17899, 227833, 52787, 227833, 34884, 164162, 8043, 4826, 23739, 8043, 13345, 6625, 57580, 13345,
+        22868, 10008, 126508, 22868, 57509, 20870, 385363, 57509, 173785, 55172, 1241421, 173785, 72205, 14161,
+        14161, 24001, 5598, 16214, 16214, 58548, 11878, 19839, 19839, 129557, 23972, 24449, 24449, 227642, 40095,
+        67115, 67115, 1336428, 221422, 
+    );
+} else {
+    $result = array(
+        'c5de8b831ec0a1dc642fccb642437b77', '0abdfe335c52afb13091ca500794bc29', '8cd315e468efbc7fe9c2772c3318cfbe',
+        '0abdfe335c52afb13091ca500794bc29', 'f00458cb1f422c4f5fa8077fb42be3c3', 'cb120bd7308cea5e047e48f69c96b5cb',
+        'aef2ea7c9f85cf0092c4fee3405e0551', 'cb120bd7308cea5e047e48f69c96b5cb', 'd6b3c89d3ae59868d117f29b8a852a8e',
+        'dabb969b1fe2fccc3c9c2f06f3ce8ed9', 'fe7a6b1676d918cca8332710359c20fd', 'dabb969b1fe2fccc3c9c2f06f3ce8ed9',
+        '2cd5ef383c8f86534a766c3eb9e313df', 'a43e1895bc24566a133bc247e1a42fd4', 'e75c9d9c852e34a70aecc912087bf78f',
+        'a43e1895bc24566a133bc247e1a42fd4', 'f0f8785b5bd15ff896eef24f790fc8a7', 'bccef60fab661c4ac9ef63777e66eb92',
+        'e319c35f1c189a4d7d73aefcfe676965', 'bccef60fab661c4ac9ef63777e66eb92', 'd4f79f015c9ea53b0a92cbd67c28f0bf', 
+        '5ed2494e1e302983acd143ba64fb5ed4', '3ee512881f42706042e97fbe52d075d8', '7cade5d9d1d868afac29d38b6370e707', 
+        '42ea793922db78acc2e3efa16e73afc5', '3ee512881f42706042e97fbe52d075d8', '291aabe8d676a48d9f0cb7e515077875', 
+        '745b69f713223a63e8c44819632e0169', 'd989820ef0302a202fdcacd6f1de5e5f', '291aabe8d676a48d9f0cb7e515077875', 
+        '4b4c67ecbb0c1393c26d22a0c97751d4', 'b1a4c77a05cf88070e21a49af4ed2b27', '38ca972eb7ab33f9420c5444b20d052e', 
+        '4b4c67ecbb0c1393c26d22a0c97751d4', '9323d1a47e21ee31cc02af1eba4c17c2', '9498923d686e0ea66277b7204dc34ee9', 
+        '1fc523ad0a6d18382c2ca4600bc9ca72', '9323d1a47e21ee31cc02af1eba4c17c2', 'e436eb304499e5e15f3f9ee2e9093f8a', 
+        '4c269b61882ff3674081a9a514db9657', '9faf4b16332ccf83cfd14795474c8c52', 'e436eb304499e5e15f3f9ee2e9093f8a', 
+        '38b82de91c622128f4d24efcf0df997b', '6502a234ceb0d35afe02d285a382c647', '6502a234ceb0d35afe02d285a382c647', 
+        '57b462d05ddb18068c18d97bd91596b2', '40cb96c2f847fc5b8707579cb0570c5b', 'd6bfd3d757c72d23cfa4b6ee412dbda8', 
+        'd6bfd3d757c72d23cfa4b6ee412dbda8', '63adcdeb146793ca7d9aca8f722aff9e', '0d219d207a220486236fbfe5a9424935', 
+        '66364645ce88ab7d121c67a2676c52c7', '66364645ce88ab7d121c67a2676c52c7', '11912f1da2ad05bac279d575187b7d35', 
+        '270515856d84f802885d4917710ea40d', '11190f8824172256a3c71920049bc382', '11190f8824172256a3c71920049bc382', 
+        '5e6a79c698c26c30e0ad37c7e5141e6a', '9470ea645b8d8163a864dc3ec095ff83', 'c897c461d88f2e62613634206119c209', 
+        'c897c461d88f2e62613634206119c209', 'd9853434b29709152ea57f04e3bc00fb', 'a2e5bf47674a57dfeb234278a71bef53',
+    );
+}
 
 $i = 0;