Merge branch 'development' of https://github.com/RHEAGROUP/CDP4-WebSe…

…rvices-Community-Edition into development
STARIONGROUP · Oct 19, 2018 · cb43f02 · cb43f02
2 parents a2a206e + a1f0f2d
commit cb43f02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CDP4WebServices.API.Tests/SideEffects/ParameterSideEffectTestFixture.cs b/CDP4WebServices.API.Tests/SideEffects/ParameterSideEffectTestFixture.cs
@@ -164,8 +164,8 @@ public void Setup()
             this.parameterService.Setup(x => x.Get(It.IsAny<NpgsqlTransaction>(), "SiteDirectory", It.Is<IEnumerable<Guid>>(y => y.Contains(this.cptParameterType.Iid)), this.securityContext.Object))
                     .Returns(new List<Thing> { this.cptParameterType });
 
-            this.iterationService.Setup(x => x.GetShallow(null, "partition", null, this.securityContext.Object))
-                .Returns(new List<Thing> { this.iteration });
+            this.iterationService.Setup(x => x.GetActiveIteration(null, "partition", this.securityContext.Object))
+                .Returns( this.iteration );
 
             this.actualFiniteStateListService.Setup(x => x.GetShallow(It.IsAny<NpgsqlTransaction>(), "partition", It.Is<IEnumerable<Guid>>(y => y.Contains(this.actualList.Iid)), this.securityContext.Object))
                 .Returns(new List<Thing> { this.actualList });

diff --git a/CDP4WebServices.API.Tests/SideEffects/PossibleFiniteStateSideEffectTestFixture.cs b/CDP4WebServices.API.Tests/SideEffects/PossibleFiniteStateSideEffectTestFixture.cs
@@ -183,8 +183,8 @@ public void Setup()
                 x => x.GetShallow(this.transaction, this.partition, It.IsAny<IEnumerable<Guid>>(), this.securityContext.Object))
                 .Returns(new List<Thing> {this.as11, this.as12});
 
-            this.iterationService.Setup(x => x.GetShallow(this.transaction, this.partition, null, this.securityContext.Object))
-                .Returns(new List<Thing> {this.iteration});
+            this.iterationService.Setup(x => x.GetActiveIteration(this.transaction, this.partition, this.securityContext.Object))
+                .Returns(this.iteration);
 
             this.parameter1 = new Parameter(Guid.NewGuid(), 1);
             this.parameter1.StateDependence = this.asl1.Iid;