Merge pull request #191 from Nfactor26/load-test-cases-on-fixture-expanded

Load test cases only when the fixture is expanded

Author: Nfactor26

src/Pixel.Automation.TestExplorer.ViewModels/TestExplorerViewModel.cs

@@ -112,7 +112,7 @@ public TestExplorerViewModel(IEventAggregator eventAggregator, IAutomationProjec
         /// <summary>
         /// Load the fixtures and test case from local storage
         /// </summary>
-        async Task LoadDataAsync()
+        async Task LoadFixturesAsync()
         {
             try
             {
@@ -129,18 +129,6 @@ async Task LoadDataAsync()
                         }
                         TestFixtureViewModel testFixtureVM = new TestFixtureViewModel(testFixture);
                         this.TestFixtures.Add(testFixtureVM);
-
-                        foreach (var testCaseDirectory in Directory.GetDirectories(Path.Combine(this.fileSystem.TestCaseRepository, testFixture.FixtureId)))
-                        {
-                            var testCase = this.fileSystem.LoadFiles<TestCase>(testCaseDirectory).Single();
-                            if(testCase.IsDeleted)
-                            {
-                                continue;
-                            }
-                            TestCaseViewModel testCaseVM = new TestCaseViewModel(testCase);
-                            testFixtureVM.Tests.Add(testCaseVM);
-                        }
-
                     }
                     isInitialized = true;
                 }
@@ -151,6 +139,27 @@ async Task LoadDataAsync()
             }
         }
 
+        void LoadTestCasesForFixture(TestFixtureViewModel testFixtureViewModel)
+        {
+            try
+            {
+                foreach (var testCaseDirectory in Directory.GetDirectories(Path.Combine(this.fileSystem.TestCaseRepository, testFixtureViewModel.FixtureId)))
+                {
+                    var testCase = this.fileSystem.LoadFiles<TestCase>(testCaseDirectory).Single();
+                    if (testCase.IsDeleted)
+                    {
+                        continue;
+                    }
+                    TestCaseViewModel testCaseVM = new TestCaseViewModel(testCase);
+                    testFixtureViewModel.Tests.Add(testCaseVM);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex, "There was an error while trying to load test cases for fixture : {0}", testFixtureViewModel.DisplayName);
+            }
+        }        
+
         /// <summary>
         /// Setup the collection view with grouping and sorting
         /// </summary>
@@ -171,6 +180,14 @@ private void CreateDefaultView()
             });
         }
 
+        public void OnFixtureExpanded(TestFixtureViewModel testFixtureViewModel)
+        {
+            if(!testFixtureViewModel.Tests.Any())
+            {
+                LoadTestCasesForFixture(testFixtureViewModel);
+            }
+        }
+
         #endregion Constructor
 
         #region Test Fixture
@@ -1155,7 +1172,10 @@ private async Task<bool> TryRunTestCaseAsync(TestCaseViewModel testCaseVM)
         /// <returns></returns>
         protected override async Task OnInitializeAsync(CancellationToken cancellationToken)
         {
-            await LoadDataAsync();
+            if(!isInitialized)
+            {
+                await LoadFixturesAsync();
+            }
             await base.OnInitializeAsync(cancellationToken);
         }
 

src/Pixel.Automation.TestExplorer.Views/TestExplorerView.xaml

@@ -181,8 +181,9 @@
                     <ControlTemplate TargetType="TreeViewItem">
                         <StackPanel Orientation="Vertical">
                             <Expander x:Name="TestCategory" Header="{Binding DisplayName, Converter={StaticResource trimmedTextConverter}, ConverterParameter = 20}" 
-                                     Tag="{Binding DataContext, ElementName=TestExplorerTreeView}"
-                                     Background="{DynamicResource MahApps.Brushes.Window.Background}"   
+                                     Tag="{Binding DataContext, ElementName=TestExplorerTreeView}" Background="{DynamicResource MahApps.Brushes.Window.Background}" 
+                                     cal:Action.TargetWithoutContext="{Binding DataContext, ElementName=TestExplorerTreeView}"    
+                                     cal:Message.Attach="[Event Expanded] = [Action OnFixtureExpanded($dataContext)]"
                                      controls:HeaderedControlHelper.HeaderBackground="{DynamicResource MahApps.Brushes.Window.Background}"
                                      BorderThickness="0" Margin="5,0,0,0" FontSize="11">
                                 <ItemsPresenter x:Name="ItemsHost"/>