You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/10/14 15:09:35 UTC
nifi git commit: Adjusting test to use a temporary folder to
alleviate Windows concerns with provenance testing.
Repository: nifi
Updated Branches:
refs/heads/appveyor-improvement c9fb0b142 -> e3624ee56
Adjusting test to use a temporary folder to alleviate Windows concerns with provenance testing.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e3624ee5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e3624ee5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e3624ee5
Branch: refs/heads/appveyor-improvement
Commit: e3624ee5654a2aa7f0555901c9604833c97f2ef8
Parents: c9fb0b1
Author: Aldrin Piri <al...@apache.org>
Authored: Fri Oct 14 11:09:25 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Oct 14 11:09:25 2016 -0400
----------------------------------------------------------------------
.../TestPersistentProvenanceRepository.java | 32 +++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/e3624ee5/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
index 80a67eb..7c8a6dc 100644
--- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
+++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
@@ -85,6 +85,7 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -97,6 +98,9 @@ public class TestPersistentProvenanceRepository {
@Rule
public TestName name = new TestName();
+ @Rule
+ TemporaryFolder testFolder = new TemporaryFolder();
+
private PersistentProvenanceRepository repo;
private RepositoryConfiguration config;
@@ -104,9 +108,9 @@ public class TestPersistentProvenanceRepository {
private EventReporter eventReporter;
private List<ReportedEvent> reportedEvents = Collections.synchronizedList(new ArrayList<ReportedEvent>());
- private RepositoryConfiguration createConfiguration() {
+ private RepositoryConfiguration createConfiguration() throws IOException {
config = new RepositoryConfiguration();
- config.addStorageDirectory(new File("target/storage/" + UUID.randomUUID().toString()));
+ config.addStorageDirectory(testFolder.newFolder());
config.setCompressOnRollover(true);
config.setMaxEventFileLife(2000L, TimeUnit.SECONDS);
config.setCompressionBlockBytes(100);
@@ -169,7 +173,6 @@ public class TestPersistentProvenanceRepository {
}
-
private EventReporter getEventReporter() {
return eventReporter;
}
@@ -360,7 +363,7 @@ public class TestPersistentProvenanceRepository {
int immenseAttrSize = 33000; // must be greater than 32766 for a meaningful test
StringBuilder immenseBldr = new StringBuilder(immenseAttrSize);
- for (int i=0; i < immenseAttrSize; i++) {
+ for (int i = 0; i < immenseAttrSize; i++) {
immenseBldr.append('0');
}
final String uuid = "00000000-0000-0000-0000-000000000000";
@@ -1491,9 +1494,9 @@ public class TestPersistentProvenanceRepository {
assertEquals(5, lineageNodes.stream().map(node -> node.getNodeType()).filter(t -> t == LineageNodeType.PROVENANCE_EVENT_NODE).count());
final Set<EventNode> eventNodes = lineageNodes.stream()
- .filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE)
- .map(node -> (EventNode) node)
- .collect(Collectors.toSet());
+ .filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE)
+ .map(node -> (EventNode) node)
+ .collect(Collectors.toSet());
final Map<ProvenanceEventType, List<EventNode>> nodesByType = eventNodes.stream().collect(Collectors.groupingBy(EventNode::getEventType));
assertEquals(1, nodesByType.get(ProvenanceEventType.RECEIVE).size());
@@ -1517,9 +1520,9 @@ public class TestPersistentProvenanceRepository {
assertEquals(3, expandChildNodes.stream().map(node -> node.getNodeType()).filter(t -> t == LineageNodeType.PROVENANCE_EVENT_NODE).count());
final Set<EventNode> childEventNodes = expandChildNodes.stream()
- .filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE)
- .map(node -> (EventNode) node)
- .collect(Collectors.toSet());
+ .filter(node -> node.getNodeType() == LineageNodeType.PROVENANCE_EVENT_NODE)
+ .map(node -> (EventNode) node)
+ .collect(Collectors.toSet());
final Map<ProvenanceEventType, List<EventNode>> childNodesByType = childEventNodes.stream().collect(Collectors.groupingBy(EventNode::getEventType));
assertEquals(1, childNodesByType.get(ProvenanceEventType.FORK).size());
@@ -1529,7 +1532,6 @@ public class TestPersistentProvenanceRepository {
}
-
@Test
public void testBackPressure() throws IOException, InterruptedException {
final RepositoryConfiguration config = createConfiguration();
@@ -1720,7 +1722,7 @@ public class TestPersistentProvenanceRepository {
final RepositoryConfiguration config = createConfiguration();
config.setMaxEventFileLife(3, TimeUnit.SECONDS);
- repo = new PersistentProvenanceRepository(config, DEFAULT_ROLLOVER_MILLIS){
+ repo = new PersistentProvenanceRepository(config, DEFAULT_ROLLOVER_MILLIS) {
@Override
File mergeJournals(List<File> journalFiles, File suggestedMergeFile, EventReporter eventReporter) throws IOException {
retryAmount.incrementAndGet();
@@ -1766,7 +1768,7 @@ public class TestPersistentProvenanceRepository {
exec.awaitTermination(10, TimeUnit.SECONDS);
repo.waitForRollover();
- assertEquals(5,retryAmount.get());
+ assertEquals(5, retryAmount.get());
}
@Test
@@ -1801,7 +1803,7 @@ public class TestPersistentProvenanceRepository {
}
- @Test(timeout=5000)
+ @Test(timeout = 5000)
public void testExceptionOnIndex() throws IOException {
final RepositoryConfiguration config = createConfiguration();
config.setMaxAttributeChars(50);
@@ -1840,7 +1842,7 @@ public class TestPersistentProvenanceRepository {
builder.setComponentId("1234");
builder.setComponentType("dummy processor");
- for (int i=0; i < 1000; i++) {
+ for (int i = 0; i < 1000; i++) {
final ProvenanceEventRecord record = builder.build();
repo.registerEvent(record);
}