Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunplar
gunplar committed Oct 15, 2024
1 parent c4961c8 commit d6cb556
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions ...sha-lib-view/src/test/java/com/here/naksha/lib/view/merge/MergeByStoragePriorityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ void checkPriorityMerge() {
final TupleNumber tupleNum = new TupleNumber(new JvmInt64(0), Version.fromDouble(3.0),0);
Metadata metadata = mock(Metadata.class);

Tuple tu1 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF1, null, null, null, null);
Tuple tu2 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF2, null, null, null, null);
Tuple tu3 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF3, null, null, null, null);
Tuple tu1 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f1.getId(), metadata.getFlags(), bytesF1, null, null, null, null);
Tuple tu2 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f2.getId(), metadata.getFlags(), bytesF2, null, null, null, null);
Tuple tu3 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f3.getId(), metadata.getFlags(), bytesF3, null, null, null, null);

ResultTuple t1 = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tu1);
ResultTuple t2 = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tu2);
Expand Down Expand Up @@ -75,9 +75,9 @@ void checkSamePriorityMerge() {
final TupleNumber tupleNum = new TupleNumber(new JvmInt64(0), Version.fromDouble(3.0),0);
Metadata metadata = mock(Metadata.class);

Tuple tu1 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF1, null, null, null, null);
Tuple tu2 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF2, null, null, null, null);
Tuple tu3 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesF3, null, null, null, null);
Tuple tu1 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f1.getId(), metadata.getFlags(), bytesF1, null, null, null, null);
Tuple tu2 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f2.getId(), metadata.getFlags(), bytesF2, null, null, null, null);
Tuple tu3 = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, f3.getId(), metadata.getFlags(), bytesF3, null, null, null, null);

ResultTuple t1 = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tu1);
ResultTuple t2 = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tu2);
Expand Down
4 changes: 2 additions & 2 deletions ...lib-view/src/test/java/com/here/naksha/lib/view/missing/ObligatoryLayersResolverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void shouldPrepareLayerIdToFetchWhenMissing() {
byte[] bytesFeature = PgUtil.encodeFeature(feature, 0, null);
final TupleNumber tupleNum = new TupleNumber(new JvmInt64(0), Version.fromDouble(3.0),0);
Metadata metadata = mock(Metadata.class);
Tuple tuple = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesFeature, null, null, null, null);
Tuple tuple = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, feature.getId(), metadata.getFlags(), bytesFeature, null, null, null, null);
ResultTuple resultTuple = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tuple);

List<ViewLayerFeature> singleRowFeatures = new ArrayList<>();
Expand All @@ -59,7 +59,7 @@ void shouldPrepareLayerIdToFetchWhenLayerIsNotObligatory() {
byte[] bytesFeature = PgUtil.encodeFeature(feature, 0, null);
final TupleNumber tupleNum = new TupleNumber(new JvmInt64(0), Version.fromDouble(3.0),0);
Metadata metadata = mock(Metadata.class);
Tuple tuple = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, metadata.getId(), metadata.getFlags(), bytesFeature, null, null, null, null);
Tuple tuple = new Tuple(storage, tupleNum, FetchMode.FETCH_ALL, metadata, feature.getId(), metadata.getFlags(), bytesFeature, null, null, null, null);
ResultTuple resultTuple = new ResultTuple(storage, tupleNum, ExecutedOp.READ, tuple);

List<ViewLayerFeature> singleRowFeatures = new ArrayList<>();
Expand Down

0 comments on commit d6cb556

Please sign in to comment.