Fixed #26. started with #13

src/Tests/ShellViewModel/ShellViewModelBase.UnitTest.cs

@@ -0,0 +1,42 @@
+using NUnit.Framework;
+using Rhino.Mocks;
+using StreamCompanion.Contract;
+using StreamCompanion.Contract.ShellBase.Shell;
+using StreamCompanion.Contract.ShellBase.Uic.Step;
+using StreamCompanion.ShellViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamCompanion.Tests.ShellViewModel
+{
+ [TestFixture]
+ public class ShellViewModelBaseUnitTest
+ {
+ private IController controller;
+ private IStepUIC stepUICMock;
+ private MainShellViewModel shellViewModelSUT;
+
+ [SetUp]
+ public void SetUp() 
+ {
+ controller = MockRepository.GenerateMock<IController>();
+ stepUICMock = MockRepository.GenerateMock<IStepUIC>();
+ shellViewModelSUT = new MainShellViewModel(controller, stepUICMock);
+ }
+
+ [Test]
+ public void CanReturnTheCorrectSteps() 
+ {
+ Assert.AreEqual(stepUICMock, shellViewModelSUT.Steps[0]);
+ }
+
+ [Test]
+ public void CanReturnTheCorrectSelectedItem()
+ {
+ Assert.AreEqual(stepUICMock, shellViewModelSUT.SelectedItem);
+ }
+ }
+}

src/Tests/Tests.csproj

@@ -73,6 +73,7 @@
  <Compile Include="JsonConverter\DeserializedRoot.UnitTest.cs" />
  <Compile Include="JsonConverter\SerializedRoot.UnitTest.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ShellViewModel\ShellViewModelBase.UnitTest.cs" />
  <Compile Include="StreamTemplate\StreamItem.UnitTest.cs" />
  <Compile Include="StreamTemplate\Model.UnitTest.cs" />
  <Compile Include="StreamTemplate\ViewModel.UnitTest.cs" />

src/contract/contract.csproj

@@ -65,9 +65,8 @@
  <Compile Include="IController.cs" />
  <Compile Include="ISerieStepUIC.cs" />
  <Compile Include="IStreamManager.cs" />
- <Compile Include="Json\Deserialize\IDeserializedRoot.cs" />
  <Compile Include="Json\IConverter.cs" />
- <Compile Include="Json\Serialize\ISerializedRoot.cs" />
+ <Compile Include="Json\IConverterRoot.cs" />
  <Compile Include="ISerie.cs" />
  <Compile Include="IProgress.cs" />
  <Compile Include="IView.cs" />

src/contract/json/IConverter.cs

