You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/08/25 22:11:20 UTC
svn commit: r1161727 - in /incubator/flume/branches/flume-728/flume-ng-core:
./ src/main/java/org/apache/flume/durability/file/
src/test/java/org/apache/flume/durability/file/
Author: esammer
Date: Thu Aug 25 20:11:19 2011
New Revision: 1161727
URL: http://svn.apache.org/viewvc?rev=1161727&view=rev
Log:
- Added commons-io to flume-ng-core dependencies.
- Improved test directory clean up for WAL writer tests.
- Fixed a bad junit import.
Modified:
incubator/flume/branches/flume-728/flume-ng-core/pom.xml
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java
Modified: incubator/flume/branches/flume-728/flume-ng-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/pom.xml?rev=1161727&r1=1161726&r2=1161727&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/pom.xml Thu Aug 25 20:11:19 2011
@@ -65,6 +65,11 @@
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java?rev=1161727&r1=1161726&r2=1161727&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java Thu Aug 25 20:11:19 2011
@@ -90,7 +90,7 @@ public class FileBasedWAL implements WAL
FileBasedWALWriter writer = new FileBasedWALWriter();
writer.setFormatter(formatter);
- writer.setFile(openDirectory);
+ writer.setDirectory(openDirectory);
if (!isInitialized) {
initialize();
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java?rev=1161727&r1=1161726&r2=1161727&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java Thu Aug 25 20:11:19 2011
@@ -80,7 +80,7 @@ public class FileBasedWALWriter implemen
return directory;
}
- public void setFile(File file) {
+ public void setDirectory(File file) {
this.directory = file;
}
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java?rev=1161727&r1=1161726&r2=1161727&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java Thu Aug 25 20:11:19 2011
@@ -3,13 +3,12 @@ package org.apache.flume.durability.file
import java.io.File;
import java.io.IOException;
-import junit.framework.Assert;
-
+import org.apache.commons.io.FileUtils;
import org.apache.flume.Event;
-import org.apache.flume.durability.file.FileBasedWALWriter;
import org.apache.flume.event.SimpleEvent;
import org.apache.flume.formatter.output.TextDelimitedOutputFormatter;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -26,15 +25,10 @@ public class TestFileBasedWALWriter {
}
@After
- public void tearDown() {
- if (testDirectory.exists()) {
- for (File entry : testDirectory.listFiles()) {
- entry.delete();
- }
-
- testDirectory.delete();
- }
+ public void tearDown() throws IOException {
+ FileUtils.deleteDirectory(testDirectory);
+ /* Do not die if we can't delete this. Parallel tests could be using it. */
testDirectory.getParentFile().delete();
}
@@ -47,7 +41,7 @@ public class TestFileBasedWALWriter {
event.setBody("Test event".getBytes());
writer.setFormatter(new TextDelimitedOutputFormatter());
- writer.setFile(new File(testDirectory, "test.wal"));
+ writer.setDirectory(testDirectory);
writer.open();
writer.write(event);