diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock new file mode 100644 index 000000000..7ea4ee843 Binary files /dev/null and b/.gradle/6.7/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.7/fileChanges/last-build.bin b/.gradle/6.7/fileChanges/last-build.bin new file mode 100644 index 000000000..f76dd238a Binary files /dev/null and b/.gradle/6.7/fileChanges/last-build.bin differ diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock new file mode 100644 index 000000000..adf4ff681 Binary files /dev/null and b/.gradle/6.7/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.7/gc.properties b/.gradle/6.7/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 000000000..3dd4f0372 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 000000000..8afe3e94c --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Thu Sep 02 15:09:41 EEST 2021 +gradle.version=6.7 diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 000000000..c172226d9 Binary files /dev/null and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/service/src/test/java/greencity/service/UBSClientServiceImplTest.java b/service/src/test/java/greencity/service/UBSClientServiceImplTest.java index 45ac22ff5..a585dedb9 100644 --- a/service/src/test/java/greencity/service/UBSClientServiceImplTest.java +++ b/service/src/test/java/greencity/service/UBSClientServiceImplTest.java @@ -122,6 +122,22 @@ void getFirstPageData() { assertEquals(userPointsAndAllBagsDtoExpected.getPoints(), userPointsAndAllBagsDtoActual.getPoints()); } + @Test + void getFirstPageDataTest() { + UserPointsAndAllBagsDtoTest userPointsAndAllBagsDtoExpected = + new UserPointsAndAllBagsDtoTest(new ArrayList(), 2l, 600); + + User user = ModelUtils.getUserWithLastLocation(); + user.setCurrentPoints(600); + when(userRepository.findByUuid("35467585763t4sfgchjfuyetf")).thenReturn(user); + + UserPointsAndAllBagsDtoTest userPointsAndAllBagsDtoActual = + ubsService.getFirstPageDataTest("35467585763t4sfgchjfuyetf"); + + assertEquals(userPointsAndAllBagsDtoExpected.getBags(), userPointsAndAllBagsDtoActual.getBags()); + assertEquals(userPointsAndAllBagsDtoExpected.getPoints(), userPointsAndAllBagsDtoActual.getPoints()); + } + @Test void testSaveToDB() throws InvocationTargetException, IllegalAccessException { @@ -666,4 +682,5 @@ void testSetNewLastOrderLocation() { assertEquals(user.getLastLocation(), lastLocation); } + } \ No newline at end of file