Merge lp:~mandel/ubuntuone-windows-installer/split_objects_definition into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

This branch provides the split of the object definitions for the IoC in different assemblies so that we can easily keep track of them and add inject different ones according to the assembly.

[Tim Cole (tcole)]

Seems to have merge conflicts.

review: Needs Fixing

[lp:~mandel/ubuntuone-windows-installer/split_objects_definition]

71. By Manuel de la Peña on 2010-08-02

Merge with trunk.

[Manuel de la Peña (mandel)]

Conflicts have been fixed.

[Tim Cole (tcole)]

Looks okay, I think... I wonder if there isn't a less verbose/more automatic way to handle the localized strings though. Metaprogramming?

review: Approve

[Manuel de la Peña (mandel)]

> Looks okay, I think... I wonder if there isn't a less verbose/more automatic
> way to handle the localized strings though. Metaprogramming?
Interesting though, which part did you find verbose?

[lp:~mandel/ubuntuone-windows-installer/split_objects_definition]

72. By Manuel de la Peña on 2010-08-04

Merge with parent

[John Lenton (chipaca)]

review: Approve

[lp:~mandel/ubuntuone-windows-installer/split_objects_definition]

73. By Manuel de la Peña on 2010-08-05

Merge with parent.

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-05 19:29:41 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-05 19:29:42 +0000
@@ -213,6 +213,9 @@
       <Name>Canonical.UbuntuOne.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objects.xml" />
+  </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.

=== added file 'src/Canonical.UbuntuOne.Client.Views/objects.xml'
--- src/Canonical.UbuntuOne.Client.Views/objects.xml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/objects.xml	2010-08-05 19:29:42 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  <!-- Regsiter the different objects that are available in the assembly -->
+  <object id="DownloadingView"
+            type="Canonical.UbuntuOne.Client.Views.Update.DownloadingView, Canonical.UbuntuOne.Client.Views" />
+  
+  <object id="UpdatingView"
+          type="Canonical.UbuntuOne.Client.Views.Update.UpdatingView, Canonical.UbuntuOne.Client.Views" />
+  
+  <object id="UbuntuOneNotifyIcon"
+          type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" />
+
+  <object id="MessageBox"
+          type="Canonical.UbuntuOne.Client.Views.UbuntuOneMessageBox, Canonical.UbuntuOne.Client.Views" />
+</objects>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-05 19:29:41 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj	2010-08-05 19:29:42 +0000
@@ -161,5 +161,8 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objects.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdater.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdater.cs	2010-08-05 19:29:41 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdater.cs	2010-08-05 19:29:42 +0000
@@ -35,11 +35,6 @@
         string RSSFeed { get; set; }
 
         /// <summary>
-        /// Gets and sets the view that will be used to ask for confirmation when an update exists.
-        /// </summary>
-        IDownloadingPresenter DownloadingPresenter { get; set; }
-
-        /// <summary>
         /// Returns if the are updates present for the application.
         /// </summary>
         /// <returns>A flag indicating if updates are available.</returns>

=== added file 'src/Canonical.UbuntuOne.Common/objects.xml'
--- src/Canonical.UbuntuOne.Common/objects.xml	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Common/objects.xml	2010-08-05 19:29:42 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  
+  <!-- ######################################################################################## -->
+  <!--                                 General Objects                                          -->
+  <!-- ######################################################################################## -->
+  
+  <object id="Authentication"
+          type="Canonical.UbuntuOne.Common.SyncDaemonAuthentication, Canonical.UbuntuOne.Common" 
+          autowire="autodetect"/>
+  
+  <object id="ProcessManager"
+          type="Canonical.UbuntuOne.Common.ProcessManager, Canonical.UbuntuOne.Common" 
+          autowire="autodetect"/>
+
+  <!-- ######################################################################################## -->
+  <!--                               Updater objects                                            -->
+  <!-- ######################################################################################## -->
+
+  <object id="DownloadingPresenter"
+          type="Canonical.UbuntuOne.Common.Update.DownloadingPresenter, Canonical.UbuntuOne.Common"
+          autowire="autodetect"/>
+
+  <object id="UpdatingPresenter"
+          type="Canonical.UbuntuOne.Common.Update.UpdatingPresenter, Canonical.UbuntuOne.Common"
+          autowire="autodetect"/>
+  
+  <object id="Updater"
+          type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common"
+          autowire="autodetect">
+    <property name="RSSFeed"
+              value="http://path/to/rss.feed"/> <!-- Provide a way to set this through config ????-->
+  </object>
+  
+  
+  
+</objects>
+  
\ No newline at end of file

