Merge branch 'IES_Toolkit-#236-NUnitTestsPush' of https://github.com/…

…BHoM/IES_Toolkit into IES_Toolkit-#236-NUnitTestsPush
BHoM · Oct 24, 2023 · 96d0902 · 96d0902
2 parents 1207a36 + 7fdf031
commit 96d0902
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/.ci/unit-tests/IES_Adapter_Test/PushTests.cs b/.ci/unit-tests/IES_Adapter_Test/PushTests.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
  * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
@@ -21,6 +22,9 @@
  */
 
 using BH.Adapter.IES;
+=======
+using BH.Adapter.IES;
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
 using BH.oM.Adapter;
 using BH.oM.Data.Requests;
 using BH.oM.Environment.Elements;
@@ -106,22 +110,28 @@ public void PushPanelsWith3DShades()
             m_PullConfig.PullOpenings = true;
             List<Panel> panels = Engine.Adapters.File.Compute.ReadFromJsonFile(Path.Combine(m_PullConfig.File.Directory, "Test Model 3D Shades.json"), true).Where(x => x.GetType() == typeof(Panel)).Cast<Panel>().ToList();
 
+<<<<<<< HEAD
             int count = 0;
             foreach (Panel panel in panels)
             {
                 panel.Name = count.ToString();
                 count++;
             }
 
+=======
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
             m_Adapter.Push(panels, actionConfig: m_PushConfig);
 
             List<IBHoMObject> objs = m_Adapter.Pull(request, actionConfig:m_PullConfig).Cast<IBHoMObject>().ToList();
 
             List<Space> pulledSpaces = BH.Engine.Environment.Query.Spaces(objs).Cast<Space>().ToList();
             List<Panel> pulledPanels = BH.Engine.Environment.Query.Panels(objs).Cast<Panel>().ToList();
 
+<<<<<<< HEAD
             pulledPanels = BH.Engine.Data.Query.OrderBy(pulledPanels, "Name");
 
+=======
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
             List<Panel> shades = new List<Panel>();
             foreach (Panel panel in pulledPanels)
             {
@@ -131,12 +141,18 @@ public void PushPanelsWith3DShades()
                 }
             }
 
+<<<<<<< HEAD
             pulledPanels.Volume().Should().Be(panels.Volume());
             for (int i = 0; i < panels.Count; i++)
             {
                 pulledPanels[i].IsIdentical(panels[i]).Should().BeTrue($"The panel pulled with name: {pulledPanels[i].Name}, was not identical to the panel originally pushed with the same name.");
             }
 
+=======
+            pulledPanels.Count.Should().Be(121, "Wrong number of panels pulled compared to expected.");
+            pulledPanels.OpeningsFromElements().Count.Should().Be(33, "Wrong number of openings pulled compared to expected.");
+            shades.Count.Should().Be(62, "Wrong number of shades being pulled compared to expected.");
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
             pulledSpaces.Count.Should().Be(14, "Wrong number of spaces pulled compared to expected.");
         }
 
@@ -150,22 +166,28 @@ public void PushPanelsWith2DShades()
             m_PullConfig.PullOpenings = true;
             List<Panel> panels = Engine.Adapters.File.Compute.ReadFromJsonFile(Path.Combine(m_PullConfig.File.Directory, "Test Model 2D Shades.json"), true).Where(x => x.GetType() == typeof(Panel)).Cast<Panel>().ToList();
 
+<<<<<<< HEAD
             int count = 0;
             foreach (Panel panel in panels)
             {
                 panel.Name = count.ToString();
                 count++;
             }
 
+=======
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
             m_Adapter.Push(panels, actionConfig: m_PushConfig);
 
             List<IBHoMObject> objs = m_Adapter.Pull(request, actionConfig: m_PullConfig).Cast<IBHoMObject>().ToList();
 
             List<Space> pulledSpaces = BH.Engine.Environment.Query.Spaces(objs).Cast<Space>().ToList();
             List<Panel> pulledPanels = BH.Engine.Environment.Query.Panels(objs).Cast<Panel>().ToList();
 
+<<<<<<< HEAD
             pulledPanels = BH.Engine.Data.Query.OrderBy(pulledPanels, "Name");
 
+=======
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
             List<Panel> shades = new List<Panel>();
             foreach (Panel panel in pulledPanels)
             {
@@ -175,6 +197,7 @@ public void PushPanelsWith2DShades()
                 }
             }
 
+<<<<<<< HEAD
             pulledPanels.Volume().Should().Be(panels.Volume());
             for (int i = 0; i < panels.Count; i++)
             {
@@ -183,5 +206,14 @@ public void PushPanelsWith2DShades()
 
             pulledSpaces.Count.Should().Be(9, "Wrong number of spaces pulled compared to expected.");
         }
+=======
+            pulledPanels.Count.Should().Be(121, "Wrong number of panels pulled compared to expected.");
+            pulledPanels.OpeningsFromElements().Count.Should().Be(33, "Wrong number of openings pulled compared to expected.");
+            shades.Count.Should().Be(62, "Wrong number of shades being pulled compared to expected.");
+            pulledSpaces.Count.Should().Be(9, "Wrong number of spaces pulled compared to expected.");
+        }
+
+
+>>>>>>> 7fdf031b4f3abbc1a97b129a537e5a944de14a64
     }
 }