This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 84a58f6 TIKA-3414 -- skip zk tests on a mac or windows
new 982325a Merge remote-tracking branch 'origin/main' into main
84a58f6 is described below
commit 84a58f62426b15b9484b48e6244c2adab6631d67
Author: tballison <[email protected]>
AuthorDate: Sat May 22 05:26:43 2021 -0400
TIKA-3414 -- skip zk tests on a mac or windows
---
.../tika/pipes/solrtest/TikaPipesSolr6Test.java | 27 ++++-----------
...pesSolr6Test.java => TikaPipesSolr6ZkTest.java} | 32 +++++++-----------
.../tika/pipes/solrtest/TikaPipesSolr7Test.java | 29 ++++-------------
...pesSolr7Test.java => TikaPipesSolr7ZkTest.java} | 38 +++++++++-------------
.../tika/pipes/solrtest/TikaPipesSolr8Test.java | 28 ++++------------
...pesSolr6Test.java => TikaPipesSolr8ZkTest.java} | 32 +++++++-----------
.../tika/pipes/solrtest/TikaPipesSolrTestBase.java | 30 ++++++++++++++---
7 files changed, 83 insertions(+), 133 deletions(-)
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
index 5066fee..08d9e36 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
@@ -16,31 +16,16 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
- @Rule
- public GenericContainer<?> solr6 =
- new
GenericContainer<>(DockerImageName.parse("solr:6")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
-
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr6);
+ @Override
+ public boolean useZk() {
+ return false;
}
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
+ @Override
+ public String getSolrImageName() {
+ return "solr:6";
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
- }
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java
similarity index 51%
copy from
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
copy to
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java
index 5066fee..69b1daa 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6ZkTest.java
@@ -16,31 +16,23 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
+import static org.junit.Assume.assumeTrue;
-public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
+import org.junit.BeforeClass;
- @Rule
- public GenericContainer<?> solr6 =
- new
GenericContainer<>(DockerImageName.parse("solr:6")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
+import org.apache.tika.utils.SystemUtils;
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr6);
- }
+public class TikaPipesSolr6ZkTest extends TikaPipesSolr6Test {
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
+ @BeforeClass
+ public static void setUp() {
+ assumeTrue("zk test only works on linux (and not mac os x)",
+ SystemUtils.IS_OS_UNIX && ! SystemUtils.IS_OS_MAC_OSX);
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
+ @Override
+ public boolean useZk() {
+ return true;
}
+
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
index 314659d..364e370 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
@@ -16,32 +16,15 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
public class TikaPipesSolr7Test extends TikaPipesSolrTestBase {
- @Rule
- public GenericContainer<?> solr7 =
- new
GenericContainer<>(DockerImageName.parse("solr:7")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
-
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr7);
- }
-
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
-
+ @Override
+ public boolean useZk() {
+ return false;
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
+ @Override
+ public String getSolrImageName() {
+ return "solr:7";
}
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java
similarity index 51%
copy from
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
copy to
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java
index 314659d..719f84c 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr7ZkTest.java
@@ -16,32 +16,24 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
-public class TikaPipesSolr7Test extends TikaPipesSolrTestBase {
-
- @Rule
- public GenericContainer<?> solr7 =
- new
GenericContainer<>(DockerImageName.parse("solr:7")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
-
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr7);
- }
+import static org.junit.Assume.assumeTrue;
+
+import org.junit.BeforeClass;
+
+import org.apache.tika.utils.SystemUtils;
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
+public class TikaPipesSolr7ZkTest extends TikaPipesSolr7Test {
+ @BeforeClass
+ public static void setUp() {
+ assumeTrue("zk test only works on linux (and not mac os x)",
+ SystemUtils.IS_OS_UNIX && ! SystemUtils.IS_OS_MAC_OSX);
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
+
+ @Override
+ public boolean useZk() {
+ return true;
}
+
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
index 29411f4..63850f9 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8Test.java
@@ -16,31 +16,15 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
-
public class TikaPipesSolr8Test extends TikaPipesSolrTestBase {
- @Rule
- public GenericContainer<?> solr8 =
- new
GenericContainer<>(DockerImageName.parse("solr:8")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
-
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr8);
- }
-
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
+ @Override
+ public String getSolrImageName() {
+ return "solr:8";
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
+ @Override
+ public boolean useZk() {
+ return false;
}
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java
similarity index 51%
copy from
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
copy to
tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java
index 5066fee..4a3ab13 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr6Test.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolr8ZkTest.java
@@ -16,31 +16,23 @@
*/
package org.apache.tika.pipes.solrtest;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
+import static org.junit.Assume.assumeTrue;
-public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
+import org.junit.BeforeClass;
- @Rule
- public GenericContainer<?> solr6 =
- new
GenericContainer<>(DockerImageName.parse("solr:6")).withExposedPorts(8983, 9983)
- .withCommand("-DzkRun");
+import org.apache.tika.utils.SystemUtils;
- @Before
- public void setupTest() throws Exception {
- setupSolr(solr6);
- }
+public class TikaPipesSolr8ZkTest extends TikaPipesSolr8Test {
- @Test
- public void testFetchIteratorWithSolrUrls() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(false);
+ @BeforeClass
+ public static void setUp() {
+ assumeTrue("zk test only works on linux (and not mac os x)",
+ SystemUtils.IS_OS_UNIX && ! SystemUtils.IS_OS_MAC_OSX);
}
- @Test
- public void testFetchIteratorWithZkHost() throws Exception {
- runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(true);
+ @Override
+ public boolean useZk() {
+ return true;
}
+
}
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
index e8a0cd2..93ed746 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/java/org/apache/tika/pipes/solrtest/TikaPipesSolrTestBase.java
@@ -27,8 +27,12 @@ import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
import org.apache.solr.common.SolrInputDocument;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
+import org.testcontainers.utility.DockerImageName;
import org.apache.tika.cli.TikaCLI;
import org.apache.tika.pipes.PipeIntegrationTests;
@@ -45,6 +49,25 @@ public abstract class TikaPipesSolrTestBase {
private int zkPort;
private String solrEndpoint;
+ public abstract boolean useZk();
+ public abstract String getSolrImageName();
+
+ @Rule
+ public GenericContainer<?> solrContainer =
+ new
GenericContainer<>(DockerImageName.parse(getSolrImageName())).withExposedPorts(8983,
+ 9983)
+ .withCommand("-DzkRun");
+
+ @Before
+ public void setupTest() throws Exception {
+ setupSolr(solrContainer);
+ }
+
+ @Test
+ public void testFetchIteratorWithSolrUrls() throws Exception {
+ runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter();
+ }
+
private void createTestHtmlFiles(String bodyContent) throws Exception {
testFileFolder.mkdirs();
for (int i = 0; i < numDocs; ++i) {
@@ -80,9 +103,8 @@ public abstract class TikaPipesSolrTestBase {
/**
* Runs a test using Solr Pipe Iterator, File Fetcher and Solr Emitter.
*
- * @param useZk If true, use zookeeper to connect to solr. Otherwise use
direct solr URLs.
*/
- protected void runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter(boolean
useZk)
+ protected void runTikaAsyncSolrPipeIteratorFileFetcherSolrEmitter()
throws Exception {
File tikaConfigFile = new File("target", "ta.xml");
File log4jPropFile = new File("target", "tmp-log4j2.xml");
@@ -97,7 +119,7 @@ public abstract class TikaPipesSolrTestBase {
}
String tikaConfigXml =
- createTikaConfigXml(useZk, tikaConfigFile, log4jPropFile,
tikaConfigTemplateXml,
+ createTikaConfigXml(useZk(), tikaConfigFile, log4jPropFile,
tikaConfigTemplateXml,
SolrEmitter.UpdateStrategy.ADD,
SolrEmitter.AttachmentStrategy.CONCATENATE_CONTENT);
FileUtils.writeStringToFile(tikaConfigFile, tikaConfigXml,
StandardCharsets.UTF_8);
@@ -119,7 +141,7 @@ public abstract class TikaPipesSolrTestBase {
// It should not fail, and docs should be updated.
createTestHtmlFiles("updated");
tikaConfigXml =
- createTikaConfigXml(useZk, tikaConfigFile, log4jPropFile,
tikaConfigTemplateXml,
+ createTikaConfigXml(useZk(), tikaConfigFile, log4jPropFile,
tikaConfigTemplateXml,
SolrEmitter.UpdateStrategy.UPDATE_MUST_EXIST,
SolrEmitter.AttachmentStrategy.CONCATENATE_CONTENT);
FileUtils.writeStringToFile(tikaConfigFile, tikaConfigXml,
StandardCharsets.UTF_8);
