[Sharpcvslib-commits] sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands AddCommandTest.cs,1.2,1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13190/src/ICSharpCode.Tests/SharpCvsLib/Commands

Modified Files:
	AddCommandTest.cs CheckoutModuleCommandTest.cs 
	RTagCommandTest.cs UpdateCommandTest.cs 
	UpdateCommandTestCvsnt.cs 
Log Message:
Upgraded NUnit to NAnt version 2.2.0 and also upgraded the #ziplib to 0.8.1.

Index: CheckoutModuleCommandTest.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands/CheckoutModuleCommandTest.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CheckoutModuleCommandTest.cs	9 Dec 2003 08:25:37 -0000	1.24
--- CheckoutModuleCommandTest.cs	9 Sep 2004 07:04:57 -0000	1.25
***************
*** 87,92 ****
              this.Checkout ();

!             Assertion.Assert ("Should have found the check file.  file=[" +
!                             checkFile + "]", File.Exists (checkFile));

              Entries entries =
--- 87,92 ----
              this.Checkout ();

!             Assert.IsTrue (File.Exists (checkFile), "Should have found the check file.  file=[" +
!                             checkFile + "]");

              Entries entries =
***************
*** 94,110 ****

              String moduleDir = Path.Combine(this.settings.LocalPath, this.settings.Module);
!             Assertion.Assert ("Build file should have a cvs entry.", entries.Contains(Path.Combine(moduleDir, checkFile)));
!             Assertion.Assert (this.settings.Config.TargetDirectory + " directory should have a cvs entry.", 
!                 entries.Contains(Path.Combine(moduleDir, "src" + Path.DirectorySeparatorChar.ToString())));
              foreach (DictionaryEntry dicEntry in entries) {
                  Entry entry = (Entry)dicEntry.Value;
                  if (!entry.IsDirectory) {
!                     Assertion.AssertNotNull("Should have date information.", entry.Date);
                  }
              }
!             Assertion.Assert ("Should not have a cvs directory above module path.",
!                     !Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)));
!             Assertion.Assert ("Should not have a cvs directory in the current execution path.  ",
!                             !Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)));

--- 94,110 ----

              String moduleDir = Path.Combine(this.settings.LocalPath, this.settings.Module);
!             Assert.IsTrue (entries.Contains(Path.Combine(moduleDir, checkFile)), "Build file should have a cvs entry.");
!             Assert.IsTrue (entries.Contains(Path.Combine(moduleDir, "src" + Path.DirectorySeparatorChar.ToString())),
!                 this.settings.Config.TargetDirectory + " directory should have a cvs entry.");
              foreach (DictionaryEntry dicEntry in entries) {
                  Entry entry = (Entry)dicEntry.Value;
                  if (!entry.IsDirectory) {
!                     Assert.IsNotNull(entry.Date, "Should have date information.");
                  }
              }
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)), 
!                 "Should not have a cvs directory above module path.");
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)), 
!                 "Should not have a cvs directory in the current execution path.  ");

***************
*** 139,144 ****
          private void CheckoutRevisionTest (String revision, String expectedContent) {
              this.Checkout (revision, null);
!             Assertion.Assert ("Should have found the check file.  file=[" +
!                             checkFile + "]", File.Exists (checkFile));

              ICvsFile[] entries =
--- 139,144 ----
          private void CheckoutRevisionTest (String revision, String expectedContent) {
              this.Checkout (revision, null);
!             Assert.IsTrue (File.Exists (checkFile), "Should have found the check file.  file=[" +
!                             checkFile + "]");

              ICvsFile[] entries =
***************
*** 159,173 ****
              }

!             Assertion.Assert ("Build file should have a cvs entry.", foundFileEntry == 1);
!             Assertion.Assert (this.settings.Config.TargetDirectory + " directory should have a cvs entry.", foundDirectoryEntry == 1);
!             Assertion.Assert ("Should not have a cvs directory above module path.",
!                             !Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)));
!             Assertion.Assert ("Should not have a cvs directory in the current execution path.  ",
!                             !Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)));

              String tagFile =
                  Path.Combine (Path.Combine (this.settings.Config.Module, manager.CVS), Tag.FILE_NAME);
!             Assertion.Assert ("Should not have a cvs directory in the current execution path.  ",
!                             !Directory.Exists (tagFile));

              AssertFileContentsEqualString (checkFile, expectedContent);
--- 159,173 ----
              }

