<!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>[GlotPress][927] trunk/t/tests/tests_things/test_thing_translation.php: Fix test and remove dead code in GP_Test_Thing_Translation.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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="https://glotpress.trac.wordpress.org/changeset/927">927</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-05-19 15:53:11 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix test and remove dead code in GP_Test_Thing_Translation. See <a href="http://glotpress.trac.wordpress.org/ticket/323">#323</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktteststests_thingstest_thing_translationphp">trunk/t/tests/tests_things/test_thing_translation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktteststests_thingstest_thing_translationphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests/tests_things/test_thing_translation.php (926 => 927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests/tests_things/test_thing_translation.php 2014-05-19 15:43:16 UTC (rev 926)
+++ trunk/t/tests/tests_things/test_thing_translation.php 2014-05-19 15:53:11 UTC (rev 927)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Test_Thing_Translation extends GP_UnitTestCase {
</span><ins>+
</ins><span class="cx"> function test_translation_should_support_6_plurals() {
</span><span class="cx"> $plurals = array( 'translation_0' => 'Zero', 'translation_1' => 'One', 'translation_2' => 'Two', 'translation_3' => 'Three', 'translation_4' => 'Four', 'translation_5' => 'Five' );
</span><span class="cx"> $translation = $this->factory->translation->create( $plurals );
</span><ins>+
</ins><span class="cx"> $this->assertEqualFields( $translation, $plurals );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -11,6 +13,7 @@
</span><span class="cx"> $plurals = array( 'translation_0' => 'Zero', 'translation_1' => 'One', 'translation_2' => 'Two', 'translation_3' => 'Three', 'translation_4' => 'Four', 'translation_5' => 'Five' );
</span><span class="cx"> $translation = $this->factory->translation->create( $plurals );
</span><span class="cx"> $translation->reload();
</span><ins>+
</ins><span class="cx"> $this->assertEqualFields( $translation, $plurals );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -19,16 +22,20 @@
</span><span class="cx"> $translation = $this->factory->translation->create_with_original_for_translation_set( $set );
</span><span class="cx"> $translation->reject();
</span><span class="cx"> $for_translation = GP::$translation->for_translation( $set->project, $set, 0, array( 'status' => 'untranslated' ) );
</span><ins>+
</ins><span class="cx"> $this->assertEquals( 1, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_for_translation_should_include_untranslated_by_default() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><ins>+
</ins><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><del>- $original2 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</del><ins>+ $this->factory->original->create( array( 'project_id' => $set->project_id ) );
+
</ins><span class="cx"> $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><span class="cx"> $for_translation = GP::$translation->for_translation( $set->project, $set, 0, array(), array('by' => 'translation', 'how' => 'asc') );
</span><ins>+
</ins><span class="cx"> $this->assertEquals( 2, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_translation[1]->id );
</span><span class="lines">@@ -36,12 +43,14 @@
</span><span class="cx">
</span><span class="cx"> function test_for_translation_should_not_include_old_by_default() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><ins>+
</ins><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><del>- $original2 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
- $translation1_old = $this->factory->translation->create( array( 'translation_set_id' => $set->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</del><ins>+ $this->factory->original->create( array( 'project_id' => $set->project_id ) );
+
</ins><span class="cx"> $translation1_current = $this->factory->translation->create( array( 'translation_set_id' => $set->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><span class="cx"> $translation1_current->set_as_current();
</span><span class="cx"> $for_translation = GP::$translation->for_translation( $set->project, $set, 0, array(), array('by' => 'translation', 'how' => 'asc') );
</span><ins>+
</ins><span class="cx"> $this->assertEquals( 2, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> $this->assertEquals( $translation1_current->id, $for_translation[1]->id );
</span><span class="lines">@@ -50,22 +59,27 @@
</span><span class="cx">
</span><span class="cx"> function test_for_translation_should_not_include_untranslated_for_single_status() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><ins>+
</ins><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><del>- $original2 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</del><ins>+
</ins><span class="cx"> $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><span class="cx"> $for_translation = GP::$translation->for_translation( $set->project, $set, 0, array('status' => 'current'), array('by' => 'translation', 'how' => 'asc') );
</span><ins>+
</ins><span class="cx"> $this->assertEquals( 1, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_translation[0]->id );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_for_export_should_include_untranslated() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><ins>+
</ins><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><del>- $original2 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</del><ins>+ $this->factory->original->create( array( 'project_id' => $set->project_id ) );
+
</ins><span class="cx"> $translation1 = $this->factory->translation->create( array( 'translation_set_id' => $set->id, 'original_id' => $original1->id, 'status' => 'current' ) );
</span><del>- $for_export = GP::$translation->for_export( $set->project, $set, 0, array('status' => 'current'), array('by' => 'translation', 'how' => 'asc') );
</del><ins>+ $for_export = GP::$translation->for_export( $set->project, $set, 0, array('status' => 'current') );
+
</ins><span class="cx"> $this->assertEquals( 2, count( $for_export ) );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_export[0]->id );
</span><ins>+ }
</ins><span class="cx">
</span><del>- }
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>