[svk-commit] r2410 - branches/i18n-fixes/t/i18n

[nobody at bestpractical.com]

Author: clsung
Date: Tue Jun 12 23:29:48 2007
New Revision: 2410

Modified:
   branches/i18n-fixes/t/i18n/big5dirname.t
   branches/i18n-fixes/t/i18n/checkout.t

Log:
- add more tests to i18n/

Modified: branches/i18n-fixes/t/i18n/big5dirname.t
==============================================================================
--- branches/i18n-fixes/t/i18n/big5dirname.t	(original)
+++ branches/i18n-fixes/t/i18n/big5dirname.t	Tue Jun 12 23:29:48 2007
@@ -8,7 +8,7 @@
 setlocale (LC_CTYPE, $ENV{LC_CTYPE} = 'zh_TW.Big5')
     or plan skip_all => 'cannot set locale to zh_TW.Big5';
 
-plan tests => 8;
+plan tests => 10;
 our $output;
 
 my $big5dir = "\x{b7}\x{7c}\x{b1}\x{e0}"; # meeting , contains a '|' character
@@ -84,3 +84,12 @@
            ' new file2 to add',
            '+big5 filename: '.$file2,
           ]);
+is_output($svk, 'ci', [-m => 'commit diff checkout', $big5dir],
+          ['Committed revision 3.']);
+
+chdir('../../../');
+$svk->update ('-r', 2, $copath);
+append_file("$copath/$file2", "big5 filename: $file2\n");
+$svk->update ($copath); 
+warn $output;
+ok ($output =~ m#g   t/checkout/filenames/$big5dir/$file2#, 'merged');

Modified: branches/i18n-fixes/t/i18n/checkout.t
==============================================================================
--- branches/i18n-fixes/t/i18n/checkout.t	(original)
+++ branches/i18n-fixes/t/i18n/checkout.t	Tue Jun 12 23:29:48 2007
@@ -8,7 +8,7 @@
 setlocale (LC_CTYPE, $ENV{LC_CTYPE} = 'zh_TW.Big5')
     or plan skip_all => 'cannot set locale to zh_TW.Big5';
 
-plan tests => 6;
+plan tests => 7;
 our $output;
 
 mkpath ["t/checkout/filenames"], 0, 0700 unless -d "t/checkout/filenames";
@@ -54,11 +54,16 @@
 
 overwrite_file (copath("$file"),
                 "hihi\n");
-$ENV{SVKRESOLVE} = undef;
-our $answer = [ 'd', 'y' ];
 $svk->update ($copath); # XXX use is_ouptut to compare conflict diff header
 warn $output;
 ok ($output =~ m/1 conflict found\./, 'conflict');
 
-$svk->revert ($copath);
-$svk->resolved ($copath);
+$svk->update ('-r', 1, $copath);
+overwrite_file (copath("$file"),
+                "hihi\n");
+
+$ENV{SVKRESOLVE} = "";
+our $answer = [ 'd', 'y' ];
+$svk->update ($copath); # XXX use is_ouptut to compare conflict diff header
+warn $output;
+ok ($output =~ m#G   t/checkout/filenames/$file#, 'diff');