[Lxr-commits] CVS: lxr/tests BKTest.pm,1.1.2.3,1.1.2.4

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10408/tests

Modified Files:
      Tag: bk-dev-branch
	BKTest.pm 
Log Message:
genxref now works against the test BK repository.

Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/Attic/BKTest.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- BKTest.pm	13 Feb 2005 19:35:04 -0000	1.1.2.3
+++ BKTest.pm	13 Feb 2005 23:07:05 -0000	1.1.2.4
@@ -88,15 +88,15 @@
 
 	my @files =
 	  sort($bk->getdir("/", 'test1'));  # use different releases to disambiguate
-	$self->assert_deep_equals(\@files, [ sort "README", "src" ]);
+	$self->assert_deep_equals(\@files, [ sort "README", "src/" ]);
 	@files = sort ($bk->getdir("", 'test1'));  # Check that interprets "" as "/"
-	$self->assert_deep_equals(\@files, [ sort "README", "src" ]);
+	$self->assert_deep_equals(\@files, [ sort "README", "src/" ]);
 	@files = sort($bk->getdir("src/", 'test1'));
-	$self->assert_deep_equals(\@files, [ sort "file1", "file2", "tests" ]);
+	$self->assert_deep_equals(\@files, [ sort "file1", "file2", "tests/" ]);
 	@files = sort($bk->getdir("src/tests/newtest/", 'test1'));
 	$self->assert_deep_equals(\@files, [ sort "test1" ]);
 	@files = sort($bk->getdir("src/tests/", 'test1'));
-	$self->assert_deep_equals(\@files, [ sort "newtest" ]);
+	$self->assert_deep_equals(\@files, [ sort "newtest/" ]);
 	@files = sort($bk->getdir("src/tests/newtest/", 'test1'));
 	$self->assert_deep_equals(\@files, [ sort "test1" ]);
 
@@ -118,15 +118,13 @@
 	@files =
 	  sort($bk->getdir("src/tests/", 'test2'))
 	  ;    # Should still only see one copy of dir
-	$self->assert_deep_equals(\@files, ["newtest"]);
+	$self->assert_deep_equals(\@files, ["newtest/"]);
 	@files =
 	  sort($bk->getdir("src/tests/newtest/", 'test1'))
 	  ;    # Check cache is still ok
 	$self->assert_deep_equals(\@files, ["test1"]);
 
 	# Now tests with invalid paths on entry
-	@files = sort($bk->getdir("/src/tests/", 'test1'));
-	$self->assert($#files == -1);
 	@files = sort($bk->getdir("src/tests", 'test2'));
 	$self->assert($#files == -1);
 }
@@ -154,17 +152,23 @@
 	my $bk   = $self->{'bk'};
 
 	# A revision with no deletions
-	my @entries = sort $bk->getdir('firstdir/', '@1.3');
+	my @entries = sort $bk->getdir('/firstdir/', '@1.3');
 	$self->assert(scalar(@entries) == 2, "entries is $#entries");
 	$self->assert_deep_equals(\@entries, [ sort ("file2", "file3") ]);
-	@entries = sort($bk->getdir('seconddir/', '@1.6'));
-	$self->assert_deep_equals(\@entries, [ sort ("file4", "thirddir") ]);
+	@entries = sort($bk->getdir('/seconddir/', '@1.6'));
+	$self->assert_deep_equals(\@entries, [ sort ("file4", "thirddir/") ]);
 
+	# Check the full recursive tree
+	@entries = sort $bk->getdir('/', '@1.11');
+	$self->assert_deep_equals(\@entries, [sort ("file1", "firstdir/", "seconddir/", "sourcedir/")]);
+	@entries = sort $bk->getdir('/sourcedir/', '@1.11');
+	$self->assert_deep_equals(\@entries, [sort ("cobol.c", "main.c", "subdir1/")]);
+	
 	# Now a revision after some files have been deleted
 	@entries = sort $bk->getdir('firstdir/', '@1.6');
 	$self->assert(scalar(@entries) == 0);
 	@entries = sort $bk->getdir('seconddir/', '@1.6');
-	$self->assert_deep_equals(\@entries, [ sort ('thirddir', 'file4') ]);
+	$self->assert_deep_equals(\@entries, [ sort ('thirddir/', 'file4') ]);
 	@entries = sort $bk->getdir('seconddir/thirddir/', '@1.6');
 	$self->assert_deep_equals(\@entries, [ sort ('file5') ]);
 
@@ -289,6 +293,28 @@
 	$self->assert(!defined($bk->getfilehandle("/seconddir/thirddir/file5", '@1.10')));
 }
 
+# Test filerev
+#  Need to ensure that the filerevs are < 255 chars & sensible!
+#  Oh, and they change when the file changes!
+sub test_filerev {
+	my ($self) = shift;
+	my $bk = $self->{'bk'};
+	
+	# A file that has changed contents
+	my $rev = $bk->filerev('/file1', '@1.3');
+	$self->assert($rev);
+	$self->assert_not_equals($rev, $bk->filerev('/file1', '@1.12'));
+	
+	# A file that hasn't changed
+	$rev = $bk->filerev('/firstdir/file2', '@1.3');
+	$self->assert_equals($rev, $bk->filerev('/firstdir/file2', '@1.5'));
+	$self->assert(length($rev) < 255);
+	
+	# A file that has been deleted & recreated
+	$rev = $bk->filerev('/firstdir/file2', '@1.5');
+	$self->assert_not_equals($rev, $bk->filerev('/firstdir/file2', '@1.9'));
+}
+
 # Tests of helper functions in BK.pm
 sub test_canonise {
 	my ($self) = shift;