1 files changed, 21 insertions, 21 deletions

diff --git a/modules/codec/tests/codec.cpp b/modules/codec/tests/codec.cpp
index 7ad1c89..a1f37b8 100644
--- a/modules/codec/tests/codec.cpp
+++ b/modules/codec/tests/codec.cpp
@@ -58,13 +58,13 @@ SAW_TEST("One Dimensional Array") {
 
 	int bar = 0;
 
-	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
+	for(data<schema::UInt64, encode::Native> i = 0; i < arr.size(); ++i){
 		arr.at(i).set(bar++);
 	}
 
 	int sum = 0;
 	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
-		sum += arr.at(i).get();
+		sum += arr.at(data<schema::UInt64>{i}).get();
 	}
 
 	SAW_EXPECT(sum == 124750, std::to_string(sum) + " is not 124750. Expected that data stays correct");
@@ -76,7 +76,7 @@ SAW_TEST("One dim Array Default init"){
 	data<schema::OneDimArray, encode::Native> arr;
 
 	SAW_EXPECT(arr.get_dim_size(0) == 0, "Dim should be size 0");
-	SAW_EXPECT(arr.size() == 0, "Total size should also be zero");
+	SAW_EXPECT(arr.size().get() == 0u, "Total size should also be zero");
 }
 
 SAW_TEST("One dimensional Array Add"){
@@ -87,13 +87,13 @@ SAW_TEST("One dimensional Array Add"){
 	int bar = 0;
 
 	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
-		arr.at(i).set(bar++);
+		arr.at(data<schema::UInt64>{i}).set(bar++);
 	}
 
 	arr.add(7);
 
-	SAW_EXPECT(arr.size() == 6u, "Array size is not 6u. Expected that data stays correct");
-	SAW_EXPECT(arr.at(5u).get() == 7, "Array at 5u is not 7. Expected that data stays correct");
+	SAW_EXPECT(arr.size().get() == 6u, "Array size is not 6u. Expected that data stays correct");
+	SAW_EXPECT(arr.at(data<schema::UInt64>{5u}).get() == 7, "Array at 5u is not 7. Expected that data stays correct");
 }
 
 SAW_TEST("Two Dimensional Array") {
@@ -108,13 +108,13 @@ SAW_TEST("Two Dimensional Array") {
 	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
 		for(size_t j = 0; j < arr.get_dim_size(1); ++j){
 			++bar;
-			arr.at(i,j).set(bar);
+			arr.at({i,j}).set(bar);
 		}
 	}
 	int sum = 0;
 	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
 		for(size_t j = 0; j < arr.get_dim_size(1); ++j){
-			sum += arr.at(i,j).get();
+			sum += arr.at({i,j}).get();
 		}
 	}
 	SAW_EXPECT(sum == expected_sum, std::to_string(sum) + " is not "+ std::to_string(expected_sum) + ". Expected that data stays correct");
@@ -132,7 +132,7 @@ SAW_TEST("Three Dimensional Array") {
 		for(size_t j = 0; j < arr.get_dim_size(1); ++j){
 			for(size_t k = 0; k < arr.get_dim_size(2); ++k){
 				++bar;
-				arr.at(i,j,k).set(bar);
+				arr.at({i,j,k}).set(bar);
 			}
 		}
 	}
@@ -140,7 +140,7 @@ SAW_TEST("Three Dimensional Array") {
 	for(size_t i = 0; i < arr.get_dim_size(0); ++i){
 		for(size_t j = 0; j < arr.get_dim_size(1); ++j){
 			for(size_t k = 0; k < arr.get_dim_size(2); ++k){
-				sum += arr.at(i,j,k).get();
+				sum += arr.at({i,j,k}).get();
 			}
 		}
 	}
@@ -202,7 +202,7 @@ SAW_TEST("KelSimple Array write and read back"){
 
 	for(std::size_t i = 0; i < 2; ++i) {
 		for(std::size_t j = 0; j < 3; ++j){
-			native.at(i,j).set(i+2*j);
+			native.at({i,j}).set(i+2*j);
 		}
 	}
 
@@ -211,7 +211,7 @@ SAW_TEST("KelSimple Array write and read back"){
 	
 	for(std::size_t i = 0; i < 2; ++i) {
 		for(std::size_t j = 0; j < 3; ++j){
-			native.at(i,j).set(0);
+			native.at({i,j}).set(0);
 		}
 	}
 
@@ -220,7 +220,7 @@ SAW_TEST("KelSimple Array write and read back"){
 
 	for(std::size_t i = 0; i < 2; ++i) {
 		for(std::size_t j = 0; j < 3; ++j){
-			SAW_EXPECT(native.at(i,j).get() == static_cast<int32_t>(i+2*j), "Values incorrectly decoded");
+			SAW_EXPECT(native.at({i,j}).get() == static_cast<int32_t>(i+2*j), "Values incorrectly decoded");
 		}
 	}
 }
@@ -234,8 +234,8 @@ SAW_TEST("KelSimple Struct write and read back"){
 	auto& tda = native.template get<"two_dim_array">();
 	tda = {1,2};
 
-	tda.at(0,0).set(5);
-	tda.at(0,1).set(3);
+	tda.at({0,0}).set(5);
+	tda.at({0,1}).set(3);
 	native.template get<"number">().set(410);
 	
 	codec<schema::TestStruct, encode::KelSimple> codec;
@@ -251,8 +251,8 @@ SAW_TEST("KelSimple Struct write and read back"){
 
 	auto& dec_tda = native.template get<"two_dim_array">();
 
-	SAW_EXPECT(dec_tda.at(0,0).get() == 5, "Incorrect Decoding in array 0,0");
-	SAW_EXPECT(dec_tda.at(0,1).get() == 3, "Incorrect Decoding in array 0,1");
+	SAW_EXPECT(dec_tda.at({0,0}).get() == 5, "Incorrect Decoding in array 0,0");
+	SAW_EXPECT(dec_tda.at({0,1}).get() == 3, "Incorrect Decoding in array 0,1");
 	SAW_EXPECT(native.template get<"number">().get() == 410, "Incorrect Decoding in number");
 }
 
@@ -302,8 +302,8 @@ SAW_TEST("KelSimple Tuple write and read back"){
 	auto& tda = native.template get<0>();
 	tda = {1,2};
 
-	tda.at(0,0).set(5);
-	tda.at(0,1).set(3);
+	tda.at({0,0}).set(5);
+	tda.at({0,1}).set(3);
 	native.template get<1>().set(410);
 	
 	codec<schema::TestTuple, encode::KelSimple> codec;
@@ -319,8 +319,8 @@ SAW_TEST("KelSimple Tuple write and read back"){
 
 	auto& dec_tda = native.template get<0>();
 
-	SAW_EXPECT(dec_tda.at(0,0).get() == 5, "Incorrect Decoding in array 0,0");
-	SAW_EXPECT(dec_tda.at(0,1).get() == 3, "Incorrect Decoding in array 0,1");
+	SAW_EXPECT(dec_tda.at({0,0}).get() == 5, "Incorrect Decoding in array 0,0");
+	SAW_EXPECT(dec_tda.at({0,1}).get() == 3, "Incorrect Decoding in array 0,1");
 	SAW_EXPECT(native.template get<1>().get() == 410, "Incorrect Decoding in number");
 }