=== added directory 'src/UbuntuOneClient.Tests/Config'
=== added file 'src/UbuntuOneClient.Tests/ConfigurationFixture.cs'
--- src/UbuntuOneClient.Tests/ConfigurationFixture.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient.Tests/ConfigurationFixture.cs	2010-08-05 19:29:42 +0000
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using Canonical.UbuntuOne.Common.Container;
+using Canonical.UbuntuOne.Common.Update;
+using NUnit.Framework;
+
+namespace UbuntuOneClient.Tests
+{
+    /// <summary>
+    /// Intergation test class that test that the configuration of the client app has been correctly done.
+    /// </summary>
+    [TestFixture]
+    public class ConfigurationFixture
+    {
+        #region Tests
+
+        [Test]
+        public void ProgramIsNotNullTest()
+        {
+            Assert.IsNotNull(ObjectsContainer.GetImplementationOf<Program>());
+        }
+
+        [Test]
+        public void UpdaterIsNotNull()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            Assert.IsNotNull(program.Updater);
+        }
+
+        [Test]
+        public void NotifyIconIsNotNull()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            Assert.IsNotNull(program.NotifyIcon);
+        }
+
+        [Test]
+        public void ApplicationIsNotNull()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            Assert.IsNotNull(program.Application);
+        }
+
+        [Test]
+        public void DownloadingPresenterIsNotNull()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            var updater = program.Updater as Updater;
+            if(updater != null)
+            {
+                Assert.IsNotNull(updater.DownloadingPresenter);
+            }
+            else
+            {
+                Assert.Inconclusive("The integration test cannot be ran because the expected inject type was {0}", typeof(Updater));
+            }
+        }
+
+        [Test]
+        public void DownloadingPresenterHasView()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            var updater = program.Updater as Updater;
+            if (updater != null)
+            {
+                var presenter = updater.DownloadingPresenter;
+                Assert.IsNotNull(presenter.View);
+            }
+            else
+            {
+                Assert.Inconclusive("The integration test cannot be ran because the expected inject type was {0}", typeof(Updater));
+            }
+        }
+
+        [Test]
+        public void UpdatingPresenterIsNotNull()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            var updater = program.Updater as Updater;
+            if (updater != null)
+            {
+                Assert.IsNotNull(updater.UpdatingPresenter);
+            }
+            else
+            {
+                Assert.Inconclusive("The integration test cannot be ran because the expected inject type was {0}", typeof(Updater));
+            }
+        }
+
+        [Test]
+        public void UpdatingPresetnerHasView()
+        {
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            var updater = program.Updater as Updater;
+            if (updater != null)
+            {
+                var presenter = updater.UpdatingPresenter;
+                Assert.IsNotNull(presenter.View);
+            }
+            else
+            {
+                Assert.Inconclusive("The integration test cannot be ran because the expected inject type was {0}", typeof(Updater));
+            }
+        }
+
+
+        #endregion
+    }
+}

=== modified file 'src/UbuntuOneClient.Tests/ProgramFixture.cs'
--- src/UbuntuOneClient.Tests/ProgramFixture.cs	2010-08-05 19:29:41 +0000
+++ src/UbuntuOneClient.Tests/ProgramFixture.cs	2010-08-05 19:29:42 +0000
@@ -17,6 +17,7 @@
  * 
  * Authors: Manuel de la Peña <[e-mail]>
  */
+using System;
 using System.Windows;
 using Canonical.UbuntuOne.Client.Notification;
 using Canonical.UbuntuOne.Common.Update;
@@ -52,7 +53,7 @@
             _app = _mocks.StrictMock<IApplication>();
             _program = new Program
             {
-                NotifyIcon = _notifyIcon, 
+                NotifyIcon = _notifyIcon,
                 Updater = _updater,
                 Application = _app
             };
@@ -72,11 +73,11 @@
         [Test]
         public void StartApplicationNoUpdates()
         {
-            using(_mocks.Record())
+            using (_mocks.Record())
             {
                 // expect the application shutdown mode to change
                 _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;
-   
+
                 // expect that we are calling the run with the correct window
                 Expect.Call(() => _app.Run(_notifyIcon))
                     .Repeat.Once();
@@ -86,7 +87,7 @@
                 Expect.Call(_updater.UpdatesArePresent())
                     .Return(false);
             }
-            using(_mocks.Playback())
+            using (_mocks.Playback())
             {
                 _program.StartApplication();
             }
@@ -109,9 +110,10 @@
                 Expect.Call(_updater.UpdatesArePresent())
                     .Return(true);
 
-                Expect.Call(() => _updater.PerformUpdate());
+                Expect.Call(() => _updater.PerformUpdate())
+                    .Repeat.Any();
             }
