davidvoit commented on PR #8795:
URL: https://github.com/apache/camel/pull/8795#issuecomment-1332531009
Alex and me worked on the unit test. Before we update the pull request we
are not quite sure about the onCompletion handling.
Is it guarenteed that after a MockEndpoint.assertIsSatisfied(context); all
onCompletions should be done triggered?
To be failsafe we added our own onComplete varaible and some Thread.sleep
loop to wait for the file delteion (which is not called without the multicast
patch in this pull request). We hope this is not to dirty.
Should we first commit the unit test alone (which will trigger the failure,
and would be shown in github ci?) or should we push both changes at once?
```
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.apache.camel.processor.aggregate.zipfile;
import java.io.File;
import java.io.FileInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import
org.apache.camel.processor.aggregate.GroupedMessageAggregationStrategy;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.*;
public class ZipAggregationStrategySplitTest extends CamelTestSupport {
private static final int EXPECTED_NO_FILES = 3;
private static final String TEST_DIR =
"target/out_ZipAggregationStrategyTest";
private String tempFile;
private boolean onCompleteCalled = false;
@Override
@BeforeEach
public void setUp() throws Exception {
deleteDirectory(TEST_DIR);
super.setUp();
}
@Test
public void testSplitter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:aggregateToZipEntry");
mock.expectedMessageCount(1);
MockEndpoint.assertIsSatisfied(context);
tempFile = mock.getExchanges().get(0).getIn().getHeader("tempFile",
String.class);
File[] files = new File(TEST_DIR).listFiles();
assertNotNull(files);
assertTrue(files.length > 0, "Should be a file in " + TEST_DIR + "
directory");
File resultFile = files[0];
ZipInputStream zin = new ZipInputStream(new
FileInputStream(resultFile));
try {
int fileCount = 0;
for (ZipEntry ze = zin.getNextEntry(); ze != null; ze =
zin.getNextEntry()) {
fileCount++;
}
assertEquals(ZipAggregationStrategySplitTest.EXPECTED_NO_FILES,
fileCount,
"Zip file should contains " +
ZipAggregationStrategySplitTest.EXPECTED_NO_FILES + " files");
} finally {
IOHelper.close(zin);
}
// Give delete some time if necessary
if (!onCompleteCalled) {
for (int i=0; i < 5; i++) {
if (onCompleteCalled)
break;
Thread.sleep(1000);
}
if (!onCompleteCalled) {
fail("onComplete was not called!");
}
}
// Temp file needs to be deleted now
assertFalse(new File(tempFile).exists());
}
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
onCompletion()
.process(exchange -> onCompleteCalled = true);
// Unzip file and Split it according to FileEntry
from("file:src/test/resources/org/apache/camel/aggregate/zipfile/data?delay=1000&noop=true")
.aggregate(new GroupedMessageAggregationStrategy())
.constant(true)
.completionFromBatchConsumer()
.eagerCheckCompletion()
.split(body(), new ZipAggregationStrategy(true, true))
.streaming()
.process(exchange -> { /* NOOP - Do nothing */ })
.end()
.setHeader("tempFile", header("CamelFileAbsolutePath"))
.to("file:" + TEST_DIR)
.to("mock:aggregateToZipEntry")
.log("Done processing zip file:
${header.CamelFileName}");
}
};
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
