changeset 242:5cc1681d3789

Combinar
author juanjose.montesdeocaarbos
date Wed, 05 Oct 2011 07:57:21 -0300
parents a7daa939ef0c (diff) b43dc14886e3 (current diff)
children 59f8fa2f835e
files Agendas/trunk/db/v1.0/01 - Otros Ponentes.sql Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs Agendas/trunk/src/Agendas.Twitter.Tests/Publicador_tests.cs Agendas/trunk/src/Agendas.Web.Tests/Agendas.Web.Tests.csproj Agendas/trunk/src/Agendas.Web.Tests/Controllers/EventoControllerTests.cs Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/OtrosPonentes.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/Ponente.cshtml
diffstat 6 files changed, 35 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs	Tue Oct 04 21:59:40 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs	Wed Oct 05 07:57:21 2011 -0300
@@ -19,7 +19,7 @@
 			Session.Delete(evento);
 		}
 
-		public Evento Get(Guid vanId)
+		public new Evento Get(Guid vanId)
 		{
 			return Session.Get<Evento>(vanId);
 		}
--- a/Agendas/trunk/src/Agendas.Twitter.Tests/Publicador_tests.cs	Tue Oct 04 21:59:40 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Twitter.Tests/Publicador_tests.cs	Wed Oct 05 07:57:21 2011 -0300
@@ -98,7 +98,7 @@
 			Assert.That(joined, Is.StringContaining("@nelopauselli"));
 
 			Assert.AreEqual(2, twitters.Count());
-			Assert.AreEqual("Se ha agendando el evento Identity Providers Públicos y Empresariales con @carlospeix y @nelopauselli para el 01/10/2011...", twitters.First());
+			Assert.AreEqual(string.Format("Se ha agendando el evento Identity Providers Públicos y Empresariales con @carlospeix y @nelopauselli para el {0}...", inicio.ToString("dd/MM/yyyy")), twitters.First());
 			Assert.AreEqual("...por http://snipr.com/virtualaltnet", twitters.Last());
 
 			adapter.Verify(a => a.Update(It.IsAny<string>(), out message), Times.Exactly(2));
@@ -129,7 +129,7 @@
 				Assert.LessOrEqual(twitter.Length, 140);
 				joined += twitter;
 			}
-			Assert.AreEqual("Se ha agendando el evento Identity Providers Públicos y Empresariales para el 01/10/2011 por http://snipr.com/virtualaltnet", joined);
+            Assert.AreEqual(string.Format("Se ha agendando el evento Identity Providers Públicos y Empresariales para el {0} por http://snipr.com/virtualaltnet", inicio.ToString("dd/MM/yyyy")), joined);
 
 			adapter.Verify(a => a.Update(It.IsAny<string>(), out message), Times.Once());
 
--- a/Agendas/trunk/src/Agendas.Web.Tests/Agendas.Web.Tests.csproj	Tue Oct 04 21:59:40 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web.Tests/Agendas.Web.Tests.csproj	Wed Oct 05 07:57:21 2011 -0300
@@ -31,7 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL" />
     <Reference Include="NHibernate.ByteCode.Castle">
       <HintPath>..\packages\NHibernate.Castle.3.1.0.4000\lib\Net35\NHibernate.ByteCode.Castle.dll</HintPath>
@@ -85,6 +87,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
--- a/Agendas/trunk/src/Agendas.Web.Tests/Controllers/EventoControllerTests.cs	Tue Oct 04 21:59:40 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web.Tests/Controllers/EventoControllerTests.cs	Wed Oct 05 07:57:21 2011 -0300
@@ -22,6 +22,7 @@
 			var seguridad = new Mock<ISeguridad>();
 			seguridad.Setup(s => s.GetUserName()).Returns("neluz");
 			IdentityContext.Init(seguridad.Object, new PersonaRepository(NhHelper.GetSessionFactory()));
+
 		}
 
 		[Test]
@@ -45,15 +46,19 @@
 				var resultNuevo = eventoController.Nuevo(eventoNew);
 			}
 
-			//var eventoPublicar = new EventoPublicarModel
-			//                {
-			//                    NroOrden = 1,
-			//                    Titulo = "Título 1",
-			//                    UrlWiki = "http://www.altnethistpano.org/vans/titulo-1.ashx",
-			//                    DuracionReal = new TimeSpan()
-			//                };
+            var eventoPublicar = new EventoPublicarModel
+                                     {
+                                         NroOrden = 1,
+                                         Titulo = "Título 1",
+                                         UrlWiki = "http://www.altnethistpano.org/vans/titulo-1.ashx",
+                                         DuracionReal = new TimeSpan(0, 0, 0)
+                                     };
 
-			//var resultPublicar = eventoController.Publicar(eventoPublicar);
-		}
-	}
+            using (new RequestEmulator(NhHelper.GetSessionFactory()))
+            {
+                var resultPublicar = eventoController.Publicar(eventoPublicar);
+            }
+        }
+    }
+
 }
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Agendas/trunk/src/Agendas.Web.Tests/packages.config	Wed Oct 05 07:57:21 2011 -0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.5.10.11092" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="Iesi.Collections" version="3.1.0.4000" />
+  <package id="NHibernate" version="3.1.0.4000" />
+  <package id="ConfOrm" version="1.0.1.5" />
+  <package id="Castle.Core" version="2.5.2" />
+  <package id="NHibernate.Castle" version="3.1.0.4000" />
+</packages>
\ No newline at end of file
--- a/Agendas/trunk/src/install packages.bat	Tue Oct 04 21:59:40 2011 -0300
+++ b/Agendas/trunk/src/install packages.bat	Wed Oct 05 07:57:21 2011 -0300
@@ -7,5 +7,6 @@
 ..\tools\nuget i Agendas.Twitter.Tests\packages.config -o packages
 ..\tools\nuget i Agendas.Google\packages.config -o packages
 ..\tools\nuget i Agendas.Google.Test\packages.config -o packages
+..\tools\nuget i Agendas.Web.Tests\packages.config -o packages
 
 PAUSE
\ No newline at end of file