<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Tests][1170] trunk/tests/pomo: Use DIR_TESTDATA in pomo tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/1170/tests">1170</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2012-12-19 00:56:28 +0000 (Wed, 19 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use DIR_TESTDATA in pomo tests. props mbijon. see <a href="http://core.trac.wordpress.org/ticket/22989">#22989</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestspomotest_mophp">trunk/tests/pomo/test_mo.php</a></li>
<li><a href="#trunktestspomotest_pophp">trunk/tests/pomo/test_po.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestspomotest_mophp"></a>
<div class="modfile"><h4>Modified: trunk/tests/pomo/test_mo.php (1169 => 1170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/pomo/test_mo.php        2012-12-14 20:47:42 UTC (rev 1169)
+++ trunk/tests/pomo/test_mo.php        2012-12-19 00:56:28 UTC (rev 1170)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">         function test_mo_simple() {
</span><span class="cx">                 $mo = new MO();
</span><del>-                $mo->import_from_file('data/pomo/simple.mo');
</del><ins>+                $mo->import_from_file(DIR_TESTDATA . '/pomo/simple.mo');
</ins><span class="cx">                 $this->assertEquals(array('Project-Id-Version' => 'WordPress 2.6-bleeding', 'Report-Msgid-Bugs-To' => 'wp-polyglots@lists.automattic.com'), $mo->headers);
</span><span class="cx">                 $this->assertEquals(2, count($mo->entries));
</span><span class="cx">                 $this->assertEquals(array('dyado'), $mo->entries['baba']->translations);
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx">         function test_mo_plural() {
</span><span class="cx">                 $mo = new MO();
</span><del>-                $mo->import_from_file('data/pomo/plural.mo');
</del><ins>+                $mo->import_from_file(DIR_TESTDATA . '/pomo/plural.mo');
</ins><span class="cx">                 $this->assertEquals(1, count($mo->entries));
</span><span class="cx">                 $this->assertEquals(array("oney dragoney", "twoey dragoney", "manyey dragoney", "manyeyey dragoney", "manyeyeyey dragoney"), $mo->entries["one dragon"]->translations);
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx">         function test_mo_context() {
</span><span class="cx">                 $mo = new MO();
</span><del>-                $mo->import_from_file('data/pomo/context.mo');
</del><ins>+                $mo->import_from_file(DIR_TESTDATA . '/pomo/context.mo');
</ins><span class="cx">                 $this->assertEquals(2, count($mo->entries));
</span><span class="cx">                 $plural_entry = new Translation_Entry(array('singular' => 'one dragon', 'plural' => '%d dragons', 'translations' => array("oney dragoney", "twoey dragoney","manyey dragoney"), 'context' => 'dragonland'));
</span><span class="cx">                 $this->assertEquals($plural_entry, $mo->entries[$plural_entry->key()]);
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx">         function test_nplurals_with_backslashn() {
</span><span class="cx">                 $mo = new MO();
</span><del>-                $mo->import_from_file('data/pomo/bad_nplurals.mo');
</del><ins>+                $mo->import_from_file(DIR_TESTDATA . '/pomo/bad_nplurals.mo');
</ins><span class="cx">                 $this->assertEquals('%d foro', $mo->translate_plural('%d forum', '%d forums', 1));
</span><span class="cx">                 $this->assertEquals('%d foros', $mo->translate_plural('%d forum', '%d forums', 2));
</span><span class="cx">                 $this->assertEquals('%d foros', $mo->translate_plural('%d forum', '%d forums', -1));
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">         function disabled_test_performance() {
</span><span class="cx">                 $start = microtime(true);
</span><span class="cx">                 $mo = new MO();
</span><del>-                $mo->import_from_file('data/pomo/de_DE-2.8.mo');
</del><ins>+                $mo->import_from_file(DIR_TESTDATA . '/pomo/de_DE-2.8.mo');
</ins><span class="cx">                 // echo "\nPerformance: ".(microtime(true) - $start)."\n";
</span><span class="cx">         }
</span><span class="cx">
</span><span class="lines">@@ -131,13 +131,13 @@
</span><span class="cx">                 // that's why we are skipping it the stupid way
</span><span class="cx">                 if ((ini_get("mbstring.func_overload") & 2) != 0) {
</span><span class="cx">                         $mo = new MO();
</span><del>-                        $mo->import_from_file('data/pomo/overload.mo');
</del><ins>+                        $mo->import_from_file(DIR_TESTDATA . '/pomo/overload.mo');
</ins><span class="cx">                         $this->assertEquals(array('Табло'), $mo->entries['Dashboard']->translations);
</span><span class="cx">                 }
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function test_load_pot_file() {
</span><span class="cx">                 $mo = new MO();
</span><del>-                $this->assertEquals( false, $mo->import_from_file('data/pomo/mo.pot') );
</del><ins>+                $this->assertEquals( false, $mo->import_from_file(DIR_TESTDATA . '/pomo/mo.pot') );
</ins><span class="cx">         }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestspomotest_pophp"></a>
<div class="modfile"><h4>Modified: trunk/tests/pomo/test_po.php (1169 => 1170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/pomo/test_po.php        2012-12-14 20:47:42 UTC (rev 1169)
+++ trunk/tests/pomo/test_po.php        2012-12-19 00:56:28 UTC (rev 1170)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx">         function test_import_from_file() {
</span><span class="cx">                 $po = new PO();
</span><del>-                $res = $po->import_from_file('data/pomo/simple.po');
</del><ins>+                $res = $po->import_from_file(DIR_TESTDATA . '/pomo/simple.po');
</ins><span class="cx">                 $this->assertEquals(true, $res);
</span><span class="cx">
</span><span class="cx">                 $this->assertEquals(array('Project-Id-Version' => 'WordPress 2.6-bleeding', 'Plural-Forms' => 'nplurals=2; plural=n != 1;'), $po->headers);
</span><span class="lines">@@ -204,12 +204,12 @@
</span><span class="cx">
</span><span class="cx">         function test_import_from_entry_file_should_give_false() {
</span><span class="cx">                 $po = new PO();
</span><del>-                $this->assertFalse( $po->import_from_file( 'data/pomo/empty.po' ) );
</del><ins>+                $this->assertFalse( $po->import_from_file( DIR_TESTDATA . '/pomo/empty.po' ) );
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         function test_import_from_file_with_windows_line_endings_should_work_as_with_unix_line_endings() {
</span><span class="cx">                 $po = new PO();
</span><del>-                $this->assertTrue( $po->import_from_file( 'data/pomo/windows-line-endings.po' ) );
</del><ins>+                $this->assertTrue( $po->import_from_file( DIR_TESTDATA . '/pomo/windows-line-endings.po' ) );
</ins><span class="cx">                 $this->assertEquals( 1, count( $po->entries ) );
</span><span class="cx">         }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>