!             Assert.IsTrue(foundFileEntry == 1, "Build file should have a cvs entry.");
!             Assert.IsTrue (foundDirectoryEntry == 1, this.settings.Config.TargetDirectory + " directory should have a cvs entry.");
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)),
!                             "Should not have a cvs directory above module path.");
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)),
!                             "Should not have a cvs directory in the current execution path.  ");

              String tagFile =
                  Path.Combine (Path.Combine (this.settings.Config.Module, manager.CVS), Tag.FILE_NAME);
!             Assert.IsTrue (!Directory.Exists (tagFile), 
!                             "Should not have a cvs directory in the current execution path.  ");

              AssertFileContentsEqualString (checkFile, expectedContent);
***************
*** 186,192 ****
              actualContent = actualContent.Substring (0, actualContent.Length -2);
              reader.Close ();
!             Assertion.AssertEquals ("Files should be equal.",
!                                     expectedContent,
!                                     actualContent);
          }

--- 186,191 ----
              actualContent = actualContent.Substring (0, actualContent.Length -2);
              reader.Close ();
!             Assert.AreEqual(expectedContent, actualContent,
!                 "Files should be equal.");
          }

***************
*** 204,209 ****

              this.Checkout (null, this.settings.Config.OverrideDirectory);
!             Assertion.Assert ("Should have found the check file.  file=[" +
!                             checkFile + "]", File.Exists (checkFile));

              ICvsFile[] entries =
--- 203,208 ----

              this.Checkout (null, this.settings.Config.OverrideDirectory);
!             Assert.IsTrue (File.Exists (checkFile), "Should have found the check file.  file=[" +
!                             checkFile + "]");

              ICvsFile[] entries =
***************
*** 224,238 ****
              }

!             Assertion.Assert ("Build file should have a cvs entry.", foundFileEntry == 1);
!             Assertion.Assert (this.settings.Config.TargetDirectory + " directory should have a cvs entry.", foundDirectoryEntry == 1);
!             Assertion.Assert ("Should not have a cvs directory above module path.",
!                             !Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)));
!             Assertion.Assert ("Should not have a cvs directory in the current execution path.  ",
!                             !Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)));

              String tagFile =
                  Path.Combine (Path.Combine (this.settings.Config.Module, manager.CVS), Tag.FILE_NAME);
!             Assertion.Assert ("Should not have a cvs directory and tag file in the current execution path.  ",
!                             !Directory.Exists (tagFile));
          }

--- 223,237 ----
              }

!             Assert.IsTrue (foundFileEntry == 1, "Build file should have a cvs entry.");
!             Assert.IsTrue (foundDirectoryEntry == 1, this.settings.Config.TargetDirectory + " directory should have a cvs entry.");
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.LocalPath, manager.CVS)),
!                 "Should not have a cvs directory above module path.");
!             Assert.IsTrue (!Directory.Exists (Path.Combine (this.settings.Config.Module, manager.CVS)),
!                 "Should not have a cvs directory in the current execution path.  ");

              String tagFile =
                  Path.Combine (Path.Combine (this.settings.Config.Module, manager.CVS), Tag.FILE_NAME);
!             Assert.IsTrue (!Directory.Exists (tagFile), 
!                 "Should not have a cvs directory and tag file in the current execution path.  ");
          }

