"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectWriteTest.java" between
apache-log4j-2.11.1-src.tar.gz and apache-log4j-2.11.2-src.tar.gz

About: Apache Log4j 2 is a logging library for Java. Source distribution (Java).

RollingAppenderDirectWriteTest.java  (apache-log4j-2.11.1-src):RollingAppenderDirectWriteTest.java  (apache-log4j-2.11.2-src)
skipping to change at line 19 skipping to change at line 19
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the license for the specific language governing permissions and * See the license for the specific language governing permissions and
* limitations under the license. * limitations under the license.
*/ */
package org.apache.logging.log4j.core.appender.rolling; package org.apache.logging.log4j.core.appender.rolling;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.InputStreamReader;
import java.util.zip.GZIPInputStream;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule; import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.RuleChain; import org.junit.rules.RuleChain;
import static org.apache.logging.log4j.hamcrest.Descriptors.that; import static org.apache.logging.log4j.hamcrest.Descriptors.that;
import static org.apache.logging.log4j.hamcrest.FileMatchers.hasName; import static org.apache.logging.log4j.hamcrest.FileMatchers.hasName;
import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.endsWith;
skipping to change at line 56 skipping to change at line 61
private Logger logger; private Logger logger;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
this.logger = loggerContextRule.getLogger(RollingAppenderDirectWriteTest .class.getName()); this.logger = loggerContextRule.getLogger(RollingAppenderDirectWriteTest .class.getName());
} }
@Test @Test
public void testAppender() throws Exception { public void testAppender() throws Exception {
for (int i=0; i < 100; ++i) { final int count = 100;
for (int i=0; i < count; ++i) {
logger.debug("This is test message number " + i); logger.debug("This is test message number " + i);
} }
Thread.sleep(50); Thread.sleep(50);
final File dir = new File(DIR); final File dir = new File(DIR);
assertTrue("Directory not created", dir.exists() && dir.listFiles().leng th > 0); assertTrue("Directory not created", dir.exists() && dir.listFiles().leng th > 0);
final File[] files = dir.listFiles(); final File[] files = dir.listFiles();
assertNotNull(files); assertNotNull(files);
assertThat(files, hasItemInArray(that(hasName(that(endsWith(".gz")))))); assertThat(files, hasItemInArray(that(hasName(that(endsWith(".gz"))))));
int found = 0;
for (final File file: files) {
final String actual = file.getName();
BufferedReader reader;
if (file.getName().endsWith(".gz")) {
reader = new BufferedReader(new InputStreamReader(new GZIPInputS
tream(new FileInputStream(file))));
} else {
reader = new BufferedReader(new FileReader(file));
}
String line;
while ((line = reader.readLine()) != null) {
assertNotNull("No log event in file " + actual, line);
final String[] parts = line.split((" "));
final String expected = "test1-" + parts[0];
assertTrue("Incorrect file name. Expected file prefix: " + expec
ted + " Actual: " + actual,
actual.startsWith(expected));
++found;
}
reader.close();
}
assertEquals("Incorrect number of events read. Expected " + count + ", A
ctual " + found, count, found);
} }
} }
 End of changes. 4 change blocks. 
1 lines changed or deleted 31 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)