@@ -1,24 +1,22 @@
-using StreamCompanion.Contract.Json.Deserialize;
-using StreamCompanion.Contract.Json.Serialize;
-using StreamCompanion.Contract.StreamTemplate;
+using StreamCompanion.Contract.StreamTemplate;
 using System;
 using System.Collections.Generic;
 
 namespace StreamCompanion.Contract.Json
 {
  public interface IConverter
  {
- ISerializedRoot Convert(
+ IConverterRoot Convert(
  Guid id,
  IEnumerable<ISerie> currentlyWatching,
  IEnumerable<ISerie> completed,
  IEnumerable<ISerie> onHold,
  IEnumerable<ISerie> dropped,
  IEnumerable<ISerie> planToWatch);
 
- void Export(ISerializedRoot serializedRoot, string inputFileFullname);
+ void Export(IConverterRoot serializedRoot, string inputFileFullname);
 
- IDeserializedRoot Import(string inputFileFullname);
+ IConverterRoot Import(string inputFileFullname);
 
  void ExportStreams(IModel model, string inputFileFullname);
  IModel ImportStreams(string inputFileFullname);

src/contract/json/serialize/ISerializedRoot.cs → src/contract/json/IConverterRoot.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-namespace StreamCompanion.Contract.Json.Serialize
+namespace StreamCompanion.Contract.Json
 {
- public interface ISerializedRoot
+ public interface IConverterRoot
  {
  Guid Id { get; }
 

src/controller/MainController.cs

@@ -1,6 +1,5 @@
 using StreamCompanion.Contract;
 using StreamCompanion.Contract.Json;
-using StreamCompanion.Contract.Json.Deserialize;
 using StreamCompanion.Contract.ShellBase.Model;
 using StreamCompanion.Contract.StreamTemplate;
 using StreamCompanion.JsonConverter;
@@ -110,7 +109,7 @@ private void LoadData()
  new Task(() => this.LoadData(root)).Start();
  }
 
- private void LoadData(IDeserializedRoot root)
+ private void LoadData(IConverterRoot root)
  {
  foreach (var serie in root.CurrentlyWatching)
  {

src/jsonconverter/Converter.cs

@@ -1,7 +1,5 @@
 using StreamCompanion.Contract;
 using StreamCompanion.Contract.Json;
-using StreamCompanion.Contract.Json.Deserialize;
-using StreamCompanion.Contract.Json.Serialize;
 using StreamCompanion.Contract.StreamTemplate;
 using StreamCompanion.StreamTemplate;
 using helper.filehelper;
@@ -16,7 +14,7 @@ namespace StreamCompanion.JsonConverter
 {
  public class Converter : IConverter
  {
- public ISerializedRoot Convert(
+ public IConverterRoot Convert(
  Guid id,
  IEnumerable<ISerie> currentlyWatching,
  IEnumerable<ISerie> completed,
@@ -27,7 +25,7 @@ public ISerializedRoot Convert(
  return new SerializedRoot(id, currentlyWatching, completed, onHold, dropped, planToWatch);
  }
 
- public void Export(ISerializedRoot serializedRoot, string inputFileFullname)
+ public void Export(IConverterRoot serializedRoot, string inputFileFullname)
  {
  using (var fileStream = File.Open(inputFileFullname, FileMode.Create))
  using (var streamWriter = new StreamWriter(fileStream, Encoding.GetEncoding("Windows-1252")))
@@ -42,7 +40,7 @@ public void Export(ISerializedRoot serializedRoot, string inputFileFullname)
  }
  }
 
- public IDeserializedRoot Import(string inputFileFullname)
+ public IConverterRoot Import(string inputFileFullname)
  {
  var readLines = new FileHelper().ReadAllLines(inputFileFullname);
  string value = readLines.Aggregate(string.Empty, (current, line) => current + line);

src/jsonconverter/DeserializedRoot.cs

@@ -1,12 +1,12 @@
 using StreamCompanion.Contract;
-using StreamCompanion.Contract.Json.Deserialize;
+using StreamCompanion.Contract.Json;
 using StreamCompanion.ItemViewModel;
 using System;
 using System.Collections.Generic;
 
 namespace StreamCompanion.JsonConverter
 {
- public class DeserializedRoot : IDeserializedRoot
+ public class DeserializedRoot : IConverterRoot
  {
  public DeserializedRoot(
  Guid id,

src/jsonconverter/SerializedRoot.cs

@@ -1,11 +1,11 @@
 using StreamCompanion.Contract;
-using StreamCompanion.Contract.Json.Serialize;
+using StreamCompanion.Contract.Json;
 using System;
 using System.Collections.Generic;
 
 namespace StreamCompanion.JsonConverter
 {
- public class SerializedRoot : ISerializedRoot
+ public class SerializedRoot : IConverterRoot
  {
  public SerializedRoot(Guid id, IEnumerable<ISerie> currentlyWatching, IEnumerable<ISerie> completed, IEnumerable<ISerie> onHold, IEnumerable<ISerie> dropped, IEnumerable<ISerie> planToWatch)
  {

src/viewmodel/ShellViewModelBase.cs

@@ -15,6 +15,10 @@ public abstract class ShellViewModelBase : ViewModelBase<IShellViewModel>, IShel
  private readonly IController controller;
  private StreamTemplateView tempStreamTemplateView;
 
+ public ShellViewModelBase()
+ {
+ }
+
  protected ShellViewModelBase(IController controller, params IStepUIC[] stepUics)
  {
  this.IsEnabled = true;