***************
*** 271,283 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new CheckoutModuleCommand (working);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              try {
                  connection.Connect (working, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assertion.Assert ("Failed to authenticate with server.", true);
              }

--- 270,282 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull (connection, "Should have a connection object.");

              ICommand command = new CheckoutModuleCommand (working);
!             Assert.IsNotNull(command, "Should have a command object.");

              try {
                  connection.Connect (working, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assert.IsTrue(true, "Failed to authenticate with server.");
              }

Index: AddCommandTest.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands/AddCommandTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddCommandTest.cs	12 Dec 2003 08:36:52 -0000	1.2
--- AddCommandTest.cs	9 Sep 2004 07:04:57 -0000	1.3
***************
*** 62,66 ****
              String[] files = Directory.GetFiles(modulePath, "*.txt");

!             Assertion.Assert(files.Length > 0);
              ArrayList copiedFiles = new ArrayList ();
              foreach (String file in files) {
--- 62,66 ----
              String[] files = Directory.GetFiles(modulePath, "*.txt");

!             Assert.IsTrue(files.Length > 0);
              ArrayList copiedFiles = new ArrayList ();
              foreach (String file in files) {
***************
*** 80,84 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              AddCommand command = new AddCommand (working);
--- 80,84 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull (connection);

              AddCommand command = new AddCommand (working);
***************
*** 86,90 ****
              command.Folders = this.GetFoldersToAdd(copiedFiles);

!             Assertion.Assert(command.Folders.Count > 0);
              LOGGER.Debug("folders count=[" + command.Folders.Count + "]");
              foreach (DictionaryEntry folderDic in command.Folders) {
--- 86,90 ----
              command.Folders = this.GetFoldersToAdd(copiedFiles);

!             Assert.IsTrue(command.Folders.Count > 0);
              LOGGER.Debug("folders count=[" + command.Folders.Count + "]");
              foreach (DictionaryEntry folderDic in command.Folders) {
***************
*** 93,102 ****
                  LOGGER.Debug("entries count=[" + folder.Entries.Count + "]");
              }
!             Assertion.AssertNotNull ("Should have a command object.", command);

              try {
                  connection.Connect (working, this.Settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assertion.Assert ("Failed to authenticate with server.", true);
              }

--- 93,103 ----
                  LOGGER.Debug("entries count=[" + folder.Entries.Count + "]");
              }
!             Assert.IsNotNull (command);

              try {
                  connection.Connect (working, this.Settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 // should not get here.
!                 Assert.IsTrue (true);
              }

***************
*** 107,111 ****
                  connection.Connect(working, this.Settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assertion.Assert("Failed to authenticate with server.", true);
              }
              CommitCommand2 commitCommand = new CommitCommand2(working);
--- 108,112 ----
                  connection.Connect(working, this.Settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assert.IsTrue(true);
              }
              CommitCommand2 commitCommand = new CommitCommand2(working);
***************
*** 118,122 ****
              Entries entries = manager.FetchEntries(Path.Combine(modulePath, "Entries"));
              foreach (String addedFile in copiedFiles) {
!                 Assertion.Assert(entries.Contains(Path.Combine(modulePath, addedFile)));
              }

--- 119,123 ----
              Entries entries = manager.FetchEntries(Path.Combine(modulePath, "Entries"));
              foreach (String addedFile in copiedFiles) {
!                 Assert.IsTrue(entries.Contains(Path.Combine(modulePath, addedFile)));
              }

Index: RTagCommandTest.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands/RTagCommandTest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RTagCommandTest.cs	10 Dec 2003 09:06:50 -0000	1.3
--- RTagCommandTest.cs	9 Sep 2004 07:04:57 -0000	1.4
***************
*** 101,113 ****

          private void Checkout (WorkingDirectory workingDirectory, CVSServerConnection connection) {
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new CheckoutModuleCommand (workingDirectory);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              try {
                  connection.Connect (workingDirectory, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assertion.Assert ("Failed to authenticate with server.", true);
              }

--- 101,113 ----

          private void Checkout (WorkingDirectory workingDirectory, CVSServerConnection connection) {
!             Assert.IsNotNull (connection);

              ICommand command = new CheckoutModuleCommand (workingDirectory);
!             Assert.IsNotNull (command);

              try {
                  connection.Connect (workingDirectory, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assert.IsTrue (true);
              }

Index: UpdateCommandTest.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands/UpdateCommandTest.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** UpdateCommandTest.cs	9 Dec 2003 16:03:38 -0000	1.20
--- UpdateCommandTest.cs	9 Sep 2004 07:04:57 -0000	1.21
***************
*** 106,115 ****
              LOGGER.Debug("After deleted checkFile=[" + checkFile + "]");

!             Assertion.Assert ("File should be gone now.  file=[" + checkFile + "]", !File.Exists (checkFile));
!             LOGGER.Debug("Before update all files recursively.");
              this.UpdateAllRecursive (rootDir);
!             LOGGER.Debug("After update all files recursively.");
!             Assertion.Assert ("Should have found the file.  file=[" +
!                             checkFile + "]", File.Exists (checkFile));

              String moduleDir = Path.Combine(rootDir, this.settings.Module);
--- 106,112 ----
              LOGGER.Debug("After deleted checkFile=[" + checkFile + "]");

!             Assert.IsTrue (!File.Exists (checkFile));
              this.UpdateAllRecursive (rootDir);
!             Assert.IsTrue (File.Exists (checkFile));

              String moduleDir = Path.Combine(rootDir, this.settings.Module);
***************
*** 123,143 ****
              // Minus the cvs directory
              int total = files.Length + directories.Length - 1;
!             Assertion.Assert ("Count of directories and files should be equal to " +
!                             "the entries in the CVS/Entries file.  They are not.  " +
!                             "entriesCount=[" + entries.Count + "]" +
!                             "files=[" + files.Length + "]" +
!                             "directories=[" + directories.Length + "]" +
!                             "total=[" + total + "]",
!                             entries.Count == total);
              LOGGER.Debug("Before checking all file names.");

!             Assertion.Assert("Target file=[" + this.settings.TargetFile + "] should have a cvs entry.",
!                 entries.Contains(Path.Combine(moduleDir, this.settings.TargetFile)));

              // Had some problems with an extra module directory appearing under
              //    the main working folder.
              String doubleModuleDir = Path.Combine (rootDir, this.settings.Config.Module);
!             Assertion.Assert ("Should not be a module directory under root folder=[" + doubleModuleDir + "]",
!                             !Directory.Exists (doubleModuleDir));
          }

--- 120,132 ----
              // Minus the cvs directory
              int total = files.Length + directories.Length - 1;
!             Assert.AreEqual (total, entries.Count);
              LOGGER.Debug("Before checking all file names.");

!             Assert.IsTrue(entries.Contains(Path.Combine(moduleDir, this.settings.TargetFile)));

              // Had some problems with an extra module directory appearing under
              //    the main working folder.
              String doubleModuleDir = Path.Combine (rootDir, this.settings.Config.Module);
!             Assert.IsTrue (!Directory.Exists (doubleModuleDir));
          }

***************
*** 152,159 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new UpdateCommand2 (working);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              connection.Connect (working, this.settings.Config.ValidPassword);
--- 141,148 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull (connection);

              ICommand command = new UpdateCommand2 (working);
!             Assert.IsNotNull (command);

              connection.Connect (working, this.settings.Config.ValidPassword);
***************
*** 199,206 ****
              File.Delete (checkFile);

!             Assertion.Assert ("File should be gone now.  file=[" + checkFile + "]", !File.Exists (checkFile));
              this.UpdateAllRecursive (rootDir, this.settings.Config.OverrideDirectory);
!             Assertion.Assert ("Should have found the file.  file=[" +
!                             checkFile + "]", File.Exists (checkFile));

          }
--- 188,194 ----
              File.Delete (checkFile);

!             Assert.IsTrue (!File.Exists (checkFile));
              this.UpdateAllRecursive (rootDir, this.settings.Config.OverrideDirectory);
!             Assert.IsTrue (File.Exists (checkFile));

          }

Index: UpdateCommandTestCvsnt.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands/UpdateCommandTestCvsnt.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UpdateCommandTestCvsnt.cs	5 Dec 2003 05:27:49 -0000	1.4
--- UpdateCommandTestCvsnt.cs	9 Sep 2004 07:04:57 -0000	1.5
***************
*** 92,99 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new UpdateCommand2 (working);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              connection.Connect (working, this.settings.Config.ValidPassword);
--- 92,99 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull(connection);

              ICommand command = new UpdateCommand2 (working);
!             Assert.IsNotNull(command);

              connection.Connect (working, this.settings.Config.ValidPassword);
***************
*** 117,124 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new UpdateCommand2 (working);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              connection.Connect (working, this.settings.Config.ValidPassword);
--- 117,124 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull(connection);

              ICommand command = new UpdateCommand2 (working);
!             Assert.IsNotNull(command);

              connection.Connect (working, this.settings.Config.ValidPassword);
***************
*** 140,152 ****

              CVSServerConnection connection = new CVSServerConnection ();
!             Assertion.AssertNotNull ("Should have a connection object.", connection);

              ICommand command = new CheckoutModuleCommand (working);
!             Assertion.AssertNotNull ("Should have a command object.", command);

              try {
                  connection.Connect (working, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assertion.Assert ("Failed to authenticate with server.", true);
              }

--- 140,152 ----

              CVSServerConnection connection = new CVSServerConnection ();
!             Assert.IsNotNull (connection);

              ICommand command = new CheckoutModuleCommand (working);
!             Assert.IsNotNull (command);

              try {
                  connection.Connect (working, this.settings.Config.ValidPassword);
              } catch (AuthenticationException) {
!                 Assert.IsTrue (true);
              }

[Sharpcvslib-commits] sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands AddCommandTest.cs,1.2,1

[Sharpcvslib-commits] sharpcvslib/src/ICSharpCode.Tests/SharpCvsLib/Commands AddCommandTest.cs,1.2,1.3 CheckoutModuleCommandTest.cs,1.24,1.25 RTagCommandTest.cs,1.3,1.4 UpdateCommandTest.cs,1.20,1.21 UpdateCommandTestCvsnt.cs,1.4,1.5