[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] proftpd/tests/t/lib/ProFTPD/Tests/Config DirFakeUser.pm, 1.4, 1.5
From:       TJ Saunders <castaglia () users ! sourceforge ! net>
Date:       2012-12-28 23:28:04
Message-ID: E1TojLS-0005r7-Vn () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Config
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32288/tests/t/lib/ProFTPD/Tests/Config

Modified Files:
	DirFakeUser.pm 
Log Message:

Fixing up tests.


Index: DirFakeUser.pm
===================================================================
RCS file: /cvsroot/proftp/proftpd/tests/t/lib/ProFTPD/Tests/Config/DirFakeUser.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DirFakeUser.pm	17 Jan 2012 00:40:57 -0000	1.4
+++ DirFakeUser.pm	28 Dec 2012 23:28:02 -0000	1.5
@@ -142,16 +142,7 @@
 
       my $resp_code = $client->response_code();
       my $resp_msg = $client->response_msg();
-
-      my $expected;
-
-      $expected = 226;
-      $self->assert($expected == $resp_code,
-        test_msg("Expected $expected, got $resp_code"));
-
-      $expected = "Transfer complete";
-      $self->assert($expected eq $resp_msg,
-        test_msg("Expected '$expected', got '$resp_msg'"));
+      $self->assert_transfer_ok($resp_code, $resp_msg);
 
       $client->quit();
 
@@ -165,7 +156,11 @@
         }
       }
 
-      $expected = {
+      # Remove the '.' and '..' entries; they aren't relevant for this test
+      delete($res->{'.'});
+      delete($res->{'..'});
+
+      my $expected = {
         'config.conf' => $fake_user,
         'config.group' => $fake_user,
         'config.passwd' => $fake_user,
@@ -324,16 +319,7 @@
 
       my $resp_code = $client->response_code();
       my $resp_msg = $client->response_msg();
-
-      my $expected;
-
-      $expected = 226;
-      $self->assert($expected == $resp_code,
-        test_msg("Expected $expected, got $resp_code"));
-
-      $expected = "Transfer complete";
-      $self->assert($expected eq $resp_msg,
-        test_msg("Expected '$expected', got '$resp_msg'"));
+      $self->assert_transfer_ok($resp_code, $resp_msg);
 
       $client->quit();
 
@@ -347,9 +333,11 @@
         }
       }
 
-      $expected = {
-        '.' => $fake_uid,
-        '..' => $fake_uid,
+      # Remove the '.' and '..' entries; they aren't relevant for this test
+      delete($res->{'.'});
+      delete($res->{'..'});
+
+      my $expected = {
         'config.conf' => $fake_uid,
         'config.group' => $fake_uid,
         'config.passwd' => $fake_uid,
@@ -638,16 +626,7 @@
 
       my $resp_code = $client->response_code();
       my $resp_msg = $client->response_msg();
-
-      my $expected;
-
-      $expected = 226;
-      $self->assert($expected == $resp_code,
-        test_msg("Expected $expected, got $resp_code"));
-
-      $expected = "Transfer complete";
-      $self->assert($expected eq $resp_msg,
-        test_msg("Expected '$expected', got '$resp_msg'"));
+      $self->assert_transfer_ok($resp_code, $resp_msg);
 
       $client->quit();
 
@@ -661,9 +640,11 @@
         }
       }
 
-      $expected = {
-        '.' => $expected_uid,
-        '..' => $expected_uid,
+      # Remove the '.' and '..' entries; they aren't relevant for this test
+      delete($res->{'.'});
+      delete($res->{'..'});
+
+      my $expected = {
         'config.conf' => $expected_uid,
         'config.group' => $expected_uid,
         'config.passwd' => $expected_uid,
@@ -822,16 +803,7 @@
 
       my $resp_code = $client->response_code();
       my $resp_msg = $client->response_msg();
-
-      my $expected;
-
-      $expected = 226;
-      $self->assert($expected == $resp_code,
-        test_msg("Expected $expected, got $resp_code"));
-
-      $expected = "Transfer complete";
-      $self->assert($expected eq $resp_msg,
-        test_msg("Expected '$expected', got '$resp_msg'"));
+      $self->assert_transfer_ok($resp_code, $resp_msg);
 
       $client->quit();
 
@@ -845,9 +817,11 @@
         }
       }
 
-      $expected = {
-        '.' => $fake_uid,
-        '..' => $fake_uid,
+      # Remove the '.' and '..' entries; they aren't relevant for this test
+      delete($res->{'.'});
+      delete($res->{'..'});
+
+      my $expected = {
         'config.conf' => $fake_uid,
         'config.group' => $fake_uid,
         'config.passwd' => $fake_uid,


------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]