Fixed tests

Author: Bytekeeper

src/test/java/org/bk/ass/manage/ListLockTest.java

@@ -17,18 +17,18 @@ void shouldPartiallyReleaseItems() {
     Reservation<List<String>> reservation =
         new Reservation<List<String>>() {
           @Override
-          public boolean reserve(Lock<List<String>> lock, List<String> item) {
+          public boolean reserve(Object lock, List<String> item) {
             return true;
           }
 
           @Override
-          public void release(Lock<List<String>> lock, List<String> item) {}
+          public void release(Object lock, List<String> item) {}
         };
     ListLock<String> sut = new ListLock<>(reservation, () -> new ArrayList<>(Arrays.asList("a", "b")));
     sut.acquire();
 
     // WHEN
-    sut.releaseItem(Collections.singletonList("a"));
+    sut.releasePartially(Collections.singletonList("a"));
 
     // THEN
     assertThat(sut.getItem()).containsExactly("b");
@@ -40,20 +40,20 @@ void shouldFailIfPartiallyReleasedItemsAreNotSelected() {
     Reservation<List<String>> reservation =
         new Reservation<List<String>>() {
           @Override
-          public boolean reserve(Lock<List<String>> lock, List<String> item) {
+          public boolean reserve(Object lock, List<String> item) {
             return true;
           }
 
           @Override
-          public void release(Lock<List<String>> lock, List<String> item) {}
+          public void release(Object lock, List<String> item) {}
         };
     ListLock<String> sut = new ListLock<>(reservation, Collections::emptyList);
     sut.acquire();
 
     assertThatThrownBy(
             () -> {
               // WHEN
-              sut.releaseItem(Collections.singletonList("a"));
+              sut.releasePartially(Collections.singletonList("a"));
             }) // THEN
         .isInstanceOf(IllegalArgumentException.class);
   }
@@ -64,19 +64,19 @@ void shouldUpdateLockSatisfactionOnPartialRelease() {
     Reservation<List<String>> reservation =
         new Reservation<List<String>>() {
           @Override
-          public boolean reserve(Lock<List<String>> lock, List<String> item) {
+          public boolean reserve(Object lock, List<String> item) {
             return true;
           }
 
           @Override
-          public void release(Lock<List<String>> lock, List<String> item) {}
+          public void release(Object lock, List<String> item) {}
         };
     ListLock<String> sut = new ListLock<>(reservation, () -> new ArrayList<>(Arrays.asList("a", "b")));
     sut.setCriteria(x -> x.contains("a"));
     sut.acquire();
 
     // WHEN
-    boolean stillSatisfied = sut.releaseItem(Collections.singletonList("a"));
+    boolean stillSatisfied = sut.releasePartially(Collections.singletonList("a"));
 
     // THEN
     assertThat(stillSatisfied).isFalse();

src/test/java/org/bk/ass/manage/LockTest.java

@@ -16,12 +16,12 @@ void shouldReserveItem() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> STRING_ITEM);
 
@@ -42,12 +42,12 @@ void shouldReleaseItem() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {
+          public void release(Object lock, String item) {
             released.set(true);
           }
         };
@@ -69,12 +69,12 @@ void shouldThrowExceptionIfItemWasNotLocked() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return false;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> STRING_ITEM);
 
@@ -92,12 +92,12 @@ void shouldResetItem() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> "Hello World");
     sut.acquire();
@@ -117,13 +117,13 @@ void shouldOnlyBeReservedOnce() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             reserveCalls.incrementAndGet();
             return false;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> "Hello World");
     sut.acquire();
@@ -142,17 +142,17 @@ public void shouldNotBeSatisfiedIfSelectorReturnsNull() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return true;
           }
 
           @Override
-          public boolean itemAvailableInFuture(Lock<String> lock, String item, int futureFrames) {
+          public boolean itemAvailableInFuture(Object lock, String item, int futureFrames) {
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> null);
 
@@ -172,12 +172,12 @@ void shouldNotReleaseOnReacquire() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {
+          public void release(Object lock, String item) {
             released.set(true);
           }
         };
@@ -198,18 +198,18 @@ public void shouldAddHysteresis() {
     Reservation<String> reservation =
         new Reservation<String>() {
           @Override
-          public boolean reserve(Lock<String> lock, String item) {
+          public boolean reserve(Object lock, String item) {
             return false;
           }
 
           @Override
-          public boolean itemAvailableInFuture(Lock<String> lock, String item, int futureFrames) {
+          public boolean itemAvailableInFuture(Object lock, String item, int futureFrames) {
             frames.set(futureFrames);
             return true;
           }
 
           @Override
-          public void release(Lock<String> lock, String item) {}
+          public void release(Object lock, String item) {}
         };
     Lock<String> sut = new Lock<>(reservation, () -> STRING_ITEM);
     sut.acquire();
@@ -227,12 +227,12 @@ void shouldNotSelectIfPreviousItemIsOk() {
     Reservation<Integer> reservation =
         new Reservation<Integer>() {
           @Override
-          public boolean reserve(Lock<Integer> lock, Integer item) {
+          public boolean reserve(Object lock, Integer item) {
             return false;
           }
 
           @Override
-          public void release(Lock<Integer> lock, Integer item) {}
+          public void release(Object lock, Integer item) {}
         };
     Lock<Integer> sut = new Lock<>(reservation, value::incrementAndGet);
     sut.acquire();
@@ -250,12 +250,12 @@ void shouldReselectIfPreviousValueFailsCriteria() {
     Reservation<Integer> reservation =
         new Reservation<Integer>() {
           @Override
-          public boolean reserve(Lock<Integer> lock, Integer item) {
+          public boolean reserve(Object lock, Integer item) {
             return true;
           }
 
           @Override
-          public void release(Lock<Integer> lock, Integer item) {}
+          public void release(Object lock, Integer item) {}
         };
     Lock<Integer> sut = new Lock<>(reservation, value::incrementAndGet);
     sut.setCriteria(val -> val == 2);