Fix test imports and broken tests in test_iterators.jl.

Author: Jack Dunham

test/solvers/test_default_kwargs.jl

@@ -6,8 +6,6 @@ module KwargsTestModule
 using ITensorNetworks
 using ITensorNetworks: AbstractProblem, @default_kwargs
 
-export TestProblem, NotOurTestProblem, test_function
-
 struct TestProblem <: AbstractProblem end
 struct NotOurTestProblem <: AbstractProblem end
 
@@ -21,26 +19,24 @@ end
 end # KwargsTestModule
 
 @testset "Default kwargs" begin
-  using .KwargsTestModule: TestProblem, NotOurTestProblem, test_function
+  import .KwargsTestModule
 
-  our_iter = RegionIterator(TestProblem(), ["region" => (; test_function_kwargs=(; int=1))], 1)
-  not_our_iter = RegionIterator(NotOurTestProblem(), ["region" => (; test_function_kwargs=(; int=2))], 1)
+  our_iter = RegionIterator(KwargsTestModule.TestProblem(), ["region" => (; test_function_kwargs=(; int=1))], 1)
+  not_our_iter = RegionIterator(KwargsTestModule.NotOurTestProblem(), ["region" => (; test_function_kwargs=(; int=2))], 1)
 
-  kw = region_kwargs(test_function, our_iter)
+  kw = region_kwargs(KwargsTestModule.test_function, our_iter)
   @test kw == (; int=1)
-  kw_not = region_kwargs(test_function, not_our_iter)
+  kw_not = region_kwargs(KwargsTestModule.test_function, not_our_iter)
   @test kw_not == (; int=2)
 
-  @info methods(default_kwargs)
-
   # Test dispatch
-  @test default_kwargs(test_function, problem(our_iter)) == (; bool=true, int=0)
-  @test default_kwargs(test_function, problem(our_iter) |> typeof) == (; bool=true, int=0)
+  @test default_kwargs(KwargsTestModule.test_function, problem(our_iter)) == (; bool=true, int=0)
+  @test default_kwargs(KwargsTestModule.test_function, problem(our_iter) |> typeof) == (; bool=true, int=0)
 
-  @test default_kwargs(test_function, problem(not_our_iter)) == (; bool=false, int=3)
-  @test default_kwargs(test_function, problem(not_our_iter) |> typeof) == (; bool=false, int=3)
+  @test default_kwargs(KwargsTestModule.test_function, problem(not_our_iter)) == (; bool=false, int=3)
+  @test default_kwargs(KwargsTestModule.test_function, problem(not_our_iter) |> typeof) == (; bool=false, int=3)
 
-  @test test_function(problem(our_iter); default_kwargs(test_function, problem(our_iter); kw...)...) == (true, 1)
-  @test test_function(problem(not_our_iter); default_kwargs(test_function, problem(not_our_iter); kw_not...)...) == (false, 2)
+  @test KwargsTestModule.test_function(problem(our_iter); default_kwargs(KwargsTestModule.test_function, problem(our_iter); kw...)...) == (true, 1)
+  @test KwargsTestModule.test_function(problem(not_our_iter); default_kwargs(KwargsTestModule.test_function, problem(not_our_iter); kw_not...)...) == (false, 2)
 
 end

test/solvers/test_iterators.jl

@@ -1,5 +1,5 @@
 using Test: @test, @testset
-using ITensorNetworks: SweepIterator, laststep, state, increment!, compute!, eachregion
+using ITensorNetworks: SweepIterator, islaststep, state, increment!, compute!, eachregion
 
 module TestIteratorUtils
 
@@ -10,7 +10,7 @@ struct TestProblem <: ITensorNetworks.AbstractProblem
 end
 ITensorNetworks.region_plan(::TestProblem) = [:a => (; val=1), :b => (; val=2)]
 function ITensorNetworks.compute!(iter::ITensorNetworks.RegionIterator{<:TestProblem})
-  kwargs = ITensorNetworks.current_region_kwargs(iter)
+  kwargs = ITensorNetworks.region_kwargs(iter)
   push!(ITensorNetworks.problem(iter).data, kwargs.val)
   return iter
 end
@@ -46,16 +46,16 @@ end
 
 @testset "Iterators" begin
 
-  using .TestIteratorUtils: TestIterator, SquareAdapter, TestProblem
+  import .TestIteratorUtils
 
   @testset "`AbstractNetworkIterator` Interface" begin
-    TI = TestIterator(1, 4, [])
+    TI = TestIteratorUtils.TestIterator(1, 4, [])
 
-    @test !laststep((TI))
+    @test !islaststep((TI))
 
     # First iterator should compute only
     rv, st = iterate(TI)
-    @test !laststep((TI))
+    @test !islaststep((TI))
     @test !st
     @test rv === TI
     @test length(TI.output) == 1
@@ -64,34 +64,34 @@ end
     @test !st
 
     rv, st = iterate(TI, st)
-    @test !laststep((TI))
+    @test !islaststep((TI))
     @test !st
     @test length(TI.output) == 2
     @test state(TI) == 2
     @test TI.output == [1, 2]
 
     increment!(TI)
-    @test !laststep((TI))
+    @test !islaststep((TI))
     @test state(TI) == 3
     @test length(TI.output) == 2
     @test TI.output == [1, 2]
 
     compute!(TI)
-    @test !laststep((TI))
+    @test !islaststep((TI))
     @test state(TI) == 3
     @test length(TI.output) == 3
     @test TI.output == [1, 2, 3]
 
     # Final Step
     iterate(TI, false)
-    @test laststep((TI))
+    @test islaststep((TI))
     @test state(TI) == 4
     @test length(TI.output) == 4
     @test TI.output == [1, 2, 3, 4]
 
     @test iterate(TI, false) === nothing
 
-    TI = TestIterator(1, 5, [])
+    TI = TestIteratorUtils.TestIterator(1, 5, [])
 
     cb = []
 
@@ -102,18 +102,18 @@ end
       @test cb == TI.output
     end
 
-    @test laststep((TI))
+    @test islaststep((TI))
     @test length(TI.output) == 5
     @test length(cb) == 5
     @test cb == TI.output
 
 
-    TI = TestIterator(1, 5, [])
+    TI = TestIteratorUtils.TestIterator(1, 5, [])
   end
 
   @testset "Adapters" begin
-    TI = TestIterator(1, 5, [])
-    SA = SquareAdapter(TI)
+    TI = TestIteratorUtils.TestIterator(1, 5, [])
+    SA = TestIteratorUtils.SquareAdapter(TI)
 
     @testset "Generic" begin
 
@@ -125,10 +125,10 @@ end
         @test state(SA) == i
       end
 
-      @test laststep((SA))
+      @test islaststep((SA))
 
-      TI = TestIterator(1, 5, [])
-      SA = SquareAdapter(TI)
+      TI = TestIteratorUtils.TestIterator(1, 5, [])
+      SA = TestIteratorUtils.SquareAdapter(TI)
 
       SA_c = collect(SA)
 
@@ -139,8 +139,8 @@ end
     end
 
     @testset "EachRegion" begin
-      prob = TestProblem([])
-      prob_region = TestProblem([])
+      prob = TestIteratorUtils.TestProblem([])
+      prob_region = TestIteratorUtils.TestProblem([])
 
       SI = SweepIterator(prob, 5)
       SI_region = SweepIterator(prob_region, 5)