aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSebastien Vincent <seb@jitsi.org>2010-09-11 08:50:46 +0000
committerSebastien Vincent <seb@jitsi.org>2010-09-11 08:50:46 +0000
commitbb0b2297c77e6f1aa10a68db157b25016de09ae6 (patch)
tree4226959de63fb78422d3333e8daa783d3352ea75 /test
parent2d711b828b0447fe0195325bd6a6bec8945120a9 (diff)
downloadjitsi-bb0b2297c77e6f1aa10a68db157b25016de09ae6.zip
jitsi-bb0b2297c77e6f1aa10a68db157b25016de09ae6.tar.gz
jitsi-bb0b2297c77e6f1aa10a68db157b25016de09ae6.tar.bz2
Add javadoc, fix warnings and typos.
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java16
-rw-r--r--test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java18
-rw-r--r--test/net/java/sip/communicator/slick/runner/ScTestRunner.java2
3 files changed, 18 insertions, 18 deletions
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
index 33810d7..267159b 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicTelephonyJabberImpl.java
@@ -70,10 +70,10 @@ public class TestOperationSetBasicTelephonyJabberImpl
public void testCreateCancelCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -298,10 +298,10 @@ public class TestOperationSetBasicTelephonyJabberImpl
public void testCreateRejectCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -533,10 +533,10 @@ public class TestOperationSetBasicTelephonyJabberImpl
public void aTestCreateAnswerHangupCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -747,7 +747,7 @@ public class TestOperationSetBasicTelephonyJabberImpl
public class CallEventCollector implements CallListener
{
public ArrayList<EventObject> collectedEvents = new ArrayList<EventObject>();
- public OperationSetBasicTelephony listenedOpSet = null;
+ public OperationSetBasicTelephony<?> listenedOpSet = null;
/**
* Creates an instance of this call event collector and registers it
@@ -755,7 +755,7 @@ public class TestOperationSetBasicTelephonyJabberImpl
* @param listenedOpSet the operation set that we will be scanning for
* new calls.
*/
- public CallEventCollector(OperationSetBasicTelephony listenedOpSet)
+ public CallEventCollector(OperationSetBasicTelephony<?> listenedOpSet)
{
this.listenedOpSet = listenedOpSet;
this.listenedOpSet.addCallListener(this);
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
index 26476fb..df3cdd4 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicTelephonySipImpl.java
@@ -9,7 +9,7 @@ package net.java.sip.communicator.slick.protocol.sip;
import junit.framework.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.service.protocol.*;
-import java.text.ParseException;
+import java.text.*;
import net.java.sip.communicator.service.protocol.event.*;
import java.util.*;
@@ -69,10 +69,10 @@ public class TestOperationSetBasicTelephonySipImpl
public void testCreateCancelCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -299,10 +299,10 @@ public class TestOperationSetBasicTelephonySipImpl
public void testCreateRejectCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -536,10 +536,10 @@ public class TestOperationSetBasicTelephonySipImpl
public void aTestCreateAnswerHangupCall()
throws ParseException, OperationFailedException
{
- OperationSetBasicTelephony basicTelephonyP1
+ OperationSetBasicTelephony<?> basicTelephonyP1
= fixture.provider1.getOperationSet(
OperationSetBasicTelephony.class);
- OperationSetBasicTelephony basicTelephonyP2
+ OperationSetBasicTelephony<?> basicTelephonyP2
= fixture.provider2.getOperationSet(
OperationSetBasicTelephony.class);
@@ -752,7 +752,7 @@ public class TestOperationSetBasicTelephonySipImpl
public class CallEventCollector implements CallListener
{
public ArrayList<EventObject> collectedEvents = new ArrayList<EventObject>();
- public OperationSetBasicTelephony listenedOpSet = null;
+ public OperationSetBasicTelephony<?> listenedOpSet = null;
/**
* Creates an instance of this call event collector and registers it
@@ -760,7 +760,7 @@ public class TestOperationSetBasicTelephonySipImpl
* @param listenedOpSet the operation set that we will be scanning for
* new calls.
*/
- public CallEventCollector(OperationSetBasicTelephony listenedOpSet)
+ public CallEventCollector(OperationSetBasicTelephony<?> listenedOpSet)
{
this.listenedOpSet = listenedOpSet;
this.listenedOpSet.addCallListener(this);
diff --git a/test/net/java/sip/communicator/slick/runner/ScTestRunner.java b/test/net/java/sip/communicator/slick/runner/ScTestRunner.java
index af4da94..1e52237 100644
--- a/test/net/java/sip/communicator/slick/runner/ScTestRunner.java
+++ b/test/net/java/sip/communicator/slick/runner/ScTestRunner.java
@@ -35,7 +35,7 @@ public class ScTestRunner extends BaseTestRunner {
/**
* Runs a suite extracted from a TestCase subclass.
*/
- static public void run(Class testClass, XmlFormatter fmtr)
+ static public void run(Class<? extends Test> testClass, XmlFormatter fmtr)
{
run(new TestSuite(testClass), fmtr);
}