From faa0f21906c259ad526ca73004fb108963154450 Mon Sep 17 00:00:00 2001 From: rcollier Date: Fri, 31 Jan 2014 03:49:47 +0000 Subject: [PATCH] SMACK-434 Added missing javadoc and some test code cleanup git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_4_0@13883 b35dd754-fafc-0310-a699-88a17e54d16e --- .../ExperimentalProviderInitializer.java | 22 +++++++++++++++++++ .../smack/keepalive/KeepaliveTest.java | 4 ---- .../jivesoftware/smackx/ping/PingTest.java | 6 +++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/experimental/source/org/jivesoftware/smackx/experimental/ExperimentalProviderInitializer.java b/experimental/source/org/jivesoftware/smackx/experimental/ExperimentalProviderInitializer.java index 70c8e8760..6d8abbc20 100644 --- a/experimental/source/org/jivesoftware/smackx/experimental/ExperimentalProviderInitializer.java +++ b/experimental/source/org/jivesoftware/smackx/experimental/ExperimentalProviderInitializer.java @@ -1,7 +1,29 @@ +/** + * Copyright 2013 Robin Collier + * + * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.jivesoftware.smackx.experimental; import org.jivesoftware.smack.provider.UrlProviderFileInitializer; +/** + * Initializes the providers in the experimental code stream. + * + * @author Robin Collier + * + */ public class ExperimentalProviderInitializer extends UrlProviderFileInitializer { @Override diff --git a/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java b/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java index 870f9b937..240f9160b 100644 --- a/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java +++ b/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java @@ -1,7 +1,6 @@ package org.jivesoftware.smack.keepalive; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Properties; @@ -16,13 +15,10 @@ import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.ThreadedDummyConnection; import org.jivesoftware.smack.filter.IQTypeFilter; import org.jivesoftware.smack.filter.PacketTypeFilter; -import org.jivesoftware.smack.keepalive.KeepAliveManager; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.ping.PingFailedListener; import org.jivesoftware.smack.ping.packet.Ping; -import org.jivesoftware.smack.test.util.TestUtils; -import org.jivesoftware.smack.util.PacketParserUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/test-unit/org/jivesoftware/smackx/ping/PingTest.java b/test-unit/org/jivesoftware/smackx/ping/PingTest.java index 96b0fba63..7058e89a1 100644 --- a/test-unit/org/jivesoftware/smackx/ping/PingTest.java +++ b/test-unit/org/jivesoftware/smackx/ping/PingTest.java @@ -15,6 +15,10 @@ */ package org.jivesoftware.smackx.ping; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.ThreadedDummyConnection; import org.jivesoftware.smack.packet.IQ; @@ -26,8 +30,6 @@ import org.jivesoftware.smackx.packet.DiscoverInfo; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; - public class PingTest { private DummyConnection dummyCon; private ThreadedDummyConnection threadedCon;