aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2014-07-25 09:15:15 +0300
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2014-07-25 09:15:15 +0300
commit8aff7cfa8fe90104b39b2efe80ee458f04d27abe (patch)
tree5364a009674f68bff0c1f5882606790bd73ca9bc /test
parent47de77317ab59f5a1406ce2444238c128ff44ce7 (diff)
downloadjitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.zip
jitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.tar.gz
jitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.tar.bz2
Fixes the compilation on JDK 8.
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java2
-rw-r--r--test/net/java/sip/communicator/slick/slickless/util/TestBase64.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
index f419881..2136f37 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java
@@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.protocol.sip.*;
import net.java.sip.communicator.impl.protocol.sip.xcap.*;
import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*;
import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Base64; // disambiguation
/**
* Testing of the user and account info. Tests for reading, adding, removing,
diff --git a/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java b/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java
index 20d1fa6..7133651 100644
--- a/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java
+++ b/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.slick.slickless.util;
import java.util.*;
import junit.framework.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Base64; // disambiguation
/**
* Tests the methods of the Base64 class.