Skip to content

Commit 90a79d6

Browse files
committed
test: move tests which use mockserver to src/test
src/it directory is reserved for tests that interact with the actual Weaviate instance. They're usually slower and more expensive to set up.
1 parent a01c1a2 commit 90a79d6

4 files changed

Lines changed: 15 additions & 14 deletions

File tree

src/it/java/io/weaviate/integration/AuthorizationITest.java renamed to src/test/java/io/weaviate/client6/v1/api/AuthorizationTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.weaviate.integration;
1+
package io.weaviate.client6.v1.api;
22

33
import java.io.IOException;
44
import java.util.Collections;
@@ -9,13 +9,11 @@
99
import org.mockserver.integration.ClientAndServer;
1010
import org.mockserver.model.HttpRequest;
1111

12-
import io.weaviate.ConcurrentTest;
13-
import io.weaviate.client6.v1.api.Authorization;
1412
import io.weaviate.client6.v1.internal.rest.DefaultRestTransport;
1513
import io.weaviate.client6.v1.internal.rest.Endpoint;
1614
import io.weaviate.client6.v1.internal.rest.RestTransportOptions;
1715

18-
public class AuthorizationITest extends ConcurrentTest {
16+
public class AuthorizationTest {
1917
private ClientAndServer mockServer;
2018

2119
@Before

src/it/java/io/weaviate/integration/DefaultRestTransportITest.java renamed to src/test/java/io/weaviate/client6/v1/internal/rest/DefaultRestTransportTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.weaviate.integration;
1+
package io.weaviate.client6.v1.internal.rest;
22

33
import java.io.IOException;
44
import java.util.Collections;
@@ -13,13 +13,10 @@
1313
import org.mockserver.integration.ClientAndServer;
1414
import org.mockserver.model.HttpRequest;
1515

16-
import io.weaviate.client6.v1.internal.rest.DefaultRestTransport;
17-
import io.weaviate.client6.v1.internal.rest.Endpoint;
18-
import io.weaviate.client6.v1.internal.rest.RestTransportOptions;
19-
import io.weaviate.truststore.SingleTrustManagerFactory;
20-
import io.weaviate.truststore.SpyTrustManager;
16+
import io.weaviate.testutil.truststore.SingleTrustManagerFactory;
17+
import io.weaviate.testutil.truststore.SpyTrustManager;
2118

22-
public class DefaultRestTransportITest {
19+
public class DefaultRestTransportTest {
2320
private ClientAndServer mockServer;
2421
private DefaultRestTransport transport;
2522
private TrustManagerFactory tmf;

src/it/java/io/weaviate/truststore/SingleTrustManagerFactory.java renamed to src/test/java/io/weaviate/testutil/truststore/SingleTrustManagerFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
package io.weaviate.truststore;
1+
package io.weaviate.testutil.truststore;
22

33
import java.security.InvalidAlgorithmParameterException;
44
import java.security.KeyStore;
55
import java.security.KeyStoreException;
6-
import java.util.Arrays;
76

87
import javax.net.ssl.ManagerFactoryParameters;
98
import javax.net.ssl.TrustManager;
109
import javax.net.ssl.TrustManagerFactory;
1110
import javax.net.ssl.TrustManagerFactorySpi;
1211

12+
/** TrustManagerFactory which always returns the same {@code TrustManager}. */
1313
public final class SingleTrustManagerFactory extends TrustManagerFactory {
1414

15+
/** Create a factory that will return {@code TrustManager tm}. */
1516
public static TrustManagerFactory create(TrustManager tm) {
1617
return new SingleTrustManagerFactory(tm);
1718
}

src/it/java/io/weaviate/truststore/SpyTrustManager.java renamed to src/test/java/io/weaviate/testutil/truststore/SpyTrustManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.weaviate.truststore;
1+
package io.weaviate.testutil.truststore;
22

33
import java.security.cert.CertificateException;
44
import java.security.cert.X509Certificate;
@@ -7,6 +7,11 @@
77
import javax.net.ssl.TrustManagerFactory;
88
import javax.net.ssl.X509TrustManager;
99

10+
/**
11+
* Test fixture that records when this TrustManager has been used.
12+
* Combine with {@link SingleTrustManagerFactory#create} to mock
13+
* a custom TrustStore.
14+
*/
1015
public class SpyTrustManager implements X509TrustManager {
1116
private boolean used = false;
1217

0 commit comments

Comments
 (0)