diff options
Diffstat (limited to 'lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate')
4 files changed, 14 insertions, 13 deletions
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java index 4ac7a241a..b64b862a3 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/LispStateCustomizerTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import com.google.common.base.Optional; +import java.util.Optional; import com.google.common.collect.ImmutableSet; import io.fd.hc2vpp.common.test.read.InitializingReaderCustomizerTest; import io.fd.hc2vpp.common.test.util.NamingContextHelper; @@ -131,9 +131,9 @@ public class LispStateCustomizerTest extends InitializingReaderCustomizerTest<Li when(mappingContext.read(namingContextId.child(Mappings.class))) .thenReturn(Optional.of(new MappingsBuilder().setMapping(Arrays.asList(loc1Data, loc2Data)).build())); - when(mappingContext.read(loc1Key)).thenReturn(Optional.absent()) + when(mappingContext.read(loc1Key)).thenReturn(Optional.empty()) .thenReturn(Optional.of(loc1Data)).thenReturn(Optional.of(loc1Data)); - when(mappingContext.read(loc2Key)).thenReturn(Optional.absent()) + when(mappingContext.read(loc2Key)).thenReturn(Optional.empty()) .thenReturn(Optional.of(loc2Data)).thenReturn(Optional.of(loc2Data)); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java index 294bd5466..4352c9b06 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/service/LispStateCheckServiceImplTest.java @@ -22,7 +22,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import com.google.common.base.Optional; +import java.util.Optional; import io.fd.hc2vpp.common.test.util.FutureProducer; import io.fd.honeycomb.translate.ModificationCache; import io.fd.honeycomb.translate.read.ReadContext; @@ -58,7 +58,7 @@ public class LispStateCheckServiceImplTest implements FutureProducer { @Test(expected = IllegalStateException.class) public void testCheckLispEnabledBeforeNoConfig() throws Exception { - when(writeContext.readBefore(InstanceIdentifier.create(Lisp.class))).thenReturn(Optional.absent()); + when(writeContext.readBefore(InstanceIdentifier.create(Lisp.class))).thenReturn(Optional.empty()); impl.checkLispEnabledBefore(writeContext); } @@ -79,7 +79,7 @@ public class LispStateCheckServiceImplTest implements FutureProducer { @Test(expected = IllegalStateException.class) public void testCheckLispEnabledAfterNoConfig() throws Exception { - when(writeContext.readAfter(InstanceIdentifier.create(Lisp.class))).thenReturn(Optional.absent()); + when(writeContext.readAfter(InstanceIdentifier.create(Lisp.class))).thenReturn(Optional.empty()); impl.checkLispEnabledAfter(writeContext); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java index b8ad46b6f..74b22e41a 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java @@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; @@ -36,6 +35,8 @@ import io.fd.jvpp.core.dto.OneLocatorSetDetails; import io.fd.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import java.util.NoSuchElementException; +import java.util.Optional; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -76,12 +77,12 @@ public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { lispStateCheckService); } - @Test(expected = NullPointerException.class) + @Test(expected = NoSuchElementException.class) public void testWriteCurrentAttributesNullData() throws WriteFailedException { customizer.writeCurrentAttributes(null, null, writeContext); } - @Test(expected = NullPointerException.class) + @Test(expected = NoSuchElementException.class) public void testWriteCurrentAttributesBadData() throws WriteFailedException { customizer.writeCurrentAttributes(null, mock(LocatorSet.class), writeContext); } @@ -138,7 +139,7 @@ public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { @Test public void testDeleteCurrentAttributes() throws InterruptedException, ExecutionException, WriteFailedException { - when(writeContext.readAfter(EID_TABLE_ID)).thenReturn(Optional.absent()); + when(writeContext.readAfter(EID_TABLE_ID)).thenReturn(Optional.empty()); verifySuccessfullDelete(LOCATOR_SET_TO_DELETE); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java index 19ff5cbba..ee5f1b092 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizerTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import com.google.common.base.Optional; +import java.util.Optional; import io.fd.honeycomb.translate.write.WriteFailedException; import org.junit.Before; import org.junit.Test; @@ -116,7 +116,7 @@ public class VniTableCustomizerTest extends LispWriterCustomizerTest { } private void whenReadBeforeReturnInvalid() { - when(writeContext.readBefore(validId)).thenReturn(Optional.absent()); + when(writeContext.readBefore(validId)).thenReturn(Optional.empty()); } private void whenReadAfterReturnValid() { @@ -124,6 +124,6 @@ public class VniTableCustomizerTest extends LispWriterCustomizerTest { } private void whenReadAfterReturnInvalid() { - when(writeContext.readAfter(validId)).thenReturn(Optional.absent()); + when(writeContext.readAfter(validId)).thenReturn(Optional.empty()); } } |