aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-02-26 20:47:56 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2013-02-26 20:47:56 +0000
commitc85ca6ca0c6b2bcf7c0a4582a25da14d163a6f69 (patch)
tree8f4e80ebac65c0a574f05d09ac9b67639d746f8b /test
parent2510f1d11c5cb236d9e9442830ea242094e90d73 (diff)
downloadjitsi-c85ca6ca0c6b2bcf7c0a4582a25da14d163a6f69.zip
jitsi-c85ca6ca0c6b2bcf7c0a4582a25da14d163a6f69.tar.gz
jitsi-c85ca6ca0c6b2bcf7c0a4582a25da14d163a6f69.tar.bz2
Works on preventing an issue with the display of remote video which could scale it down to a tiny number of pixels. Fixes multiple technical/programming errors, warnings, javadocs.
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java8
-rw-r--r--test/net/java/sip/communicator/slick/credentialsstorage/TestCredentialsStorageService.java8
-rw-r--r--test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java6
-rw-r--r--test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java4
-rw-r--r--test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java6
-rw-r--r--test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java2
6 files changed, 17 insertions, 17 deletions
diff --git a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
index f1bc8e2..e2c428d 100644
--- a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
+++ b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
@@ -35,23 +35,23 @@ public class TestConfigurationService extends TestCase
/**
* The name of a property that we will be using for testing.
*/
- private final String propertyName = "my.test.property";
+ private static final String propertyName = "my.test.property";
/**
* The name of a property that we will be using for testing custom event
* notification.
*/
- private final String listenedPropertyName = "a.property.i.listen.to";
+ private static final String listenedPropertyName = "a.property.i.listen.to";
/**
* The value of the property with name propertyName.
*/
- private final String propertyValue = "19200";
+ private static final String propertyValue = "19200";
/**
* A new value for the property with name propertyName
*/
- private final String propertyNewValue = "19201";
+ private static final String propertyNewValue = "19201";
/**
* A PropertyChange listener impl that registers the last received event.
diff --git a/test/net/java/sip/communicator/slick/credentialsstorage/TestCredentialsStorageService.java b/test/net/java/sip/communicator/slick/credentialsstorage/TestCredentialsStorageService.java
index 9878daf..89ba838 100644
--- a/test/net/java/sip/communicator/slick/credentialsstorage/TestCredentialsStorageService.java
+++ b/test/net/java/sip/communicator/slick/credentialsstorage/TestCredentialsStorageService.java
@@ -27,22 +27,22 @@ public class TestCredentialsStorageService
/**
* Prefix for the test account.
*/
- private final String accountPrefix = "my.account.prefix";
+ private static final String accountPrefix = "my.account.prefix";
/**
* Password for the test account.
*/
- private final String accountPassword = "pa$$W0rt123.";
+ private static final String accountPassword = "pa$$W0rt123.";
/**
* The master password.
*/
- private final String masterPassword = "MasterPazz321";
+ private static final String masterPassword = "MasterPazz321";
/**
* Another master password.
*/
- private final String otherMasterPassword = "123$ecretPSWRD";
+ private static final String otherMasterPassword = "123$ecretPSWRD";
/**
diff --git a/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java b/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
index 66fd19a..59e493d 100644
--- a/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
+++ b/test/net/java/sip/communicator/slick/netaddr/TestNetworkAddressManagerService.java
@@ -140,8 +140,8 @@ public class TestNetworkAddressManagerService
}
/**
- * This test will specify all local address one by one as "prefered address"
- * and test the returned address.
+ * This test will specify all local address one by one as "preferred
+ * address" and test the returned address.
*
* @throws java.lang.Exception if anything goes wrong.
*/
@@ -272,7 +272,7 @@ public class TestNetworkAddressManagerService
*/
/**
- * Set the configuration to IPv4 pref if the network is not behind a nat
+ * Set the configuration to IPv4 pref if the network is not behind a NAT
* if not it does nothing
* and watch if the result of "NetworkAddressManagerService.getlocalhost()
* is a valid (public) IPv4 address
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
index bf9aa9f..806e3c3 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
@@ -564,9 +564,9 @@ public class TestOperationSetPersistentPresence
/**
* Blocks until at least one event is received or until waitFor
- * miliseconds pass (whicever happens first).
+ * milliseconds pass (whichever happens first).
*
- * @param waitFor the number of miliseconds that we should be waiting
+ * @param waitFor the number of milliseconds that we should be waiting
* for an event before simply bailing out.
*/
public void waitForEvent(long waitFor)
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java
index 7fb9355..649e570 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java
@@ -330,8 +330,8 @@ public class TestOperationSetMultiUserChat
public void memberPresenceChanged(
ChatRoomMemberPresenceChangeEvent evt)
{
- synchronized(this)
- {
+// synchronized(this)
+// {
// logger.debug(
// "Collected evt("+collectedEvents.size()+")= "+event);
//
@@ -340,7 +340,7 @@ public class TestOperationSetMultiUserChat
// this.collectedEvents.add(event);
// notifyAll();
// }
- }
+// }
}
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
index 029e3d1..ef05fa9 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPresence.java
@@ -930,7 +930,7 @@ public class TestOperationSetPresence
// try{
// opset.subscribe(sourceContact.getAddress());
// }catch(Exception ex){}
-
+
return
new AuthorizationResponse(AuthorizationResponse.ACCEPT, "");
}