Skip to content
Snippets Groups Projects
Commit 548973df authored by Vincent Massol's avatar Vincent Massol
Browse files

[Misc] Convert tests for to JUnit5

parent 4eddaea2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 202 additions and 202 deletions
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/ImageIdTest.java
+ 5
− 5
View file @ 548973df
......@@ -19,10 +19,10 @@
*/
package org.xwiki.rendering.internal.macro.chart;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xwiki.rendering.macro.chart.ChartMacroParameters;
import org.junit.Assert;
import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Unit tests for {@link ImageId}.
......@@ -30,17 +30,17 @@
* @version $Id$
* @since 4.2M1
*/
public class ImageIdTest
class ImageIdTest
{
/**
* Verify id are different even when using same parameters (but different instances of parameters).
*/
@Test
public void testGetIdWithSameParametersButDifferentInstances()
void getIdWithSameParametersButDifferentInstances()
{
ChartMacroParameters parameters1 = new ChartMacroParameters();
ChartMacroParameters parameters2 = new ChartMacroParameters();
Assert.assertFalse(new ImageId(parameters1).getId().equals(new ImageId(parameters2).getId()));
assertFalse(new ImageId(parameters1).getId().equals(new ImageId(parameters2).getId()));
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/TemporaryChartImageWriterTest.java
+ 29
− 24
View file @ 548973df
......@@ -21,17 +21,18 @@
import java.io.File;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xwiki.bridge.DocumentAccessBridge;
import org.xwiki.environment.Environment;
import org.xwiki.model.ModelContext;
import org.xwiki.model.reference.DocumentReference;
import org.xwiki.model.reference.WikiReference;
import org.xwiki.rendering.macro.chart.ChartMacroParameters;
import org.xwiki.test.mockito.MockitoComponentMockingRule;
import org.xwiki.test.junit5.mockito.ComponentTest;
import org.xwiki.test.junit5.mockito.InjectMockComponents;
import org.xwiki.test.junit5.mockito.MockComponent;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
/**
......@@ -40,40 +41,44 @@
* @version $Id$
* @since 4.2M3
*/
public class TemporaryChartImageWriterTest
@ComponentTest
class TemporaryChartImageWriterTest
{
@Rule
public MockitoComponentMockingRule<TemporaryChartImageWriter> componentManager =
new MockitoComponentMockingRule<TemporaryChartImageWriter>(TemporaryChartImageWriter.class);
@InjectMockComponents
private TemporaryChartImageWriter writer;
@MockComponent
private ModelContext modelContext;
@MockComponent
private Environment environment;
@MockComponent
private DocumentAccessBridge dab;
@Test
public void getStorageLocation() throws Exception
void getStorageLocation() throws Exception
{
WikiReference currentWikiReference = new WikiReference("wiki");
ModelContext modelContext = this.componentManager.getInstance(ModelContext.class);
when(modelContext.getCurrentEntityReference()).thenReturn(currentWikiReference);
when(this.modelContext.getCurrentEntityReference()).thenReturn(currentWikiReference);
Environment environment = this.componentManager.getInstance(Environment.class);
when(environment.getTemporaryDirectory()).thenReturn(new File("/tmpdir"));
when(this.environment.getTemporaryDirectory()).thenReturn(new File("/tmpdir"));
File location = this.componentManager.getComponentUnderTest().getStorageLocation(
new ImageId(new ChartMacroParameters()));
Assert.assertTrue("Got: " + location.toString(),
location.toString().matches("/tmpdir/temp/chart/wiki/space/page/.*\\.png"));
File location = this.writer.getStorageLocation(new ImageId(new ChartMacroParameters()));
assertTrue(location.toString().matches("/tmpdir/temp/chart/wiki/space/page/.*\\.png"),
"Got: " + location);
}
@Test
public void getURL() throws Exception
void getURL() throws Exception
{
WikiReference currentWikiReference = new WikiReference("wiki");
ModelContext modelContext = this.componentManager.getInstance(ModelContext.class);
when(modelContext.getCurrentEntityReference()).thenReturn(currentWikiReference);
when(this.modelContext.getCurrentEntityReference()).thenReturn(currentWikiReference);
DocumentAccessBridge dab = this.componentManager.getInstance(DocumentAccessBridge.class);
when(dab.getDocumentURL(new DocumentReference("wiki", "space", "page"), "temp", null, null)).thenReturn(
when(this.dab.getDocumentURL(new DocumentReference("wiki", "space", "page"), "temp", null, null)).thenReturn(
"temp/Space/Page");
String location = this.componentManager.getComponentUnderTest().getURL(new ImageId(new ChartMacroParameters()));
Assert.assertTrue("Got: " + location, location.toString().matches("temp/Space/Page/chart/.*\\.png"));
String location = this.writer.getURL(new ImageId(new ChartMacroParameters()));
assertTrue(location.matches("temp/Space/Page/chart/.*\\.png"), "Got: " + location);
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/AbstractMacroContentTableBlockDataSourceTest.java
+ 17
− 30
View file @ 548973df
......@@ -23,14 +23,13 @@
import java.util.HashMap;
import java.util.Map;
import org.jmock.Expectations;
import org.junit.Before;
import javax.inject.Named;
import org.xwiki.component.manager.ComponentManager;
import org.xwiki.model.internal.DefaultModelConfiguration;
import org.xwiki.model.internal.reference.DefaultEntityReferenceProvider;
import org.xwiki.model.internal.reference.RelativeStringEntityReferenceResolver;
import org.xwiki.rendering.block.XDOM;
import org.xwiki.rendering.internal.macro.chart.source.DataSource;
import org.xwiki.rendering.internal.parser.reference.DefaultUntypedLinkReferenceParser;
import org.xwiki.rendering.internal.parser.reference.type.AttachmentResourceReferenceTypeParser;
import org.xwiki.rendering.internal.parser.reference.type.DocumentResourceReferenceTypeParser;
......@@ -45,11 +44,12 @@
import org.xwiki.rendering.internal.renderer.plain.PlainTextRendererFactory;
import org.xwiki.rendering.macro.MacroContentParser;
import org.xwiki.rendering.parser.Parser;
import org.xwiki.rendering.renderer.BlockRenderer;
import org.xwiki.rendering.syntax.Syntax;
import org.xwiki.test.annotation.ComponentList;
import org.xwiki.test.jmock.AbstractMockingComponentTestCase;
import org.xwiki.test.jmock.annotation.MockingRequirement;
import org.xwiki.test.junit5.mockito.InjectComponentManager;
import org.xwiki.test.junit5.mockito.InjectMockComponents;
import static org.mockito.Mockito.when;
/**
* Helper to write unit tests for Table-based data sources.
......@@ -76,26 +76,18 @@
RelativeStringEntityReferenceResolver.class
})
//@formatter:on
@MockingRequirement(value = MacroContentTableBlockDataSource.class,
exceptions={ComponentManager.class, BlockRenderer.class})
public abstract class AbstractMacroContentTableBlockDataSourceTest extends AbstractMockingComponentTestCase
abstract class AbstractMacroContentTableBlockDataSourceTest
{
private MacroContentTableBlockDataSource source;
@Before
public void configure() throws Exception
{
this.source = getComponentManager().getInstance(DataSource.class, "inline");
}
@InjectMockComponents
@Named("inline")
protected MacroContentTableBlockDataSource source;
protected MacroContentTableBlockDataSource getDataSource()
{
return this.source;
}
@InjectComponentManager
private ComponentManager componentManager;
protected Map<String, String> map(String... keyValues)
{
Map<String, String> map = new HashMap<String, String>();
Map<String, String> map = new HashMap<>();
for (int i = 0; i < keyValues.length; i += 2) {
map.put(keyValues[i], keyValues[i + 1]);
......@@ -104,19 +96,14 @@ protected Map<String, String> map(String... keyValues)
return map;
}
protected void setUpContentExpectation(final String macroContent) throws Exception
protected void setUpContentExpectation(String macroContent) throws Exception
{
final MacroContentParser parser = getComponentManager().getInstance(MacroContentParser.class);
// In order to make it easy to write unit tests, we allow tests to pass a string written in XWiki/2.0 synyax
// which we then parser to generate an XDOM that we use in the expectation.
final XDOM expectedXDOM = getComponentManager().<Parser>getInstance(Parser.class,
XDOM expectedXDOM = this.componentManager.<Parser>getInstance(Parser.class,
Syntax.XWIKI_2_0.toIdString()).parse(new StringReader(macroContent));
getMockery().checking(new Expectations() {{
// Simulate parsing the macro content that returns a XDOM not containing a table
oneOf(parser).parse(macroContent, null, true, false);
will(returnValue(expectedXDOM));
}});
MacroContentParser parser = this.componentManager.getInstance(MacroContentParser.class);
when(parser.parse(macroContent, null, true, false)).thenReturn(expectedXDOM);
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/DocumentTableBlockDataSourceTest.java
+ 23
− 18
View file @ 548973df
......@@ -21,9 +21,7 @@
import java.util.Collections;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xwiki.bridge.DocumentAccessBridge;
import org.xwiki.model.reference.DocumentReference;
import org.xwiki.model.reference.DocumentReferenceResolver;
......@@ -32,9 +30,14 @@
import org.xwiki.rendering.block.MetaDataBlock;
import org.xwiki.rendering.block.match.BlockMatcher;
import org.xwiki.rendering.listener.MetaData;
import org.xwiki.test.mockito.MockitoComponentMockingRule;
import org.xwiki.test.junit5.mockito.ComponentTest;
import org.xwiki.test.junit5.mockito.InjectMockComponents;
import org.xwiki.test.junit5.mockito.MockComponent;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Unit tests for {@link DocumentTableBlockDataSource}.
......@@ -42,32 +45,34 @@
* @version $$Id$
* @since 5.0RC1
*/
public class DocumentTableBlockDataSourceTest
@ComponentTest
class DocumentTableBlockDataSourceTest
{
@Rule
public MockitoComponentMockingRule<DocumentTableBlockDataSource> componentManager =
new MockitoComponentMockingRule<DocumentTableBlockDataSource>(DocumentTableBlockDataSource.class);
@InjectMockComponents
private DocumentTableBlockDataSource source;
@MockComponent
private DocumentAccessBridge dab;
@MockComponent
private DocumentReferenceResolver<String> resolver;
@Test
public void isDefinedChartSourceTheCurrentDocumentWhenReferenceNotNullAndMatching() throws Exception
void isDefinedChartSourceTheCurrentDocumentWhenReferenceNotNullAndMatching() throws Exception
{
DocumentAccessBridge dab = this.componentManager.getInstance(DocumentAccessBridge.class);
DocumentReference currentReference = new DocumentReference("currentwiki", "currentspace", "currentpage");
when(dab.getCurrentDocumentReference()).thenReturn(currentReference);
when(this.dab.getCurrentDocumentReference()).thenReturn(currentReference);
DocumentReferenceResolver<String> resolver =
this.componentManager.getInstance(DocumentReferenceResolver.TYPE_STRING);
DocumentReference documentReference = new DocumentReference("wiki", "space", "page");
when(resolver.resolve("wiki:space.page", currentReference)).thenReturn(documentReference);
when(this.resolver.resolve("wiki:space.page", currentReference)).thenReturn(documentReference);
MacroBlock currentMacroBlock = mock(MacroBlock.class);
MetaDataBlock metaDataBlock = new MetaDataBlock(Collections.EMPTY_LIST,
new MetaData(Collections.singletonMap(MetaData.SOURCE, (Object) "wiki:space.page")));
when(currentMacroBlock.getFirstBlock(any(BlockMatcher.class), any(Block.Axes.class))).thenReturn(metaDataBlock);
DocumentTableBlockDataSource source = this.componentManager.getComponentUnderTest();
source.setParameter("document", "wiki:space.page");
this.source.setParameter("document", "wiki:space.page");
Assert.assertTrue(source.isDefinedChartSourceTheCurrentDocument(currentMacroBlock));
assertTrue(source.isDefinedChartSourceTheCurrentDocument(currentMacroBlock));
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/MacroContentTableBlockDataSourceTest.java
+ 24
− 26
View file @ 548973df
......@@ -19,9 +19,12 @@
*/
package org.xwiki.rendering.internal.macro.chart.source.table;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xwiki.rendering.macro.MacroExecutionException;
import org.xwiki.test.junit5.mockito.ComponentTest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Unit tests for {@link MacroContentTableBlockDataSource}.
......@@ -29,43 +32,38 @@
* @version $Id$
* @since 2.4M2
*/
public class MacroContentTableBlockDataSourceTest extends AbstractMacroContentTableBlockDataSourceTest
@ComponentTest
class MacroContentTableBlockDataSourceTest extends AbstractMacroContentTableBlockDataSourceTest
{
@Test
public void testGetTableBlockWhenNullMacroContent() throws Exception
void getTableBlockWhenNullMacroContent()
{
try {
getDataSource().getTableBlock(null, null);
Assert.fail("Should have thrown an exception");
} catch (MacroExecutionException expected) {
Assert.assertEquals("A Chart Macro using an inline source must have a data table defined in its content.",
expected.getMessage());
}
Throwable exception = assertThrows(MacroExecutionException.class, () -> {
this.source.getTableBlock(null, null);
});
assertEquals("A Chart Macro using an inline source must have a data table defined in its content.",
exception.getMessage());
}
@Test
public void testGetTableBlockWhenEmptyMacroContent() throws Exception
void getTableBlockWhenEmptyMacroContent()
{
try {
getDataSource().getTableBlock("", null);
Assert.fail("Should have thrown an exception");
} catch (MacroExecutionException expected) {
Assert.assertEquals("A Chart Macro using an inline source must have a data table defined in its content.",
expected.getMessage());
}
Throwable exception = assertThrows(MacroExecutionException.class, () -> {
this.source.getTableBlock("", null);
});
assertEquals("A Chart Macro using an inline source must have a data table defined in its content.",
exception.getMessage());
}
@Test
public void testGetTableBlockWhenMacroContentDoesntContainTable() throws Exception
void getTableBlockWhenMacroContentDoesntContainTable() throws Exception
{
// Simulate a macro content of "not a table", i.e. not containing a table.
setUpContentExpectation("not a table");
try {
getDataSource().getTableBlock("not a table", null);
Assert.fail("Should have thrown an exception");
} catch (MacroExecutionException expected) {
Assert.assertEquals("Unable to locate a suitable data table.", expected.getMessage());
}
Throwable exception = assertThrows(MacroExecutionException.class, () -> {
this.source.getTableBlock("not a table", null);
});
assertEquals("Unable to locate a suitable data table.", exception.getMessage());
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/RangeParserTest.java
+ 14
− 13
View file @ 548973df
......@@ -19,27 +19,28 @@
*/
package org.xwiki.rendering.internal.macro.chart.source.table;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests the range parser from {@link AbstractTableBlockDataSource}.
*
* @version $Id$
*/
public class RangeParserTest
class RangeParserTest
{
@Test
public void getColumnNumberFromIdentifier()
void getColumnNumberFromIdentifier()
{
Assert.assertTrue(0 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("A4"));
Assert.assertTrue(1 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("B4"));
Assert.assertTrue(25 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("Z4"));
Assert.assertTrue(26 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("AA4"));
Assert.assertTrue(27 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("AB4"));
Assert.assertTrue(52 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("BA4"));
Assert.assertTrue(53 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("BB4"));
Assert.assertTrue(701 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("ZZ4"));
Assert.assertTrue(null == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("."));
assertTrue(0 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("A4"));
assertTrue(1 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("B4"));
assertTrue(25 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("Z4"));
assertTrue(26 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("AA4"));
assertTrue(27 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("AB4"));
assertTrue(52 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("BA4"));
assertTrue(53 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("BB4"));
assertTrue(701 == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("ZZ4"));
assertTrue(null == AbstractTableBlockDataSource.getColumnNumberFromIdentifier("."));
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/TableCategoryDatasetBuilderTest.java
+ 40
− 39
View file @ 548973df
......@@ -19,15 +19,15 @@
*/
package org.xwiki.rendering.internal.macro.chart.source.table;
import org.junit.Assert;
import org.junit.Test;
import org.jfree.data.general.Dataset;
import org.jfree.chart.axis.ValueAxis;
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.data.category.CategoryDataset;
import org.junit.jupiter.api.Test;
import org.xwiki.chart.model.ChartModel;
import org.xwiki.test.junit5.mockito.ComponentTest;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests building a category dataset from a table data source.
......@@ -35,10 +35,11 @@
* @version $Id$
* @since 4.2M1
*/
public class TableCategoryDatasetBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
@ComponentTest
class TableCategoryDatasetBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
{
@Test
public void testBuildCategoryDataset() throws Exception
void buildCategoryDataset() throws Exception
{
String content =
"| column 1 | column 2 | column 3 | column 4\n" +
......@@ -46,35 +47,35 @@ public void testBuildCategoryDataset() throws Exception
"| row 2 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map("type", "line", "range", "B2-D3"), null);
this.source.buildDataset(content, map("type", "line", "range", "B2-D3"), null);
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Dataset dataset = chartModel.getDataset();
Assert.assertTrue(dataset instanceof CategoryDataset);
Assert.assertTrue(chartModel.getAxis(0) instanceof CategoryAxis);
Assert.assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
assertTrue(dataset instanceof CategoryDataset);
assertTrue(chartModel.getAxis(0) instanceof CategoryAxis);
assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
CategoryDataset categoryDataset = (CategoryDataset) dataset;
Assert.assertTrue(categoryDataset.getRowKey(0).equals(" row 1 "));
Assert.assertTrue(categoryDataset.getRowKey(1).equals(" row 2 "));
assertTrue(categoryDataset.getRowKey(0).equals(" row 1 "));
assertTrue(categoryDataset.getRowKey(1).equals(" row 2 "));
Assert.assertTrue(categoryDataset.getColumnKey(0).equals(" column 2 "));
Assert.assertTrue(categoryDataset.getColumnKey(1).equals(" column 3 "));
Assert.assertTrue(categoryDataset.getColumnKey(2).equals(" column 4"));
assertTrue(categoryDataset.getColumnKey(0).equals(" column 2 "));
assertTrue(categoryDataset.getColumnKey(1).equals(" column 3 "));
assertTrue(categoryDataset.getColumnKey(2).equals(" column 4"));
Assert.assertTrue(categoryDataset.getValue(0, 0).intValue() == 12);
Assert.assertTrue(categoryDataset.getValue(0, 1).intValue() == 13);
Assert.assertTrue(categoryDataset.getValue(0, 2).intValue() == 14);
Assert.assertTrue(categoryDataset.getValue(1, 0).intValue() == 22);
Assert.assertTrue(categoryDataset.getValue(1, 1).intValue() == 23);
Assert.assertTrue(categoryDataset.getValue(1, 2).intValue() == 24);
assertTrue(categoryDataset.getValue(0, 0).intValue() == 12);
assertTrue(categoryDataset.getValue(0, 1).intValue() == 13);
assertTrue(categoryDataset.getValue(0, 2).intValue() == 14);
assertTrue(categoryDataset.getValue(1, 0).intValue() == 22);
assertTrue(categoryDataset.getValue(1, 1).intValue() == 23);
assertTrue(categoryDataset.getValue(1, 2).intValue() == 24);
}
@Test
public void testBuildCategoryDatasetColumnsSeries() throws Exception
void buildCategoryDatasetColumnsSeries() throws Exception
{
String content =
"| column 1 | column 2 | column 3 | column 4\n" +
......@@ -82,30 +83,30 @@ public void testBuildCategoryDatasetColumnsSeries() throws Exception
"| row 2 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map("type", "line", "range", "B2-D3", "series", "columns"), null);
this.source.buildDataset(content, map("type", "line", "range", "B2-D3", "series", "columns"), null);
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Dataset dataset = chartModel.getDataset();
Assert.assertTrue(dataset instanceof CategoryDataset);
Assert.assertTrue(chartModel.getAxis(0) instanceof CategoryAxis);
Assert.assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
assertTrue(dataset instanceof CategoryDataset);
assertTrue(chartModel.getAxis(0) instanceof CategoryAxis);
assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
CategoryDataset categoryDataset = (CategoryDataset) dataset;
Assert.assertTrue(categoryDataset.getColumnKey(0).equals(" row 1 "));
Assert.assertTrue(categoryDataset.getColumnKey(1).equals(" row 2 "));
assertTrue(categoryDataset.getColumnKey(0).equals(" row 1 "));
assertTrue(categoryDataset.getColumnKey(1).equals(" row 2 "));
Assert.assertTrue(categoryDataset.getRowKey(0).equals(" column 2 "));
Assert.assertTrue(categoryDataset.getRowKey(1).equals(" column 3 "));
Assert.assertTrue(categoryDataset.getRowKey(2).equals(" column 4"));
assertTrue(categoryDataset.getRowKey(0).equals(" column 2 "));
assertTrue(categoryDataset.getRowKey(1).equals(" column 3 "));
assertTrue(categoryDataset.getRowKey(2).equals(" column 4"));
Assert.assertTrue(categoryDataset.getValue(0, 0).intValue() == 12);
Assert.assertTrue(categoryDataset.getValue(1, 0).intValue() == 13);
Assert.assertTrue(categoryDataset.getValue(2, 0).intValue() == 14);
Assert.assertTrue(categoryDataset.getValue(0, 1).intValue() == 22);
Assert.assertTrue(categoryDataset.getValue(1, 1).intValue() == 23);
Assert.assertTrue(categoryDataset.getValue(2, 1).intValue() == 24);
assertTrue(categoryDataset.getValue(0, 0).intValue() == 12);
assertTrue(categoryDataset.getValue(1, 0).intValue() == 13);
assertTrue(categoryDataset.getValue(2, 0).intValue() == 14);
assertTrue(categoryDataset.getValue(0, 1).intValue() == 22);
assertTrue(categoryDataset.getValue(1, 1).intValue() == 23);
assertTrue(categoryDataset.getValue(2, 1).intValue() == 24);
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/TablePieDatasetBuilderTest.java
+ 24
− 23
View file @ 548973df
......@@ -19,13 +19,13 @@
*/
package org.xwiki.rendering.internal.macro.chart.source.table;
import org.junit.Assert;
import org.junit.Test;
import org.jfree.data.general.Dataset;
import org.jfree.data.general.PieDataset;
import org.junit.jupiter.api.Test;
import org.xwiki.chart.model.ChartModel;
import org.xwiki.test.junit5.mockito.ComponentTest;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests building a pie dataset from a table data source.
......@@ -33,10 +33,11 @@
* @version $Id$
* @since 4.2M1
*/
public class TablePieDatasetBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
@ComponentTest
class TablePieDatasetBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
{
@Test
public void testBuildPieDataset() throws Exception
void buildPieDataset() throws Exception
{
String content =
"| column 1 | column 2 | column 3 | column 4\n" +
......@@ -44,25 +45,25 @@ public void testBuildPieDataset() throws Exception
"| row 2 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map("type", "pie", "range", "B2-D3"), null);
this.source.buildDataset(content, map("type", "pie", "range", "B2-D3"), null);
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Dataset dataset = chartModel.getDataset();
Assert.assertTrue(dataset instanceof PieDataset);
assertTrue(dataset instanceof PieDataset);
PieDataset pieDataset = (PieDataset) dataset;
Assert.assertTrue(pieDataset.getKey(0).equals(" row 1 "));
Assert.assertTrue(pieDataset.getKey(1).equals(" row 2 "));
assertTrue(pieDataset.getKey(0).equals(" row 1 "));
assertTrue(pieDataset.getKey(1).equals(" row 2 "));
Assert.assertTrue(pieDataset.getValue(0).intValue() == 12);
Assert.assertTrue(pieDataset.getValue(1).intValue() == 22);
assertTrue(pieDataset.getValue(0).intValue() == 12);
assertTrue(pieDataset.getValue(1).intValue() == 22);
}
@Test
public void testBuildPieDatasetRowsSeries() throws Exception
void buildPieDatasetRowsSeries() throws Exception
{
String content =
"| column 1 | column 2 | column 3 | column 4\n" +
......@@ -70,22 +71,22 @@ public void testBuildPieDatasetRowsSeries() throws Exception
"| row 2 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map("type", "pie", "range", "B2-D3", "series", "rows"), null);
this.source.buildDataset(content, map("type", "pie", "range", "B2-D3", "series", "rows"), null);
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Dataset dataset = chartModel.getDataset();
Assert.assertTrue(dataset instanceof PieDataset);
assertTrue(dataset instanceof PieDataset);
PieDataset pieDataset = (PieDataset) dataset;
Assert.assertTrue(pieDataset.getKey(0).equals(" column 2 "));
Assert.assertTrue(pieDataset.getKey(1).equals(" column 3 "));
Assert.assertTrue(pieDataset.getKey(2).equals(" column 4"));
assertTrue(pieDataset.getKey(0).equals(" column 2 "));
assertTrue(pieDataset.getKey(1).equals(" column 3 "));
assertTrue(pieDataset.getKey(2).equals(" column 4"));
Assert.assertTrue(pieDataset.getValue(0).intValue() == 12);
Assert.assertTrue(pieDataset.getValue(1).intValue() == 13);
Assert.assertTrue(pieDataset.getValue(2).intValue() == 14);
assertTrue(pieDataset.getValue(0).intValue() == 12);
assertTrue(pieDataset.getValue(1).intValue() == 13);
assertTrue(pieDataset.getValue(2).intValue() == 14);
}
}
xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/src/test/java/org/xwiki/rendering/internal/macro/chart/source/table/TableTimeTableXYBuilderTest.java
+ 26
− 24
View file @ 548973df
......@@ -19,29 +19,31 @@
*/
package org.xwiki.rendering.internal.macro.chart.source.table;
import org.junit.Assert;
import org.junit.Test;
import org.jfree.data.time.TimeTableXYDataset;
import org.jfree.chart.axis.ValueAxis;
import org.jfree.chart.axis.DateAxis;
import org.junit.jupiter.api.Test;
import org.xwiki.chart.model.ChartModel;
import org.xwiki.test.junit5.mockito.ComponentTest;
import java.util.Date;
import java.util.Locale;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests building a time table xy dataset from a table data source.
*
* @version $Id$
* @since 4.2M1
*/
public class TableTimeTableXYBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
@ComponentTest
class TableTimeTableXYBuilderTest extends AbstractMacroContentTableBlockDataSourceTest
{
@Test
public void testBuildTimeTableXY() throws Exception
void buildTimeTableXY() throws Exception
{
String content =
"| Date | column 2 | column 3 | column 4\n" +
......@@ -49,7 +51,7 @@ public void testBuildTimeTableXY() throws Exception
"| 2012-01-01 10:30:20 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map(
this.source.buildDataset(content, map(
"type", "xy_line_and_shape",
"dataset", "timetable_xy",
"range", "A2-D3",
......@@ -59,30 +61,30 @@ public void testBuildTimeTableXY() throws Exception
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss", new Locale("en"));
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Assert.assertTrue(chartModel.getDataset() instanceof TimeTableXYDataset);
assertTrue(chartModel.getDataset() instanceof TimeTableXYDataset);
Assert.assertTrue(chartModel.getAxis(0) instanceof DateAxis);
Assert.assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
assertTrue(chartModel.getAxis(0) instanceof DateAxis);
assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
TimeTableXYDataset dataset = (TimeTableXYDataset) chartModel.getDataset();
Assert.assertTrue(dataset.getSeriesCount() == 3);
assertTrue(dataset.getSeriesCount() == 3);
Assert.assertTrue(dataset.getSeriesKey(0).equals(" column 2 "));
Assert.assertTrue(dataset.getSeriesKey(1).equals(" column 3 "));
Assert.assertTrue(dataset.getSeriesKey(2).equals(" column 4"));
assertTrue(dataset.getSeriesKey(0).equals(" column 2 "));
assertTrue(dataset.getSeriesKey(1).equals(" column 3 "));
assertTrue(dataset.getSeriesKey(2).equals(" column 4"));
Assert.assertTrue(dataset.getTimePeriod(0).getStart().equals(new Date(0)));
Assert.assertTrue(dataset.getTimePeriod(0).getEnd().equals(dateFormat.parse("2012-01-01 10:30:10")));
assertTrue(dataset.getTimePeriod(0).getStart().equals(new Date(0)));
assertTrue(dataset.getTimePeriod(0).getEnd().equals(dateFormat.parse("2012-01-01 10:30:10")));
Assert.assertTrue(dataset.getTimePeriod(1).getStart().equals(dateFormat.parse("2012-01-01 10:30:10")));
Assert.assertTrue(dataset.getTimePeriod(1).getEnd().equals(dateFormat.parse("2012-01-01 10:30:20")));
assertTrue(dataset.getTimePeriod(1).getStart().equals(dateFormat.parse("2012-01-01 10:30:10")));
assertTrue(dataset.getTimePeriod(1).getEnd().equals(dateFormat.parse("2012-01-01 10:30:20")));
}
@Test
public void testYearInterval() throws Exception
void yearInterval() throws Exception
{
String content =
"| Date | column 2 | column 3 | column 4\n" +
......@@ -90,7 +92,7 @@ public void testYearInterval() throws Exception
"| 1971 | 22 | 23 | 24 \n";
setUpContentExpectation(content);
getDataSource().buildDataset(content, map(
this.source.buildDataset(content, map(
"type", "xy_line_and_shape",
"dataset", "timetable_xy",
"range", "A2-D3",
......@@ -99,11 +101,11 @@ public void testYearInterval() throws Exception
"domain_axis_type", "date",
"time_period", "year"), null);
ChartModel chartModel = getDataSource().getChartModel();
ChartModel chartModel = this.source.getChartModel();
Assert.assertTrue(chartModel.getDataset() instanceof TimeTableXYDataset);
assertTrue(chartModel.getDataset() instanceof TimeTableXYDataset);
Assert.assertTrue(chartModel.getAxis(0) instanceof DateAxis);
Assert.assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
assertTrue(chartModel.getAxis(0) instanceof DateAxis);
assertTrue(chartModel.getAxis(1) instanceof ValueAxis);
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment