[Ccnet-checkins] ccnet/project/core/sourcecontrol/test VaultHistoryParserTest.cs,1.1,1.2 VaultTest.cs,1.1,1.2

[Owen R. <exo...@us...>]

Update of /cvsroot/ccnet/ccnet/project/core/sourcecontrol/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18194/project/core/sourcecontrol/test

Modified Files:
	VaultHistoryParserTest.cs VaultTest.cs 
Log Message:
small refactoring of cvs and vault code

Index: VaultHistoryParserTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/sourcecontrol/test/VaultHistoryParserTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VaultHistoryParserTest.cs	31 May 2004 04:50:30 -0000	1.1
--- VaultHistoryParserTest.cs	31 May 2004 12:01:19 -0000	1.2
***************
*** 25,40 ****
  				</history>
  			  </vault>";
- //		private const string XML = 
- //			@"<vault>
- //				<history>
- //					<item txid=""2"" date=""5/13/2003 10:41:30 PM"" name=""$"" type=""70"" version=""1"" user=""admin"" comment=""creating repository"" />
- //				</history>
- //			  </vault>";
- //		private const string NO_COMMENT_XML =
- //			@"<vault>
- //				<history>
- //					<item txid=""2"" date=""5/13/2003 10:41:30 PM"" name=""$"" type=""70"" version=""1"" user=""admin"" />
- //				</history>
- //			  </vault>";
  
  		private StringReader GetReader(string xml)
--- 25,28 ----
***************
*** 44,48 ****
  
  		[Test]
! 		public void TestNumberOfModifications()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
--- 32,36 ----
  
  		[Test]
! 		public void NumberOfModifications()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
***************
*** 54,58 ****
  
  		[Test]
! 		public void TestNumberOfModificationsWithInvalidDate()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
--- 42,46 ----
  
  		[Test]
! 		public void NumberOfModificationsWithInvalidDate()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
***************
*** 64,68 ****
  
  		[Test]
! 		public void TestModificationData()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
--- 52,56 ----
  
  		[Test]
! 		public void ModificationData()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
***************
*** 86,90 ****
  		/// </remarks>
  		[Test]
! 		public void NoCommentsTest()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();
--- 74,78 ----
  		/// </remarks>
  		[Test]
! 		public void NoComments()
  		{
  			VaultHistoryParser parser = new VaultHistoryParser();

Index: VaultTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/sourcecontrol/test/VaultTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VaultTest.cs	31 May 2004 04:50:30 -0000	1.1
--- VaultTest.cs	31 May 2004 12:01:19 -0000	1.2
***************
*** 16,21 ****
  		private const string COMMAND_LINE_SSL = @"history ""{0}"" -host {1} -user {2} -password {3} -repository {4} -rowlimit 0 -ssl";
  
! 		private const string ST_XML_SSL =
! 			@"<sourceControl type=""vault"">
  				<executable>c:\program files\sourcegear\vault client\vault.exe</executable>
  				<username>username</username>
--- 16,20 ----
  		private const string COMMAND_LINE_SSL = @"history ""{0}"" -host {1} -user {2} -password {3} -repository {4} -rowlimit 0 -ssl";
  
! 		private const string ST_XML_SSL = @"<sourceControl type=""vault"">
  				<executable>c:\program files\sourcegear\vault client\vault.exe</executable>
  				<username>username</username>
***************
*** 27,32 ****
  			</sourceControl>";
  
! 		private const string ST_XML_NOSSL =
! 			@"<sourceControl type=""vault"">
  				<executable>c:\program files\sourcegear\vault client\vault.exe</executable>
  				<username>username</username>
--- 26,30 ----
  			</sourceControl>";
  
! 		private const string ST_XML_NOSSL = @"<sourceControl type=""vault"">
  				<executable>c:\program files\sourcegear\vault client\vault.exe</executable>
  				<username>username</username>
***************
*** 45,50 ****
  
  		[Test]
! 		public void TestCreateHistoryProcess()
! 		{				
  			DateTime from = new DateTime(2001, 1, 21, 20, 0, 0);
  			DateTime to = new DateTime(2002, 2, 22, 20, 0, 0);
--- 43,48 ----
  
  		[Test]
! 		public void CreateHistoryProcess()
! 		{
  			DateTime from = new DateTime(2001, 1, 21, 20, 0, 0);
  			DateTime to = new DateTime(2002, 2, 22, 20, 0, 0);
***************
*** 53,63 ****
  
  			string expectedExecutable = @"c:\program files\sourcegear\vault client\vault.exe";
! 			string expectedArgs = string.Format(
! 				COMMAND_LINE_NOSSL,
! 				"$",
! 				"host",
! 				"username",
! 				"password",
! 				"repository");
  
  			AssertNotNull("process was null", actual);
--- 51,55 ----
  
  			string expectedExecutable = @"c:\program files\sourcegear\vault client\vault.exe";
! 			string expectedArgs = string.Format(COMMAND_LINE_NOSSL, "$", "host", "username", "password", "repository");
  
  			AssertNotNull("process was null", actual);
***************
*** 67,72 ****
  
  		[Test]
! 		public void TestCreateHistoryProcessSsl()
! 		{				
  			DateTime from = new DateTime(2001, 1, 21, 20, 0, 0);
  			DateTime to = new DateTime(2002, 2, 22, 20, 0, 0);
--- 59,64 ----
  
  		[Test]
! 		public void CreateHistoryProcessSsl()
! 		{
  			DateTime from = new DateTime(2001, 1, 21, 20, 0, 0);
  			DateTime to = new DateTime(2002, 2, 22, 20, 0, 0);
***************
*** 75,85 ****
  
  			string expectedExecutable = @"c:\program files\sourcegear\vault client\vault.exe";
! 			string expectedArgs = string.Format(
! 				COMMAND_LINE_SSL,
! 				"$",
! 				"host",
! 				"username",
! 				"password",
! 				"repository");
  
  			AssertNotNull("process was null", actual);
--- 67,71 ----
  
  			string expectedExecutable = @"c:\program files\sourcegear\vault client\vault.exe";
! 			string expectedArgs = string.Format(COMMAND_LINE_SSL, "$", "host", "username", "password", "repository");
  
  			AssertNotNull("process was null", actual);
***************
*** 89,94 ****
  
  		[Test]
! 		public void TestValuesSet()
! 		{			
  			AssertEquals(@"c:\program files\sourcegear\vault client\vault.exe", _vault.Executable);
  			AssertEquals("username", _vault.Username);
--- 75,80 ----
  
  		[Test]
! 		public void ValuesSet()
! 		{
  			AssertEquals(@"c:\program files\sourcegear\vault client\vault.exe", _vault.Executable);
  			AssertEquals("username", _vault.Username);
***************
*** 101,105 ****
  		[Test]
  		[Ignore("user-specific vault test settings here")]
! 		public void HistoryDatesTest()
  		{
  			// change these values to reflect your live vault repository
--- 87,91 ----
  		[Test]
  		[Ignore("user-specific vault test settings here")]
! 		public void HistoryDates()
  		{
  			// change these values to reflect your live vault repository
***************
*** 108,112 ****
  			DateTime from = new DateTime(2004, 4, 20, 10, 0, 0);
  			DateTime to = new DateTime(2004, 4, 20, 11, 0, 0);
! 			
  			Modification[] mods = _vault.GetModifications(from, to);
  			AssertNotNull(mods);
--- 94,98 ----
  			DateTime from = new DateTime(2004, 4, 20, 10, 0, 0);
  			DateTime to = new DateTime(2004, 4, 20, 11, 0, 0);
! 
  			Modification[] mods = _vault.GetModifications(from, to);
  			AssertNotNull(mods);
***************
*** 130,132 ****
  		}
  	}
! }
--- 116,118 ----
  		}
  	}
! }
\ No newline at end of file