Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1224 fixing test

This commit is contained in:
Clebert Suconic 2017-06-21 19:57:16 -04:00
parent b89ad66c62
commit e78a902881
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JournalFileSizeTest.java
View File

@ -1,5 +1,4 @@
/** /** * Licensed to the Apache Software Foundation (ASF) under one or more
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. * this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0 * The ASF licenses this file to You under the Apache License, Version 2.0
@ -17,7 +16,10 @@
package org.apache.activemq.artemis.tests.integration.persistence; package org.apache.activemq.artemis.tests.integration.persistence;
import java.io.File;
import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
import org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
import org.apache.activemq.artemis.utils.OrderedExecutorFactory; import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
import org.junit.Assert; import org.junit.Assert;
@ -25,11 +27,22 @@ import org.junit.Test;
public class JournalFileSizeTest { public class JournalFileSizeTest {
private static int align;
static {
try {
AIOSequentialFileFactory factory = new AIOSequentialFileFactory(new File("./target/"), 100);
align = factory.getAlignment();
} catch (Exception e) {
align = 512;
}
}
@Test @Test
public void testIncorrectFileSizeLower() { public void testIncorrectFileSizeLower() {
ConfigurationImpl config = new ConfigurationImpl(); ConfigurationImpl config = new ConfigurationImpl();
int origFileSize = config.getJournalFileSize(); int origFileSize = config.getJournalFileSize();
config.setJournalFileSize(origFileSize + (512 / 2 - 1)); config.setJournalFileSize(origFileSize + (align / 2 - 1));
JournalStorageManager manager = new JournalStorageManager(config, JournalStorageManager manager = new JournalStorageManager(config,
new OrderedExecutorFactory(null), new OrderedExecutorFactory(null),
new OrderedExecutorFactory(null)); new OrderedExecutorFactory(null));
@ -41,23 +54,23 @@ public class JournalFileSizeTest {
public void testIncorrectFileSizeHigher() { public void testIncorrectFileSizeHigher() {
ConfigurationImpl config = new ConfigurationImpl(); ConfigurationImpl config = new ConfigurationImpl();
int origFileSize = config.getJournalFileSize(); int origFileSize = config.getJournalFileSize();
config.setJournalFileSize(origFileSize + (512 / 2 + 1)); config.setJournalFileSize(origFileSize + (align / 2 + 1));
JournalStorageManager manager = new JournalStorageManager(config, JournalStorageManager manager = new JournalStorageManager(config,
new OrderedExecutorFactory(null), new OrderedExecutorFactory(null),
new OrderedExecutorFactory(null)); new OrderedExecutorFactory(null));
int fileSize = manager.getMessageJournal().getFileSize(); int fileSize = manager.getMessageJournal().getFileSize();
Assert.assertEquals(origFileSize + 512, fileSize); Assert.assertEquals(origFileSize + align, fileSize);
} }
@Test @Test
public void testIncorrectFileSizeHalf() { public void testIncorrectFileSizeHalf() {
ConfigurationImpl config = new ConfigurationImpl(); ConfigurationImpl config = new ConfigurationImpl();
int origFileSize = config.getJournalFileSize(); int origFileSize = config.getJournalFileSize();
config.setJournalFileSize(origFileSize + (512 / 2)); config.setJournalFileSize(origFileSize + (align / 2));
JournalStorageManager manager = new JournalStorageManager(config, JournalStorageManager manager = new JournalStorageManager(config,
new OrderedExecutorFactory(null), new OrderedExecutorFactory(null),
new OrderedExecutorFactory(null)); new OrderedExecutorFactory(null));
int fileSize = manager.getMessageJournal().getFileSize(); int fileSize = manager.getMessageJournal().getFileSize();
Assert.assertEquals(origFileSize + 512, fileSize); Assert.assertEquals(origFileSize + align, fileSize);
} }
} }