-            using(_mocks.Playback())
+            using (_mocks.Playback())
             {
                 _program.StartApplication();
             }
@@ -120,7 +122,7 @@
         [Test]
         public void StartApplicationWithCheckUpdatesExceptionTest()
         {
-            using(_mocks.Record())
+            using (_mocks.Record())
             {
                 _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
@@ -133,7 +135,7 @@
                     .Throw(new SelfUpdateException());
 
             }
-            using(_mocks.Playback())
+            using (_mocks.Playback())
             {
                 _program.StartApplication();
             }

=== modified file 'src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs'
--- src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	2010-07-28 11:01:32 +0000
+++ src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	2010-08-05 19:29:42 +0000
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using NUnit.Framework;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -34,3 +35,5 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+// Tell NUNi to run tests in STA
+[assembly: RequiresSTA]

=== added file 'src/UbuntuOneClient.Tests/SetupClass.cs'
--- src/UbuntuOneClient.Tests/SetupClass.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient.Tests/SetupClass.cs	2010-08-05 19:29:42 +0000
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using Canonical.UbuntuOne.Common.Container;
+using NUnit.Framework;
+
+namespace UbuntuOneClient.Tests
+{
+    /// <summary>
+    /// Set up class ran before any test.
+    /// </summary>
+    [SetUpFixture]
+    public class SetupClass
+    {
+        [SetUp]
+        public void Setup()
+        {
+            ObjectsContainer.Initialize(new SpringContainer());
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            ObjectsContainer.Clear();
+        }
+    }
+}

=== modified file 'src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj'
--- src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-07-28 11:01:32 +0000
+++ src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-08-05 19:29:42 +0000
@@ -31,6 +31,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Spring.Net\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\log4net\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Nunit\nunit.framework.dll</HintPath>
@@ -59,10 +67,16 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConfigurationFixture.cs" />
     <Compile Include="ProgramFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SetupClass.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj">
+      <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>
+      <Name>Canonical.UbuntuOne.Client.Views</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj">
       <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
       <Name>Canonical.UbuntuOne.Client</Name>
@@ -76,6 +90,14 @@
       <Name>UbuntuOneClient</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\UbuntuOneClient\App.config">
+      <Link>App.config</Link>
+    </None>
+    <None Include="..\UbuntuOneClient\Config\log4net.config">
+      <Link>Config\log4net.config</Link>
+    </None>
+  </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.

=== modified file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config	2010-07-28 07:47:45 +0000
+++ src/UbuntuOneClient/App.config	2010-08-05 19:29:42 +0000
@@ -14,9 +14,27 @@
                type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
     </sectionGroup>
   </configSections>
+
+  <!-- logging configuration -->
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+        <!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
+        <!-- otherwise BasicConfigurer.Configure is used   -->
+        <!-- log4net configuration file is specified with key configFile-->
+        <arg key="configType"
+             value="FILE" />
+        <arg key="configFile"
+             value="~/Config/log4net.config" />
+      </factoryAdapter>
+    </logging>
+  </common>
+  
   <spring>
     <context>
       <resource uri="assembly://UbuntuOneClient/UbuntuOneClient/objects.xml" />
+      <resource uri="assembly://Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views/objects.xml" />
+      <resource uri="assembly://Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common/objects.xml" />
     </context>
     
   </spring>

=== modified file 'src/UbuntuOneClient/Program.cs'
--- src/UbuntuOneClient/Program.cs	2010-07-28 14:35:45 +0000
+++ src/UbuntuOneClient/Program.cs	2010-08-05 19:29:42 +0000
@@ -38,6 +38,7 @@
         private INotificationIconView _notifyIcon;
         private readonly object _notifyIconLock = new object();
         private Thread _updatesThread;
+
         #region DI Properties for testability
 
         /// <summary>

=== modified file 'src/UbuntuOneClient/objects.xml'
--- src/UbuntuOneClient/objects.xml	2010-07-28 14:35:45 +0000
+++ src/UbuntuOneClient/objects.xml	2010-08-05 19:29:42 +0000
@@ -2,13 +2,11 @@
 <objects xmlns="http://www.springframework.net">
   <!--  Define window that will be used as the start point of the app -->
   <object id="Updater"
-          type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common" >
+          type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common" 
+          autowire="autodetect">
     <property name="RSSFeed"
               value="http://path/to/rss.feed"/>
   </object>
-  
-  <object id="UbuntuOneNotifyIcon"
-          type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" />
 
   <object id="Application"
           type="UbuntuOneClient.ApplicationWrapper, UbuntuOneClient" />