vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 00:59:39 +02:00
Code Issues Releases Wiki Activity

gradle: Remove archives configuration

Browse source 
and FileTestUtil in favor of commons-io. This is required because
Eclipse won't put src/test code into the classpath of src/main
code (even though gradle was configured with an according
dependency).
This commit is contained in:
Florian Schmaus 2019-09-15 23:51:26 +02:00
parent 89cb3f679b
commit 2f667f95a8
18 changed files with 30 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-openpgp/build.gradle
View file

@ -15,5 +15,5 @@ dependencies {
compile 'org.pgpainless:pgpainless-core:0.0.1-alpha7'
testCompile project(path: ":smack-core", configuration: "testRuntime")
testCompile project(path: ":smack-core", configuration: "archives")
testCompile group: 'commons-io', name: 'commons-io', version: "$commonsIoVersion"
}

7
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpStoreTest.java
View file

@ -35,7 +35,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.jivesoftware.smack.test.util.FileTestUtil;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.ox.callback.SecretKeyPassphraseCallback;
@ -78,7 +77,7 @@ public class OpenPgpStoreTest extends SmackTestSuite {
private final OpenPgpStore openPgpStoreInstance2;
static {
storagePath = FileTestUtil.getTempDir("storeTest");
storagePath = new File(org.apache.commons.io.FileUtils.getTempDirectory(), "storeTest");
}
@Parameterized.Parameters
@ -99,8 +98,8 @@ public class OpenPgpStoreTest extends SmackTestSuite {
@Before
@After
public void deletePath() {
FileTestUtil.deleteDirectory(storagePath);
public void deletePath() throws IOException {
org.apache.commons.io.FileUtils.deleteDirectory(storagePath);
}
/*

7
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java
View file

@ -32,7 +32,6 @@ import java.util.List;
import org.jivesoftware.smack.DummyConnection;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.test.util.FileTestUtil;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.xml.XmlPullParserException;
@ -63,13 +62,13 @@ public class PainlessOpenPgpProviderTest extends SmackTestSuite {
private static final BareJid bob = JidTestUtil.BARE_JID_2;
static {
storagePath = FileTestUtil.getTempDir("smack-painlessprovidertest");
storagePath = new File(org.apache.commons.io.FileUtils.getTempDirectory(), "smack-painlessprovidertest");
}
@BeforeClass
@AfterClass
public static void deletePath() {
FileTestUtil.deleteDirectory(storagePath);
public static void deletePath() throws IOException {
org.apache.commons.io.FileUtils.deleteDirectory(storagePath);
}
@Test

7
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java
View file

@ -28,7 +28,6 @@ import java.util.Arrays;
import java.util.Collections;
import org.jivesoftware.smack.DummyConnection;
import org.jivesoftware.smack.test.util.FileTestUtil;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.ox.crypto.PainlessOpenPgpProvider;
@ -55,7 +54,7 @@ public class SecretKeyBackupHelperTest extends SmackTestSuite {
private static final File basePath;
static {
basePath = FileTestUtil.getTempDir("ox_secret_keys");
basePath = new File(org.apache.commons.io.FileUtils.getTempDirectory(), "ox_secret_keys");
}
@Test
@ -98,7 +97,7 @@ public class SecretKeyBackupHelperTest extends SmackTestSuite {
@AfterClass
@BeforeClass
public static void deleteDirs() {
FileTestUtil.deleteDirectory(basePath);
public static void deleteDirs() throws IOException {
org.apache.commons.io.FileUtils.deleteDirectory(basePath);
}
}

7
smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java
View file

@ -34,7 +34,6 @@ import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.test.util.FileTestUtil;
import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.xml.XmlPullParserException;
@ -63,7 +62,7 @@ public class OXInstantMessagingManagerTest extends SmackTestSuite {
private static final File basePath;
static {
basePath = FileTestUtil.getTempDir("ox_im_test_" + StringUtils.randomString(10));
basePath = new File(org.apache.commons.io.FileUtils.getTempDirectory(), "ox_im_test_" + StringUtils.randomString(10));
}
@Test
@ -169,7 +168,7 @@ public class OXInstantMessagingManagerTest extends SmackTestSuite {
@AfterClass
@BeforeClass
public static void deleteDirs() {
FileTestUtil.deleteDirectory(basePath);
public static void deleteDirs() throws IOException {
org.apache.commons.io.FileUtils.deleteDirectory(basePath);
}
}