diff --git a/pom.xml b/pom.xml index d16eb063..e4f54395 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ UTF-8 - 4.12 + 5.5.2 1.3 1.10.19 1.8 @@ -223,8 +223,14 @@ - junit - junit + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params ${junit.version} test diff --git a/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java b/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java index 89bf6f02..b3b775a7 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/GCViewerTest.java @@ -13,15 +13,15 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author martin.geldmacher */ -public class GCViewerTest { +class GCViewerTest { @Test - public void singleArgumentOpensGui() throws Exception { + void singleArgumentOpensGui() throws Exception { GCViewerGuiController controller = mock(GCViewerGuiController.class); GCViewer gcViewer = new GCViewer(controller, new GCViewerArgsParser()); @@ -32,7 +32,7 @@ public void singleArgumentOpensGui() throws Exception { } @Test - public void singleArgumentWithSeriesOpensGui() throws Exception { + void singleArgumentWithSeriesOpensGui() throws Exception { GCViewerGuiController controller = mock(GCViewerGuiController.class); GCViewer gcViewer = new GCViewer(controller, new GCViewerArgsParser()); @@ -43,7 +43,7 @@ public void singleArgumentWithSeriesOpensGui() throws Exception { } @Test - public void moreThan3ArgumentsPrintsUsage() throws Exception { + void moreThan3ArgumentsPrintsUsage() throws Exception { GCViewerGuiController controller = mock(GCViewerGuiController.class); GCViewer gcViewer = new GCViewer(controller, new GCViewerArgsParser()); @@ -54,7 +54,7 @@ public void moreThan3ArgumentsPrintsUsage() throws Exception { } @Test - public void export() throws Exception { + void export() throws Exception { GCViewerGuiController controller = mock(GCViewerGuiController.class); GCViewer gcViewer = new GCViewer(controller, new GCViewerArgsParser()); @@ -65,7 +65,7 @@ public void export() throws Exception { } @Test - public void exportFileNotFound() throws Exception { + void exportFileNotFound() throws Exception { GCViewerGuiController controller = mock(GCViewerGuiController.class); GCViewer gcViewer = new GCViewer(controller, new GCViewerArgsParser()); @@ -76,7 +76,7 @@ public void exportFileNotFound() throws Exception { } @Test - public void illegalExportFormat() throws Exception { + void illegalExportFormat() throws Exception { GCViewer gcViewer = new GCViewer(); String[] args = {"-t", "INVALID"}; diff --git a/src/test/java/com/tagtraum/perf/gcviewer/TestBuildInfoReader.java b/src/test/java/com/tagtraum/perf/gcviewer/TestBuildInfoReader.java index 7e4e9525..3f83fa5a 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/TestBuildInfoReader.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/TestBuildInfoReader.java @@ -1,13 +1,12 @@ package com.tagtraum.perf.gcviewer; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; - -import org.junit.Test; import com.tagtraum.perf.gcviewer.util.BuildInfoReader; +import org.junit.jupiter.api.Test; /** * Tests the class {@link BuildInfoReader} - makes sure that the properties from the file @@ -16,17 +15,17 @@ * @author Joerg Wuethrich *

created on: 05.12.2012

*/ -public class TestBuildInfoReader { +class TestBuildInfoReader { @Test - public void readVersion() { + void readVersion() { String version = BuildInfoReader.getVersion(); assertThat("version", version, notNullValue()); assertThat("must not be empty", version, not(isEmptyOrNullString())); } @Test - public void readBuildDate() { + void readBuildDate() { String buildDate = BuildInfoReader.getBuildDate(); assertThat("buildDate", buildDate, notNullValue()); assertThat("must not be empty", buildDate, not(isEmptyOrNullString())); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/TestGCViewerArgsParser.java b/src/test/java/com/tagtraum/perf/gcviewer/TestGCViewerArgsParser.java index deb0f1eb..e5de3914 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/TestGCViewerArgsParser.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/TestGCViewerArgsParser.java @@ -4,13 +4,16 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests the class {@link com.tagtraum.perf.gcviewer.GCViewerArgsParser} @@ -19,99 +22,94 @@ * @author Samuel Mendenhall *

created on: 06.09.2014

*/ -public class TestGCViewerArgsParser { +class TestGCViewerArgsParser { @Test - public void noArguments() throws Exception { + void noArguments() throws Exception { String[] args = {}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 0); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.SUMMARY); + assertEquals(0, gcViewerArgsParser.getArgumentCount()); + assertEquals(DataWriterType.SUMMARY, gcViewerArgsParser.getType()); } @Test - public void onlyGCLog() throws Exception { + void onlyGCLog() throws Exception { String[] args = {"some_gc.log"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 1); - assertEquals(gcViewerArgsParser.getGcResource(), new GcResourceFile("some_gc.log")); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.SUMMARY); + assertEquals(1, gcViewerArgsParser.getArgumentCount()); + assertEquals(new GcResourceFile("some_gc.log"), gcViewerArgsParser.getGcResource()); + assertEquals(DataWriterType.SUMMARY, gcViewerArgsParser.getType()); } @Test - public void onlyGcLogSeries() throws Exception { + void onlyGcLogSeries() throws Exception { String[] args = {"some_gc.log.0;some_gc.log.1;some_gc.log.2"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 1); + assertEquals(1, gcViewerArgsParser.getArgumentCount()); List resources = Arrays.asList(new GcResourceFile("some_gc.log.0"), new GcResourceFile("some_gc.log.1"), new GcResourceFile("some_gc.log.2")); - assertEquals(gcViewerArgsParser.getGcResource(), new GcResourceSeries(resources)); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.SUMMARY); + assertEquals(new GcResourceSeries(resources), gcViewerArgsParser.getGcResource()); + assertEquals(DataWriterType.SUMMARY, gcViewerArgsParser.getType()); } @Test - public void gcAndExportFile() throws Exception { + void gcAndExportFile() throws Exception { String[] args = {"some_gc.log", "export_to.csv"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 2); - assertEquals(gcViewerArgsParser.getGcResource(), new GcResourceFile("some_gc.log")); - assertEquals(gcViewerArgsParser.getSummaryFilePath(), "export_to.csv"); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.SUMMARY); + assertEquals(2, gcViewerArgsParser.getArgumentCount()); + assertEquals(new GcResourceFile("some_gc.log"), gcViewerArgsParser.getGcResource()); + assertEquals("export_to.csv", gcViewerArgsParser.getSummaryFilePath()); + assertEquals(DataWriterType.SUMMARY, gcViewerArgsParser.getType()); } @Test - public void gcSeriesAndExportFile() throws Exception { + void gcSeriesAndExportFile() throws Exception { String[] args = {"some_gc.log.0;some_gc.log.1;some_gc.log.2", "export_to.csv"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 2); + assertEquals(2, gcViewerArgsParser.getArgumentCount()); List resources = Arrays.asList(new GcResourceFile("some_gc.log.0"), new GcResourceFile("some_gc.log.1"), new GcResourceFile("some_gc.log.2")); - assertEquals(gcViewerArgsParser.getGcResource(), new GcResourceSeries(resources)); - assertEquals(gcViewerArgsParser.getSummaryFilePath(), "export_to.csv"); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.SUMMARY); + assertEquals(new GcResourceSeries(resources), gcViewerArgsParser.getGcResource()); + assertEquals("export_to.csv", gcViewerArgsParser.getSummaryFilePath()); + assertEquals(DataWriterType.SUMMARY, gcViewerArgsParser.getType()); } @Test - public void onlyType() throws Exception { + void onlyType() throws Exception { String[] args = {"-t", "CSV_TS"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 0); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.CSV_TS); + assertEquals(0, gcViewerArgsParser.getArgumentCount()); + assertEquals(DataWriterType.CSV_TS, gcViewerArgsParser.getType()); } @Test - public void allInitialArgsWithType() throws Exception { + void allInitialArgsWithType() throws Exception { String[] args = {"some_gc.log", "export_to.csv", "the_chart.png", "-t", "CSV"}; GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); gcViewerArgsParser.parseArguments(args); - assertEquals(gcViewerArgsParser.getArgumentCount(), 3); - assertEquals(gcViewerArgsParser.getGcResource(), new GcResourceFile("some_gc.log")); - assertEquals(gcViewerArgsParser.getSummaryFilePath(), "export_to.csv"); - assertEquals(gcViewerArgsParser.getChartFilePath(), "the_chart.png"); - assertEquals(gcViewerArgsParser.getType(), DataWriterType.CSV); + assertEquals(3, gcViewerArgsParser.getArgumentCount()); + assertEquals(new GcResourceFile("some_gc.log"), gcViewerArgsParser.getGcResource()); + assertEquals("export_to.csv", gcViewerArgsParser.getSummaryFilePath()); + assertEquals("the_chart.png", gcViewerArgsParser.getChartFilePath()); + assertEquals(DataWriterType.CSV, gcViewerArgsParser.getType()); } - + @Test - public void illegalType() { + void illegalType() { String[] args = {"some_gc.log", "export_to.csv", "the_chart.png", "-t", "ILLEGAL"}; - try { - GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); - gcViewerArgsParser.parseArguments(args); - fail("GCVIewerArgsParserException expected"); - } - catch (GCViewerArgsParserException e) { - assertThat("exception message", e.getMessage(), startsWith("Illegal type 'ILLEGAL'")); - } + GCViewerArgsParser gcViewerArgsParser = new GCViewerArgsParser(); + GCViewerArgsParserException e = assertThrows(GCViewerArgsParserException.class, () -> gcViewerArgsParser.parseArguments(args)); + assertThat("exception message", e.getMessage(), startsWith("Illegal type 'ILLEGAL'")); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/UnittestHelper.java b/src/test/java/com/tagtraum/perf/gcviewer/UnittestHelper.java index 45e9bbc1..bb2f3d15 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/UnittestHelper.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/UnittestHelper.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java index 8b484efc..6a9efc44 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelLoaderFactoryTest.java @@ -3,40 +3,33 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; /** * @author martin.geldmacher */ -@RunWith(MockitoJUnitRunner.class) -public class GCModelLoaderFactoryTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); +class GCModelLoaderFactoryTest { @Test - public void createFor_GcResourceFile() throws Exception { + void createFor_GcResourceFile() { GCResource gcResource = mock(GcResourceFile.class); assertThat(GCModelLoaderFactory.createFor(gcResource), instanceOf(GCModelLoaderImpl.class)); } @Test - public void createFor_GcResourceSeries() throws Exception { + void createFor_GcResourceSeries() { GCResource gcResource = mock(GcResourceSeries.class); assertThat(GCModelLoaderFactory.createFor(gcResource), instanceOf(GCModelSeriesLoaderImpl.class)); } @Test - public void createFor_GcResourceUnknown() throws Exception { - expectedException.expect(IllegalArgumentException.class); + void createFor_GcResourceUnknown() { GCResource gcResource = mock(GCResource.class); - GCModelLoaderFactory.createFor(gcResource); + assertThrows(IllegalArgumentException.class, () -> GCModelLoaderFactory.createFor(gcResource)); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelSeriesLoaderImplTest.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelSeriesLoaderImplTest.java index 10bfe6f3..5ec90641 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelSeriesLoaderImplTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GCModelSeriesLoaderImplTest.java @@ -1,7 +1,8 @@ package com.tagtraum.perf.gcviewer.ctrl.impl; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; @@ -11,16 +12,12 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; public class GCModelSeriesLoaderImplTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); @Test - public void getGcResource() throws Exception { + void getGcResource() throws Exception { ArrayList gcResourceList = new ArrayList<>(); gcResourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath())); gcResourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part2.txt").getPath())); @@ -31,13 +28,12 @@ public void getGcResource() throws Exception { } @Test - public void GCModelSeriesLoaderImpl_ForEmptySeries() throws Exception { - expectedException.expect(IllegalArgumentException.class); - new GCModelSeriesLoaderImpl(new GcResourceSeries(new ArrayList<>())); + void GCModelSeriesLoaderImpl_ForEmptySeries() { + assertThrows(IllegalArgumentException.class, () -> new GCModelSeriesLoaderImpl(new GcResourceSeries(new ArrayList<>()))); } @Test - public void loadGcModel() throws Exception { + void loadGcModel() throws Exception { ArrayList gcResourceList = new ArrayList<>(); gcResourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath())); gcResourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part2.txt").getPath())); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java index a95280ca..e9475f10 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/GcSeriesLoaderTest.java @@ -2,10 +2,12 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.attribute.BasicFileAttributes; import java.time.Instant; import java.time.ZoneId; @@ -26,39 +28,29 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class GcSeriesLoaderTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); - - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class GcSeriesLoaderTest { private GcSeriesLoader loader; private DataReaderFacade dataReader; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() { dataReader = new DataReaderFacade(); loader = new GcSeriesLoader(dataReader); } @Test - public void merge_EmptyFile() throws Exception { - expectedException.expect(IllegalArgumentException.class); - loader.load(new GcResourceSeries(new ArrayList<>())); + void merge_EmptyFile() { + assertThrows(IllegalArgumentException.class, () -> loader.load(new GcResourceSeries(new ArrayList<>()))); } @Test - public void merge_OneFile() throws Exception { + void merge_OneFile() throws Exception { GCResource input = getGcResource("SampleSun1_8_0Series-Part1.txt"); GCModel expectedModel = createModel(input); @@ -71,7 +63,7 @@ public void merge_OneFile() throws Exception { } @Test - public void merge_FilesInRightOrder() throws Exception { + void merge_FilesInRightOrder() throws Exception { GCResource file1 = getGcResource("SampleSun1_8_0Series-Part1.txt"); GCResource file2 = getGcResource("SampleSun1_8_0Series-Part2.txt"); GCResource file3 = getGcResource("SampleSun1_8_0Series-Part3.txt"); @@ -97,7 +89,7 @@ public void merge_FilesInRightOrder() throws Exception { } @Test - public void merge_FilesInWrongOrder() throws Exception { + void merge_FilesInWrongOrder() throws Exception { GCResource file1 = getGcResource("SampleSun1_8_0Series-Part1.txt"); GCResource file2 = getGcResource("SampleSun1_8_0Series-Part2.txt"); GCResource file3 = getGcResource("SampleSun1_8_0Series-Part3.txt"); @@ -123,7 +115,7 @@ public void merge_FilesInWrongOrder() throws Exception { } @Test - public void getCreationDate_WhenDateStampIsAvailable() throws Exception { + void getCreationDate_WhenDateStampIsAvailable() throws Exception { GCModel withDatestamp = new GCModel(); GCEvent event = new GCEvent(1.0, 0, 0, 0, 0.0, AbstractGCEvent.Type.GC); ZonedDateTime datestamp = ZonedDateTime.now(); @@ -134,7 +126,7 @@ public void getCreationDate_WhenDateStampIsAvailable() throws Exception { } @Test - public void getCreationDate_WhenTimeStampIsAvailable() throws Exception { + void getCreationDate_WhenTimeStampIsAvailable() throws Exception { GCModel withTimestamp = new GCModel(); double timestamp = 13.37; GCEvent event = new GCEvent(timestamp, 0, 0, 0, 0.0, AbstractGCEvent.Type.GC); @@ -144,9 +136,10 @@ public void getCreationDate_WhenTimeStampIsAvailable() throws Exception { } @Test - public void getCreationDate_WhenNeitherDateNorTimestampIsAvailable() throws Exception { + void getCreationDate_WhenNeitherDateNorTimestampIsAvailable(@TempDir Path temporaryFolder) throws Exception { GCModel withoutDateOrTimestamp = new GCModel(); - File file = temporaryFolder.newFile(); + File file = temporaryFolder.resolve("tempfile").toFile(); + Assertions.assertTrue(file.createNewFile()); withoutDateOrTimestamp.setURL(file.toURI().toURL()); // precision is millis, not nanos, i.e. Instant can't be used directly @@ -155,7 +148,7 @@ public void getCreationDate_WhenNeitherDateNorTimestampIsAvailable() throws Exce } @Test - public void getFirstDateStampFromModel() throws Exception { + void getFirstDateStampFromModel() throws Exception { GCResource resource = getGcResource("SampleSun1_8_0Series-Part1.txt"); GCModel model = createModel(resource); ZonedDateTime expectedTime = ZonedDateTime.of(2016, 4, 14, 22, 30, 9, 108000000, ZoneOffset.ofHours(2)); @@ -163,9 +156,10 @@ public void getFirstDateStampFromModel() throws Exception { } @Test - public void getDateStampFromResource() throws Exception { + void getDateStampFromResource(@TempDir Path temporaryFolder) throws Exception { GCModel model = new GCModel(); - File file = temporaryFolder.newFile(); + File file = temporaryFolder.resolve("tempfile").toFile(); + Assertions.assertTrue(file.createNewFile()); model.setURL(file.toURI().toURL()); // precision is millis, not nanos, i.e. Instant can't be used directly @@ -174,13 +168,11 @@ public void getDateStampFromResource() throws Exception { } @Test - public void sortResources() throws Exception { - expectedException.expect(DataReaderException.class); - + void sortResources() { Map map = new HashMap<>(); map.put(new GcSeriesLoader.GcDateStamp(ZonedDateTime.now()), new GCModel()); map.put(new GcSeriesLoader.GcTimeStamp(13.37), new GCModel()); - loader.sortResources(map); + assertThrows(DataReaderException.class, () -> loader.sortResources(map)); } private GCModel createModel(GCResource resource) throws DataReaderException { diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoader.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoader.java index 196df4bc..0f575bd3 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoader.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoader.java @@ -1,15 +1,15 @@ package com.tagtraum.perf.gcviewer.ctrl.impl; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unittest for {@link GCModelLoaderImpl}. @@ -17,10 +17,10 @@ * @author Joerg Wuethrich *

created on: 05.01.2014

*/ -public class TestGCModelLoader { +class TestGCModelLoader { @Test - public void loadExistingFile() throws Exception { + void loadExistingFile() throws Exception { GCResource gcResource = new GcResourceFile( UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); GCModelLoaderImpl loader = new GCModelLoaderImpl(gcResource); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoaderController.java b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoaderController.java index f740b8fa..7abb156a 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoaderController.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/ctrl/impl/TestGCModelLoaderController.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.ctrl.impl; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -21,8 +21,8 @@ import com.tagtraum.perf.gcviewer.model.GcResourceSeries; import com.tagtraum.perf.gcviewer.view.GCViewerGui; import com.tagtraum.perf.gcviewer.view.model.GCPreferences; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -33,12 +33,13 @@ * @author Joerg Wuethrich *

created on: 05.01.2014

*/ -public class TestGCModelLoaderController { +class TestGCModelLoaderController { + private GCModelLoaderControllerImpl controller; private GCViewerGui gcViewerGui; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() { gcViewerGui = new GCViewerGui(); controller = new GCModelLoaderControllerImpl(gcViewerGui); new GCViewerGuiBuilder().initGCViewerGui(gcViewerGui, controller); @@ -46,13 +47,13 @@ public void setUp() throws Exception { } @Test - public void openStringFail() throws Exception { + void openStringFail() { controller.open(new GcResourceFile("does_not_exist")); assertThat("number of gcdocuments", controller.getGCViewerGui().getDesktopPane().getAllFrames().length, is(1)); } @Test - public void openString() throws Exception { + void openString() throws Exception { assertThat("number of gcdocuments before", controller.getGCViewerGui().getDesktopPane().getAllFrames().length, is(0)); controller.open(new GcResourceFile(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt"))); assertThat("number of gcdocuments after", controller.getGCViewerGui().getDesktopPane().getAllFrames().length, is(1)); @@ -60,7 +61,7 @@ public void openString() throws Exception { } @Test - public void openAsSeries() throws Exception { + void openAsSeries() throws Exception { assertThat("number of gcdocuments before", controller.getGCViewerGui().getDesktopPane().getAllFrames().length, is(0)); ArrayList gcResourceList = getGcResourcesForSeries(); @@ -81,7 +82,7 @@ private ArrayList getGcResourcesForSeries() throws IOException { * Test drag and drop action on GCViewerGui. */ @Test - public void dropOnDesktopPane() throws Exception { + void dropOnDesktopPane() throws Exception { // TODO SWINGWORKER: test drag and drop on GCDocument assertThat("number of gcdocuments before", controller.getGCViewerGui().getDesktopPane().getAllFrames().length, is(0)); @@ -102,7 +103,7 @@ public void dropOnDesktopPane() throws Exception { } @Test - public void open_File() throws Exception { + void open_File() throws Exception { File[] files = new File[1]; File file = new File(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); files[0] = file; @@ -111,14 +112,14 @@ public void open_File() throws Exception { } @Test - public void open_GcResourceFile() throws Exception { + void open_GcResourceFile() throws Exception { GCResource resource = new GcResourceFile(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); controller.open(resource); assertThat(getOpenResources(), contains(resource)); } @Test - public void open_GcResourceSeries() throws Exception { + void open_GcResourceSeries() throws Exception { List resources = getGcResourcesForSeries(); GCResource series = new GcResourceSeries(resources); controller.open(series); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/exp/SimpleGcWriterTest.java b/src/test/java/com/tagtraum/perf/gcviewer/exp/SimpleGcWriterTest.java index c31bcff3..65c8029d 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/exp/SimpleGcWriterTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/exp/SimpleGcWriterTest.java @@ -1,18 +1,17 @@ package com.tagtraum.perf.gcviewer.exp; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayOutputStream; import java.util.Locale; -import org.junit.Before; -import org.junit.Test; - import com.tagtraum.perf.gcviewer.exp.impl.SimpleGcWriter; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent; import com.tagtraum.perf.gcviewer.model.ConcurrentGCEvent; import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests the export format of {@link SimpleGcWriter}. @@ -20,10 +19,10 @@ * @author Joerg Wuethrich *

created on: 08.12.2012

*/ -public class SimpleGcWriterTest { +class SimpleGcWriterTest { private GCModel gcModel; - @Before + @BeforeEach public void setUp() throws Exception { // 0.677: [GC 0.677: [ParNew: 118010K->13046K(118016K), 0.0299506 secs] 175499K->104936K(249088K), 0.0300629 secs] [Times: user=0.06 sys=0.06, real=0.03 secs] // 0.708: [GC [1 CMS-initial-mark: 91890K(131072K)] 109176K(249088K), 0.0004006 secs] [Times: user=0.00 sys=0.00, real=0.00 secs] @@ -55,7 +54,7 @@ public void setUp() throws Exception { } @Test - public void exportLocaleDe() throws Exception { + void exportLocaleDe() throws Exception { Locale.setDefault(new Locale("de", "ch")); try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); SimpleGcWriter writer = new SimpleGcWriter(outputStream)) { @@ -63,22 +62,22 @@ public void exportLocaleDe() throws Exception { writer.write(gcModel); String[] lines = outputStream.toString().split(System.getProperty("line.separator")); - assertEquals("line count", 2, lines.length); + assertEquals(2, lines.length, "line count"); String[] firstLine = lines[0].split(" "); - assertEquals("number of parts in line 1", 3, firstLine.length); - assertEquals("name of event", "YoungGC", firstLine[0]); - assertEquals("timestamp", "0.677000", firstLine[1]); - assertEquals("duration", "0.030063", firstLine[2]); + assertEquals(3, firstLine.length, "number of parts in line 1"); + assertEquals("YoungGC", firstLine[0], "name of event"); + assertEquals("0.677000", firstLine[1], "timestamp"); + assertEquals("0.030063", firstLine[2], "duration"); String[] secondLine = lines[1].split(" "); - assertEquals("number of parts in line 2", 3, secondLine.length); - assertEquals("name of event 2", "InitialMarkGC", secondLine[0]); + assertEquals(3, secondLine.length, "number of parts in line 2"); + assertEquals("InitialMarkGC", secondLine[0], "name of event 2"); } } @Test - public void exportLocaleSv() throws Exception { + void exportLocaleSv() throws Exception { Locale.setDefault(new Locale("sv", "se")); try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); SimpleGcWriter writer = new SimpleGcWriter(outputStream)) { @@ -86,11 +85,11 @@ public void exportLocaleSv() throws Exception { writer.write(gcModel); String[] lines = outputStream.toString().split(System.getProperty("line.separator")); - assertEquals("line count", 2, lines.length); + assertEquals(2, lines.length, "line count"); String[] firstLine = lines[0].split(" "); - assertEquals("number of parts in line 1", 3, firstLine.length); - assertEquals("timestamp", "0.677000", firstLine[1]); + assertEquals(3, firstLine.length, "number of parts in line 1"); + assertEquals("0.677000", firstLine[1], "timestamp"); } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/exp/SummaryDataWriterTest.java b/src/test/java/com/tagtraum/perf/gcviewer/exp/SummaryDataWriterTest.java index d21fba82..9e7cb2aa 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/exp/SummaryDataWriterTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/exp/SummaryDataWriterTest.java @@ -1,7 +1,5 @@ package com.tagtraum.perf.gcviewer.exp; -import static org.junit.Assert.assertThat; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -20,20 +18,22 @@ import com.tagtraum.perf.gcviewer.util.MemoryFormat; import org.hamcrest.Matchers; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; /** * Test implementation of {@link SummaryDataWriter} * *

hint: don't use memory numbers > 999, because they are not formatted the same on all platforms -> unstable tests

*/ -public class SummaryDataWriterTest { +class SummaryDataWriterTest { private static NumberFormat percentFormatter; private static MemoryFormat memoryFormatter; - @BeforeClass + @BeforeAll public static void setupClass() { percentFormatter = NumberFormat.getInstance(); percentFormatter.setMaximumFractionDigits(1); @@ -54,72 +54,74 @@ private GCModel createGcModel() throws MalformedURLException { } @Test - public void testWriteForEmptyModel() throws IOException { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - SummaryDataWriter objectUnderTest = new SummaryDataWriter(output); - GCModel model = new GCModel(); - model.setURL(new URL("file", "localhost", "test-file")); + void testWriteForEmptyModel() throws IOException { + try (ByteArrayOutputStream output = new ByteArrayOutputStream(); + SummaryDataWriter objectUnderTest = new SummaryDataWriter(output)) { + GCModel model = new GCModel(); + model.setURL(new URL("file", "localhost", "test-file")); - objectUnderTest.write(model); + objectUnderTest.write(model); - String csv = output.toString(); + String csv = output.toString(); - assertThat("totalTenuredAllocMax", csv, Matchers.containsString("totalTenuredAllocMax; n/a; M")); + assertThat("totalTenuredAllocMax", csv, Matchers.containsString("totalTenuredAllocMax; n/a; M")); + } } @Test - public void testWrite() throws IOException { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - SummaryDataWriter objectUnderTest = new SummaryDataWriter(output); + void testWrite() throws IOException { + try (ByteArrayOutputStream output = new ByteArrayOutputStream(); + SummaryDataWriter objectUnderTest = new SummaryDataWriter(output)) { + objectUnderTest.write(createGcModel()); - objectUnderTest.write(createGcModel()); + String csv = output.toString(); - String csv = output.toString(); - - assertThat("totalHeapAllocMax", csv, Matchers.containsString("totalHeapAllocMax; 999; K")); + assertThat("totalHeapAllocMax", csv, Matchers.containsString("totalHeapAllocMax; 999; K")); + } } @Test - public void testWriteWithFullGc() throws IOException { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - SummaryDataWriter objectUnderTest = new SummaryDataWriter(output); - - GCModel model = createGcModel(); - model.add(new GCEvent(0.5, 999, 724, 999, 0.8, Type.FULL_GC)); + void testWriteWithFullGc() throws IOException { + try (ByteArrayOutputStream output = new ByteArrayOutputStream(); + SummaryDataWriter objectUnderTest = new SummaryDataWriter(output)) { + GCModel model = createGcModel(); + model.add(new GCEvent(0.5, 999, 724, 999, 0.8, Type.FULL_GC)); - objectUnderTest.write(model); + objectUnderTest.write(model); - String csv = output.toString(); + String csv = output.toString(); - assertThat("totalHeapAllocMax", csv, Matchers.containsString("avgfootprintAfterFullGC; 724; K")); + assertThat("totalHeapAllocMax", csv, Matchers.containsString("avgfootprintAfterFullGC; 724; K")); + } } @Test - public void testWriteWithPerm() throws IOException { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - SummaryDataWriter objectUnderTest = new SummaryDataWriter(output); + void testWriteWithPerm() throws IOException { + try (ByteArrayOutputStream output = new ByteArrayOutputStream(); + SummaryDataWriter objectUnderTest = new SummaryDataWriter(output)) { - // 83.403: [Full GC 83.403: [Tenured: 38156K->54636K(349568K), 0.6013150 secs] 141564K->54636K(506944K), [Perm : 73727K->73727K(73728K)], 0.6014256 secs] [Times: user=0.58 sys=0.00, real=0.59 secs] - GCEvent fullGcEvent = new GCEvent(83.403, 141564, 54636, 506944, 0.6014256, Type.FULL_GC); - GCEvent tenured = new GCEvent(83.403, 38156, 54636, 349568, 0.6013150, Type.TENURED); - GCEvent perm = new GCEvent(83.403, 73727, 73727, 73728, 0.6014256, Type.PERM); - fullGcEvent.add(tenured); - fullGcEvent.add(perm); + // 83.403: [Full GC 83.403: [Tenured: 38156K->54636K(349568K), 0.6013150 secs] 141564K->54636K(506944K), [Perm : 73727K->73727K(73728K)], 0.6014256 secs] [Times: user=0.58 sys=0.00, real=0.59 secs] + GCEvent fullGcEvent = new GCEvent(83.403, 141564, 54636, 506944, 0.6014256, Type.FULL_GC); + GCEvent tenured = new GCEvent(83.403, 38156, 54636, 349568, 0.6013150, Type.TENURED); + GCEvent perm = new GCEvent(83.403, 73727, 73727, 73728, 0.6014256, Type.PERM); + fullGcEvent.add(tenured); + fullGcEvent.add(perm); - GCModel model = createGcModel(); - model.add(fullGcEvent); + GCModel model = createGcModel(); + model.add(fullGcEvent); - objectUnderTest.write(model); + objectUnderTest.write(model); - String csv = output.toString(); + String csv = output.toString(); - assertThat("totalPermAllocMax", csv, Matchers.containsString("totalPermAllocMax; 72; M")); - assertThat("totalPermUsedMax", csv, Matchers.containsString("totalPermUsedMax; " + memoryFormatter.formatToFormatted(73727).getValue() + "; M")); - assertThat("totalPermUsedMaxpc", csv, Matchers.containsString("totalPermUsedMaxpc; " + percentFormatter.format(100.0) + "; %")); + assertThat("totalPermAllocMax", csv, Matchers.containsString("totalPermAllocMax; 72; M")); + assertThat("totalPermUsedMax", csv, Matchers.containsString("totalPermUsedMax; " + memoryFormatter.formatToFormatted(73727).getValue() + "; M")); + assertThat("totalPermUsedMaxpc", csv, Matchers.containsString("totalPermUsedMaxpc; " + percentFormatter.format(100.0) + "; %")); + } } @Test - public void testWriteWithPromotion() throws IOException { + void testWriteWithPromotion() throws IOException { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-01-25T17:10:16.889+0100: 12076.859: [GC 12076.859: [ParNew2011-01-25T17:10:16.896+0100: 12076.866: [CMS-concurrent-abortable-preclean: 0.929/4.899 secs] [Times: user=2.13 sys=0.04, real=4.90 secs]" + "\n" + @@ -131,13 +133,13 @@ public void testWriteWithPromotion() throws IOException { GCModel model = reader.read(); model.setURL(new URL("file", "localhost", "test-file")); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - SummaryDataWriter objectUnderTest = new SummaryDataWriter(output); - - objectUnderTest.write(model); + try (ByteArrayOutputStream output = new ByteArrayOutputStream(); + SummaryDataWriter objectUnderTest = new SummaryDataWriter(output)) { + objectUnderTest.write(model); - String csv = output.toString(); + String csv = output.toString(); - assertThat("avgPromotion", csv, Matchers.containsString("avgPromotion; " + memoryFormatter.formatToFormatted(2925).getValue() + "; K")); + assertThat("avgPromotion", csv, Matchers.containsString("avgPromotion; " + memoryFormatter.formatToFormatted(2925).getValue() + "; K")); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestAbstractDataReaderSun.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestAbstractDataReaderSun.java index 38f8dcac..46c514bb 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestAbstractDataReaderSun.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestAbstractDataReaderSun.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,14 +17,14 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.util.ParseInformation; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class TestAbstractDataReaderSun { +class TestAbstractDataReaderSun { private AbstractDataReaderSunSub dataReader; - @Before + @BeforeEach public void setUp() throws UnsupportedEncodingException { dataReader = new AbstractDataReaderSunSub(new GcResourceFile("empty"), new ByteArrayInputStream(new byte[0]), GcLogType.SUN1_6); } @@ -33,7 +33,7 @@ public void setUp() throws UnsupportedEncodingException { * Tests parsing of memory information like 8192K(16M)->7895K(16M) */ @Test - public void setMemorySimplePreUsed_heap_postUsed_heap() throws ParseException { + void setMemorySimplePreUsed_heap_postUsed_heap() throws ParseException { String line = " [Eden: 1000K(2000K)->0B(3000K) Survivors: 1024B->4000K Heap: 5000K(16M)->6000K(16M)]"; ParseInformation pos = new ParseInformation(0); @@ -42,16 +42,16 @@ public void setMemorySimplePreUsed_heap_postUsed_heap() throws ParseException { GCEvent event = new GCEvent(); dataReader.setMemoryExtended(event, line, pos); - assertEquals("heap before", 5000, event.getPreUsed()); - assertEquals("heap after", 6000, event.getPostUsed()); - assertEquals("heap total", 16*1024, event.getTotal()); + assertEquals(5000, event.getPreUsed(), "heap before"); + assertEquals(6000, event.getPostUsed(), "heap after"); + assertEquals(16 * 1024, event.getTotal(), "heap total"); } /** * Tests parsing of memory information like 8192K->7895K(16M) */ @Test - public void setMemorySimplePreUsed_postUsed_heap() throws ParseException { + void setMemorySimplePreUsed_postUsed_heap() throws ParseException { String line = " [ 8192K->8128K(64M)]"; ParseInformation pos = new ParseInformation(0); @@ -60,16 +60,16 @@ public void setMemorySimplePreUsed_postUsed_heap() throws ParseException { GCEvent event = new GCEvent(); dataReader.setMemoryExtended(event, line, pos); - assertEquals("heap before", 8192, event.getPreUsed()); - assertEquals("heap after", 8128, event.getPostUsed()); - assertEquals("heap total", 64*1024, event.getTotal()); + assertEquals(8192, event.getPreUsed(), "heap before"); + assertEquals(8128, event.getPostUsed(), "heap after"); + assertEquals(64 * 1024, event.getTotal(), "heap total"); } /** * Tests parsing of memory information like 8192K->7895K (usually found in G1 Survivors block) */ @Test - public void setMemorySimplePreHeap_postHeap() throws ParseException { + void setMemorySimplePreHeap_postHeap() throws ParseException { String line = " [Eden: 1000K(2000K)->0B(3000K) Survivors: 1024B->4000K Heap: 5000K(16M)->6000K(16M)]"; ParseInformation pos = new ParseInformation(0); @@ -78,15 +78,15 @@ public void setMemorySimplePreHeap_postHeap() throws ParseException { GCEvent event = new GCEvent(); dataReader.setMemoryExtended(event, line, pos); - assertEquals("heap before", 1, event.getPreUsed()); - assertEquals("heap after", 4000, event.getPostUsed()); + assertEquals(1, event.getPreUsed(), "heap before"); + assertEquals(4000, event.getPostUsed(), "heap after"); } /** * Tests parsing of memory information like "118.5M(118.0M)->128.4K(112.0M)" (notice the dots). */ @Test - public void setExtendedMemoryFloatingPointPreEden_postEden() throws ParseException { + void setExtendedMemoryFloatingPointPreEden_postEden() throws ParseException { String line = " [Eden: 118.5M(118.0M)->128.4K(112.0M) Survivors: 10.0M->16.0M Heap: 548.6M(640.0M)->440.6M(640.0M)]"; ParseInformation pos = new ParseInformation(0); @@ -95,12 +95,12 @@ public void setExtendedMemoryFloatingPointPreEden_postEden() throws ParseExcepti GCEvent event = new GCEvent(); dataReader.setMemoryExtended(event, line, pos); - assertEquals("heap before", 121344, event.getPreUsed()); - assertEquals("heap after", 128, event.getPostUsed()); + assertEquals(121344, event.getPreUsed(), "heap before"); + assertEquals(128, event.getPostUsed(), "heap after"); } @Test - public void contains() { + void contains() { String line = "0.233: [Concurrent reset, start]\n"; List containsStrings = Arrays.asList(", start", "blabla"); assertThat("should detect string", dataReader.contains(line, containsStrings, false), is(true)); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java index a401ee5a..08e20017 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFacade.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.FileNotFoundException; import java.io.IOException; @@ -19,8 +19,9 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the implementation of {@link DataReaderFacade}. @@ -28,7 +29,7 @@ * @author Joerg Wuethrich *

created on: 28.11.2012

*/ -public class TestDataReaderFacade { +class TestDataReaderFacade { private static final String SAMPLE_GCLOG_SUN1_6_0 = "SampleSun1_6_0PrintHeapAtGC.txt"; @@ -36,8 +37,8 @@ public class TestDataReaderFacade { private DataReaderFacade dataReaderFacade; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() { dataReaderFacade = new DataReaderFacade(); } @@ -46,17 +47,17 @@ public void setUp() throws Exception { * with filename that does exist. */ @Test - public void loadModelStringFileExistsNoWarnings() throws Exception { + void loadModelStringFileExistsNoWarnings() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile(PARENT_PATH + SAMPLE_GCLOG_SUN1_6_0); gcResource.getLogger().addHandler(handler); final GCModel model = dataReaderFacade.loadModel(gcResource); - - assertEquals("has no errors", 0, handler.getCount()); - assertNotNull("Model returned", model); - assertNotNull("Model returned contains URL", model.getURL()); + + assertEquals(0, handler.getCount(), "has no errors"); + assertNotNull(model, "Model returned"); + assertNotNull(model.getURL(), "Model returned contains URL"); } /** @@ -64,17 +65,15 @@ public void loadModelStringFileExistsNoWarnings() throws Exception { * with a malformed url. */ @Test - public void loadModelMalformedUrl() throws Exception { - - try { - dataReaderFacade.loadModel(new GcResourceFile("httpblabla")); - } - catch (DataReaderException e) { - assertNotNull("cause", e.getCause()); - assertEquals("expected exception in cause", - MalformedURLException.class.getName(), - e.getCause().getClass().getName()); - } + void loadModelMalformedUrl() { + DataReaderException e = Assertions.assertThrows(DataReaderException.class, + () -> dataReaderFacade.loadModel(new GcResourceFile("httpblabla"))); + assertAll(() -> { + assertNotNull(e.getCause(), "cause"); + assertEquals(MalformedURLException.class.getName(), + e.getCause().getClass().getName(), + "expected exception in cause"); + }); } /** @@ -82,17 +81,15 @@ public void loadModelMalformedUrl() throws Exception { * with a malformed url. */ @Test - public void loadModelIllegalArgument() throws Exception { - - try { - dataReaderFacade.loadModel(new GcResourceFile("http://")); - } - catch (DataReaderException e) { - assertNotNull("cause", e.getCause()); - assertEquals("expected exception in cause", - IllegalArgumentException.class.getName(), - e.getCause().getClass().getName()); - } + void loadModelIllegalArgument() { + DataReaderException e = Assertions.assertThrows(DataReaderException.class, + () -> dataReaderFacade.loadModel(new GcResourceFile("http://"))); + assertAll(() -> { + assertNotNull(e.getCause(), "cause"); + assertEquals(IllegalArgumentException.class.getName(), + e.getCause().getClass().getName(), + "expected exception in cause"); + }); } /** @@ -100,21 +97,19 @@ public void loadModelIllegalArgument() throws Exception { * with filename that does not exist. */ @Test - public void loadModelFileDoesntExists() throws Exception { - try { - dataReaderFacade.loadModel(new GcResourceFile("dummy.txt")); - fail("DataReaderException expected"); - } - catch (DataReaderException e) { - assertNotNull("cause", e.getCause()); - assertEquals("expected exception in cause", - FileNotFoundException.class.getName(), - e.getCause().getClass().getName()); - } + void loadModelFileDoesntExists() { + DataReaderException e = Assertions.assertThrows(DataReaderException.class, + () -> dataReaderFacade.loadModel(new GcResourceFile("dummy.txt"))); + assertAll(() -> { + assertNotNull(e.getCause(), "cause"); + assertEquals(FileNotFoundException.class.getName(), + e.getCause().getClass().getName(), + "expected exception in cause"); + }); } @Test - public void testLoadModel_forSeries() throws IOException, DataReaderException { + void testLoadModel_forSeries() throws IOException, DataReaderException { GCResource file1 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath()); GCResource file2 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part2.txt").getPath()); GCResource file3 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part3.txt").getPath()); @@ -140,7 +135,7 @@ public void testLoadModel_forSeries() throws IOException, DataReaderException { } @Test - public void testLoadModelFromSeries() throws IOException, DataReaderException { + void testLoadModelFromSeries() throws IOException, DataReaderException { GCResource file1 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath()); GCResource file2 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part2.txt").getPath()); GCResource file3 = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part3.txt").getPath()); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFactory.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFactory.java index 08ea7077..cdba1311 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFactory.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderFactory.java @@ -1,18 +1,21 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.util.stream.Stream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests the logic of the {@link DataReaderFactory} @@ -24,10 +27,6 @@ */ public class TestDataReaderFactory { - - @Rule - public TestName name = new TestName(); - private InputStream getInputStreamIBM(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); } @@ -40,13 +39,6 @@ private InputStream getInputStreamOpenJdk(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); } - private void assertDataReader( - Class expected, - Class actual) { - - assertDataReader(name.getMethodName(), expected, actual); - } - /** * Tests for equality of two {@link DataReader} classes. * @@ -54,292 +46,110 @@ private void assertDataReader( * @param expected expected type of DataReader * @param actual actual type of DataReader */ - private void assertDataReader(String testName, - Class expected, - Class actual) { - - assertEquals(testName, expected.getCanonicalName(), actual.getCanonicalName()); + private void assertDataReader(String testName, Class expected, Class actual) { + assertEquals(expected.getCanonicalName(), actual.getCanonicalName(), testName); } - @Test - public void testGetDataReaderJDK6GZipped() throws Exception { - String sampleGz = "SampleSun1_6_0PrintHeapAtGC.txt.gz"; - try (InputStream in = getInputStreamOpenJdk(sampleGz)) { - - final DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(sampleGz), in); - assertDataReader("getDataReader() reading " + sampleGz, DataReaderSun1_6_0.class, reader.getClass()); + @ParameterizedTest + @MethodSource("getOpenJDKFiles") + void testOpenJDK(final String fileName, Class dataReader, final int events, final String testName) throws Exception { + try (InputStream in = getInputStreamOpenJdk(fileName)) { + final DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); + assertDataReader(testName, dataReader, reader.getClass()); GCModel model = reader.read(); - assertEquals("# events", 2, model.size()); - } - } - - @Test - public void getDataReaderG1() throws Exception { - String sampleFile = "SampleSun1_7_0G1-ApplicationStopped.txt"; - try (InputStream in = getInputStreamOpenJdk(sampleFile)) { - - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(sampleFile), in); - assertDataReader("getDataReader() reading " + sampleFile, DataReaderSun1_6_0G1.class, reader.getClass()); - - GCModel model = reader.read(); - assertEquals("# events", 55, model.size()); - } - } - - @Test - public void testIBMi5OS1_4_2() throws Exception { - String fileName = "SampleIBMi5OS1_4_2.txt"; - try (InputStream in = getInputStreamIBM(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderIBMi5OS1_4_2.class, reader.getClass()); + assertEquals(events, model.size(), "# events"); } } - @Test - public void testIBMJ9_5_0() throws Exception { - String fileName = "SampleIBMJ9_5_0af-global-200811_07.txt"; - try (InputStream in = getInputStreamIBM(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderIBM_J9_5_0.class, reader.getClass()); - } + private static Stream getOpenJDKFiles() { + return Stream.of( + Arguments.arguments("SampleSun1_6_0PrintHeapAtGC.txt.gz", DataReaderSun1_6_0.class, 2, "getDataReader() reading SampleSun1_6_0PrintHeapAtGC.txt.gz"), + Arguments.arguments("SampleSun1_7_0G1-ApplicationStopped.txt", DataReaderSun1_6_0G1.class, 55, "getDataReader() reading SampleSun1_7_0G1-ApplicationStopped.txt") + ); } - @Test - public void testIBMJ9_R26() throws Exception { - String fileName = "SampleIBMJ9_R26_GAFP1_full_header.txt"; + @ParameterizedTest + @MethodSource("getIBMFiles") + void testIBM(final String fileName, final Class dataReader, final String testName) throws Exception { try (InputStream in = getInputStreamIBM(fileName)) { DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderIBM_J9_R28.class, reader.getClass()); + assertDataReader(testName, dataReader, reader.getClass()); } } - @Test - public void testIBMJ9_R27() throws Exception { - String fileName = "SampleIBMJ9_R27_SR1_full_header.txt"; - try (InputStream in = getInputStreamIBM(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderIBM_J9_R28.class, reader.getClass()); - } + private static Stream getIBMFiles(){ + return Stream.of( + Arguments.arguments("SampleIBMi5OS1_4_2.txt", DataReaderIBMi5OS1_4_2.class, "IBM i5 OS 1.4.2"), + Arguments.arguments("SampleIBMJ9_5_0af-global-200811_07.txt", DataReaderIBM_J9_5_0.class, "IBM J9 5.0"), + Arguments.arguments("SampleIBMJ9_R26_GAFP1_full_header.txt", DataReaderIBM_J9_R28.class, "IBM J9 R26"), + Arguments.arguments("SampleIBMJ9_R27_SR1_full_header.txt", DataReaderIBM_J9_R28.class, "IBM J9 R27") + ); } - @Test - public void testJRockit1_4GcReportGenCon() throws Exception { - String fileName = "SampleJRockit1_4_2ts-gcreport-gencon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_4_2.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GcReportParallel() throws Exception { - String fileName = "SampleJRockit1_4_2ts-gcreport-parallel.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_4_2.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GcReportPrioPauseTime() throws Exception { - String fileName = "SampleJRockit1_4_2ts-gcreport-gcpriopausetime.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_4_2.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GcReportPrioThroughput() throws Exception { - String fileName = "SampleJRockit1_4_2ts-gcreport-gcpriothroughput.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_4_2.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GcReportSingleCon() throws Exception { - String fileName = "SampleJRockit1_4_2ts-gcreport-singlecon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_4_2.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GenCon() throws Exception { - String fileName = "SampleJRockit1_4_2gencon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4GenConBig() throws Exception { - String fileName = "SampleJRockit1_4_2gencon-big.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4Parallel() throws Exception { - String fileName = "SampleJRockit1_4_2parallel.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_4PrioPauseTime() throws Exception { - String fileName = "SampleJRockit1_4_2priopausetime.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_5GenCon() throws Exception { - String fileName = "SampleJRockit1_5_12_gencon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_5GenConMemStats() throws Exception { - String fileName = "SampleJRockit1_5_20_memstats2.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_6_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_5GenPar() throws Exception { - String fileName = "SampleJRockit1_5_12_genpar.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_5PrioPausetime() throws Exception { - String fileName = "SampleJRockit1_5_12_gcpriopausetime.txt"; + @ParameterizedTest + @MethodSource("getJRockitFiles") + void testJRockit(final String fileName, final Class dataReader, final String testName) throws Exception { try (InputStream in = getInputStreamJRockit(fileName)) { DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); + assertDataReader(testName, dataReader, reader.getClass()); } } - @Test - public void testJRockit1_5PrioThroughput() throws Exception { - String fileName = "SampleJRockit1_5_12_gcpriothroughput.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_5SimpleOpts() throws Exception { - String fileName = "SampleJRockit1_5_12-gcreport-simpleopts-singlecon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_5_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_6GenConVerbose() throws Exception { - String fileName = "SampleJRockit1_6_verbose_gc_mode_gencon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_6_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_6GenParVerbose() throws Exception { - String fileName = "SampleJRockit1_6_33_gc_mode_genpar_verbosenursery.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_6_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_6ParCon() throws Exception { - String fileName = "SampleJRockit1_6_gc_mode_singleparcon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_6_0.class, reader.getClass()); - } - } - - @Test - public void testJRockit1_6ParConVerbose() throws Exception { - String fileName = "SampleJRockit1_6_verbose_gc_mode_singleparcon.txt"; - try (InputStream in = getInputStreamJRockit(fileName)) { - DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertDataReader(DataReaderJRockit1_6_0.class, reader.getClass()); - } - } - - @Test - public void testSun1_3_1() throws Exception { - DataReaderFactory factory = new DataReaderFactory(); - DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), new ByteArrayInputStream("[GC 1087K->462K(16320K), 0.0154134 secs]".getBytes())); - assertDataReader("Sun1_3_1 GC", DataReaderSun1_3_1.class, dr.getClass()); - - dr = factory.getDataReader(new GcResourceFile("byteArray2"), new ByteArrayInputStream("[Full GC 1087K->462K(16320K), 0.0154134 secs]".getBytes())); - assertDataReader("Sun1_3_1 Full GC", DataReaderSun1_3_1.class, dr.getClass()); + private static Stream getJRockitFiles() { + return Stream.of( + Arguments.arguments("SampleJRockit1_4_2ts-gcreport-gencon.txt", DataReaderJRockit1_4_2.class, "JRockit 1.4 GC report gen con"), + Arguments.arguments("SampleJRockit1_4_2ts-gcreport-parallel.txt", DataReaderJRockit1_4_2.class, "JRockit 1.4 GC report parallel"), + Arguments.arguments("SampleJRockit1_4_2ts-gcreport-gcpriopausetime.txt", DataReaderJRockit1_4_2.class, "JRockit 1.4 GC report prio pause time"), + Arguments.arguments("SampleJRockit1_4_2ts-gcreport-gcpriothroughput.txt", DataReaderJRockit1_4_2.class, "JRockit 1.4 GC report prio throughput"), + Arguments.arguments("SampleJRockit1_4_2ts-gcreport-singlecon.txt", DataReaderJRockit1_4_2.class, "JRockit 1.4 GcReportSingleCon"), + Arguments.arguments("SampleJRockit1_4_2gencon.txt",DataReaderJRockit1_5_0.class , "JRockit 1.4 GenCon"), + Arguments.arguments("SampleJRockit1_4_2gencon-big.txt", DataReaderJRockit1_5_0.class, "JRockit 1.4 GenConBig"), + Arguments.arguments("SampleJRockit1_4_2parallel.txt", DataReaderJRockit1_5_0.class, "JRockit 1.4 Parallel"), + Arguments.arguments("SampleJRockit1_4_2priopausetime.txt", DataReaderJRockit1_5_0.class, "JRockit 1.4 Prio Pause Time"), + Arguments.arguments("SampleJRockit1_5_12_gencon.txt", DataReaderJRockit1_5_0.class, "JRockit 1.5 GenCon"), + Arguments.arguments("SampleJRockit1_5_20_memstats2.txt", DataReaderJRockit1_6_0.class, "JRockit 1.5 GenConMemStats"), + Arguments.arguments("SampleJRockit1_5_12_genpar.txt", DataReaderJRockit1_5_0.class, "JRockit 1.5 GenPar"), + Arguments.arguments("SampleJRockit1_5_12_gcpriopausetime.txt", DataReaderJRockit1_5_0.class, "JRockit 1.5 Prio Pausetime"), + Arguments.arguments("SampleJRockit1_5_12_gcpriothroughput.txt",DataReaderJRockit1_5_0.class , "JRockit 1.5 Prio Throughput"), + Arguments.arguments("SampleJRockit1_5_12-gcreport-simpleopts-singlecon.txt", DataReaderJRockit1_5_0.class, "JRockit 1.5 SimpleOpts"), + Arguments.arguments("SampleJRockit1_6_verbose_gc_mode_gencon.txt", DataReaderJRockit1_6_0.class, "JRockit 1.6 GenConVerbose"), + Arguments.arguments("SampleJRockit1_6_33_gc_mode_genpar_verbosenursery.txt", DataReaderJRockit1_6_0.class, "JRockit 1.6 GenParVerbose"), + Arguments.arguments("SampleJRockit1_6_gc_mode_singleparcon.txt", DataReaderJRockit1_6_0.class, "JRockit 1.6 ParCon"), + Arguments.arguments("SampleJRockit1_6_verbose_gc_mode_singleparcon.txt", DataReaderJRockit1_6_0.class, "JRockit 1.6 ParConVerbose") + ); } - @Test - public void testSun1_4_0() throws Exception { - // although the input is java 1.4 the datareader returned should be 1.6 - // (DataReaderSun1_6_0 handles java 1.4, 1.5, 1.6, 1.7) + @ParameterizedTest + @MethodSource("getSunContent") + void testSun(final String line, final Class dataReader, final String testName) throws Exception { DataReaderFactory factory = new DataReaderFactory(); - DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), new ByteArrayInputStream("2.23492e-006: [GC 1087K->462K(16320K), 0.0154134 secs]".getBytes())); - assertDataReader(DataReaderSun1_6_0.class, dr.getClass()); + DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), new ByteArrayInputStream(line.getBytes())); + assertDataReader(testName, dataReader, dr.getClass()); } - @Test - public void testOracleG1J8() throws Exception { - DataReaderFactory factory = new DataReaderFactory(); - DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), new ByteArrayInputStream(("Java HotSpot(TM) 64-Bit Server VM (25.112-b15) for windows-amd64 JRE (1.8.0_112-b15), built on Sep 22 2016 21:31:56 by \"java_re\" with MS VC++ 10.0 (VS2010)\n" + - "Memory: 4k page, physical 50331128k(13997304k free), swap 60569268k(13009848k free)\n" + - "CommandLine flags: -XX:CICompilerCount=4 -XX:ConcGCThreads=3 -XX:G1HeapRegionSize=2097152 -XX:GCLogFileSize=1048576 -XX:InitialHeapSize=4294967296 -XX:+ManagementServer -XX:MarkStackSize=4194304 -XX:MaxHeapSize=8589934592 -XX:MaxNewSize=5152702464 -XX:MinHeapDeltaBytes=2097152 -XX:NumberOfGCLogFiles=5 -XX:-OmitStackTraceInFastThrow -XX:+ParallelRefProcEnabled -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+ReduceSignalUsage -XX:+UseCompressedClassPointers -XX:+UseCompressedOops -XX:+UseFastUnorderedTimeStamps -XX:+UseG1GC -XX:+UseGCLogFileRotation -XX:-UseLargePagesIndividualAllocation\n" + - "2017-12-01T14:14:50.781-0600: 1501608.217: [GC pause (G1 Evacuation Pause) (mixed)\n").getBytes())); - assertDataReader(DataReaderSun1_6_0G1.class, dr.getClass()); + private static Stream getSunContent() { + return Stream.of( + Arguments.arguments("[GC 1087K->462K(16320K), 0.0154134 secs]", DataReaderSun1_3_1.class, "Sun1_3_1 GC"), + Arguments.arguments("[Full GC 1087K->462K(16320K), 0.0154134 secs]", DataReaderSun1_3_1.class, "Sun1_3_1 Full GC"), + // although the input is java 1.4 the datareader returned should be 1.6 (DataReaderSun1_6_0 handles java 1.4, 1.5, 1.6, 1.7) + Arguments.arguments("2.23492e-006: [GC 1087K->462K(16320K), 0.0154134 secs]", DataReaderSun1_6_0.class, "Sun 1.4.0"), + Arguments.arguments("Java HotSpot(TM) 64-Bit Server VM (25.112-b15) for windows-amd64 JRE (1.8.0_112-b15), built on Sep 22 2016 21:31:56 by \"java_re\" with MS VC++ 10.0 (VS2010)\n" + + "Memory: 4k page, physical 50331128k(13997304k free), swap 60569268k(13009848k free)\n" + + "CommandLine flags: -XX:CICompilerCount=4 -XX:ConcGCThreads=3 -XX:G1HeapRegionSize=2097152 -XX:GCLogFileSize=1048576 -XX:InitialHeapSize=4294967296 -XX:+ManagementServer -XX:MarkStackSize=4194304 -XX:MaxHeapSize=8589934592 -XX:MaxNewSize=5152702464 -XX:MinHeapDeltaBytes=2097152 -XX:NumberOfGCLogFiles=5 -XX:-OmitStackTraceInFastThrow -XX:+ParallelRefProcEnabled -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+ReduceSignalUsage -XX:+UseCompressedClassPointers -XX:+UseCompressedOops -XX:+UseFastUnorderedTimeStamps -XX:+UseG1GC -XX:+UseGCLogFileRotation -XX:-UseLargePagesIndividualAllocation\n" + + "2017-12-01T14:14:50.781-0600: 1501608.217: [GC pause (G1 Evacuation Pause) (mixed)\n", DataReaderSun1_6_0G1.class, "Oracle G1 J8"), + Arguments.arguments("OpenJDK 64-Bit Server VM (25.161-b14) for linux-amd64 JRE (1.8.0_161-b14), built on Jan 9 2018 19:54:33 by \"mockbuild\" with gcc 4.8.5 20150623 (Red Hat 4.8.5-16)\n" + + "Memory: 4k page, physical 8002012k(4357532k free), swap 2097148k(1656904k free)\n" + + "CommandLine flags: -XX:HeapDumpPath=/work -XX:InitialHeapSize=2147483648 -XX:LogFile=/log/jvm.log -XX:+LogVMOutput -XX:+ManagementServer -XX:MaxHeapSize=2147483648 -XX:+PrintGC -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions -XX:+UseCompressedClassPointers -XX:+UseCompressedOops -XX:-UseNUMA -XX:+UseShenandoahGC \n" + + "13.976: [Pause Init Mark, 3.587 ms]\n",DataReaderSun1_6_0.class, "Oracle Shenandoah J8 Simple") + ); } @Test - public void testOracleG1J8_StringDeduplication() throws Exception { + void testOracleG1J8_StringDeduplication(TestInfo testInfo) throws Exception { DataReaderFactory factory = new DataReaderFactory(); DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), getInputStreamOpenJdk("SampleSun1_8_0G1StringDeduplication.txt")); - assertDataReader(DataReaderSun1_6_0G1.class, dr.getClass()); + assertDataReader("Orcale G1 J8 StringDeduplication", DataReaderSun1_6_0G1.class, dr.getClass()); } - - @Test - public void testOracleShenandoahJ8Simple() throws Exception { - DataReaderFactory factory = new DataReaderFactory(); - DataReader dr = factory.getDataReader(new GcResourceFile("byteArray"), new ByteArrayInputStream(( - "OpenJDK 64-Bit Server VM (25.161-b14) for linux-amd64 JRE (1.8.0_161-b14), built on Jan 9 2018 19:54:33 by \"mockbuild\" with gcc 4.8.5 20150623 (Red Hat 4.8.5-16)\n" + - "Memory: 4k page, physical 8002012k(4357532k free), swap 2097148k(1656904k free)\n" + - "CommandLine flags: -XX:HeapDumpPath=/work -XX:InitialHeapSize=2147483648 -XX:LogFile=/log/jvm.log -XX:+LogVMOutput -XX:+ManagementServer -XX:MaxHeapSize=2147483648 -XX:+PrintGC -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions -XX:+UseCompressedClassPointers -XX:+UseCompressedOops -XX:-UseNUMA -XX:+UseShenandoahGC \n" + - "13.976: [Pause Init Mark, 3.587 ms]\n").getBytes())); - assertDataReader(DataReaderSun1_6_0.class, dr.getClass()); - } - } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderGo.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderGo.java index d16d9713..61e8cc23 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderGo.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderGo.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -14,12 +14,12 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestDataReaderGo { +class TestDataReaderGo { @Test - public void test() throws IOException { + void test() throws IOException { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -47,7 +47,7 @@ public void test() throws IOException { } @Test - public void exampleLog() throws IOException { + void exampleLog() throws IOException { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("go1.9.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_2.java index 3d8ecc6a..096af33b 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_2.java @@ -1,14 +1,14 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -16,16 +16,16 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderHPUX1_2 { +class TestDataReaderHPUX1_2 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleHP-UX1_3.txt"; - InputStream in = UnittestHelper.getResourceAsStream(FOLDER.HP, fileName); - DataReader reader = new DataReaderHPUX1_2(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 135, model.size()); - } + try (InputStream in = UnittestHelper.getResourceAsStream(FOLDER.HP, fileName)) { + DataReader reader = new DataReaderHPUX1_2(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + assertEquals(135, model.size(), "number of events"); + } + } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_4_1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_4_1.java index bea1b30d..362ad04d 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_4_1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderHPUX1_4_1.java @@ -6,15 +6,15 @@ */ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -22,16 +22,16 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderHPUX1_4_1 { +class TestDataReaderHPUX1_4_1 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleHP-UX1_4_1.txt"; - final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.HP, fileName); - final DataReader reader = new DataReaderHPUX1_4_1(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 4, model.size()); - } + try (final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.HP, fileName)) { + final DataReader reader = new DataReaderHPUX1_4_1(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + assertEquals(4, model.size(), "number of events"); + } + } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_2_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_2_2.java index 01498366..b99730cf 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_2_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_2_2.java @@ -1,6 +1,6 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.InputStream; @@ -8,7 +8,7 @@ import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -16,15 +16,16 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderIBM1_2_2 { +class TestDataReaderIBM1_2_2 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleIBM1_2_2.txt"; - InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); - DataReader reader = new DataReaderIBM1_3_0(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 28, model.size()); + try (InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName)) { + DataReader reader = new DataReaderIBM1_3_0(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + + assertEquals(28, model.size(), "number of events"); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_3_1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_3_1.java index 7b6e0560..7984270d 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_3_1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_3_1.java @@ -1,14 +1,14 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -16,15 +16,16 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderIBM1_3_1 { +class TestDataReaderIBM1_3_1 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleIBM1_3_1.txt"; - InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); - DataReader reader = new DataReaderIBM1_3_1(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 21, model.size()); + try (InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName)) { + DataReader reader = new DataReaderIBM1_3_1(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + + assertEquals(21, model.size(), "number of events"); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_4_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_4_2.java index 2525f513..8d8bda25 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_4_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM1_4_2.java @@ -6,16 +6,16 @@ */ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -23,16 +23,17 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -@Ignore -public class TestDataReaderIBM1_4_2 { +@Disabled +class TestDataReaderIBM1_4_2 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleIBM1_4_2.txt"; - final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); - final DataReader reader = new DataReaderIBM1_4_2(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 2884, model.size()); + try (final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName)) { + final DataReader reader = new DataReaderIBM1_4_2(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + + assertEquals(2884, model.size(), "number of events"); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMJ9_5_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMJ9_5_0.java index 41f56413..72ce9b5a 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMJ9_5_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMJ9_5_0.java @@ -1,7 +1,5 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -12,7 +10,9 @@ import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests the implementation of {@link TestDataReaderIBMJ9_5_0} and {@link IBMJ9SAXHandler}. @@ -20,7 +20,7 @@ * @author Joerg Wuethrich *

created on: 18.02.2013

*/ -public class TestDataReaderIBMJ9_5_0 { +class TestDataReaderIBMJ9_5_0 { private InputStream getInputStream(String filename) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.IBM, filename); @@ -31,36 +31,36 @@ private DataReader getDataReader(String fileName) throws UnsupportedEncodingExce } @Test - public void afTenuredGlobal() throws Exception { + void afTenuredGlobal() throws Exception { final DataReader reader = getDataReader("SampleIBMJ9_5_0af-global-200811_07.txt"); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); + assertEquals(1, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("pause", 0.035912, event.getPause(), 0.0000001); + assertEquals(0.035912, event.getPause(), 0.0000001, "pause"); - assertEquals("timestamp", 0, event.getTimestamp(), 0.000001); - assertEquals("name", Type.FULL_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", (52428800 - 2621440) / 1024, event.getPreUsed()); - assertEquals("after", (52428800 - 40481192) / 1024, event.getPostUsed()); - assertEquals("total", 52428800 / 1024, event.getTotal()); + assertEquals(0, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.FULL_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals((52428800 - 2621440) / 1024, event.getPreUsed(), "before"); + assertEquals((52428800 - 40481192) / 1024, event.getPostUsed(), "after"); + assertEquals(52428800 / 1024, event.getTotal(), "total"); } @Test - public void afTenuredGlobal_20090417_AA() throws Exception { + void afTenuredGlobal_20090417_AA() throws Exception { final DataReader reader = getDataReader("SampleIBMJ9_5_0af-global-20090417_AA.txt"); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); + assertEquals(1, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("pause", 0.837024, event.getPause(), 0.0000001); + assertEquals(0.837024, event.getPause(), 0.0000001, "pause"); - assertEquals("timestamp", 0, event.getTimestamp(), 0.000001); - assertEquals("name", Type.FULL_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", (12884901888L - 4626919608L) / 1024, event.getPreUsed()); - assertEquals("after", (12884901888L - 10933557088L) / 1024, event.getPostUsed()); - assertEquals("total", 12884901888L / 1024, event.getTotal()); + assertEquals(0, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.FULL_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals((12884901888L - 4626919608L) / 1024, event.getPreUsed(), "before"); + assertEquals((12884901888L - 10933557088L) / 1024, event.getPostUsed(), "after"); + assertEquals(12884901888L / 1024, event.getTotal(), "total"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R26.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R26.java index 1305f57e..be2b02f5 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R26.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R26.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.imp; import static com.tagtraum.perf.gcviewer.UnittestHelper.toKiloBytes; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.number.IsCloseTo.closeTo; -import static org.junit.Assert.assertThat; import java.io.IOException; import java.io.InputStream; @@ -15,12 +15,13 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests some J9_R26 sample files against the IBM J9 parser. */ -public class TestDataReaderIBM_J9_R26 { +class TestDataReaderIBM_J9_R26 { + private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); } @@ -30,7 +31,7 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void testFullHeaderWithAfGcs() throws Exception { + void testFullHeaderWithAfGcs() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R26_GAFP1_full_header.txt"); @@ -48,7 +49,7 @@ public void testFullHeaderWithAfGcs() throws Exception { } @Test - public void testSystemGc() throws Exception { + void testSystemGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R26_GAFP1_global.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R27.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R27.java index 8f53fb3f..c1a443df 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R27.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R27.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.imp; import static com.tagtraum.perf.gcviewer.UnittestHelper.toKiloBytes; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.number.IsCloseTo.closeTo; -import static org.junit.Assert.assertThat; import java.io.IOException; import java.io.InputStream; @@ -15,13 +15,13 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Joerg Wuethrich *

created on 08.10.2014

*/ -public class TestDataReaderIBM_J9_R27 { +class TestDataReaderIBM_J9_R27 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); @@ -32,7 +32,7 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void testFullHeaderWithAfGcs() throws Exception { + void testFullHeaderWithAfGcs() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R27_SR1_full_header.txt"); @@ -66,7 +66,7 @@ public void testFullHeaderWithAfGcs() throws Exception { } @Test - public void testSystemGc() throws Exception { + void testSystemGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R27_SR1_global.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R28.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R28.java index cc352209..cbf0f5c7 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R28.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBM_J9_R28.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; import static com.tagtraum.perf.gcviewer.UnittestHelper.toKiloBytes; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.number.IsCloseTo.closeTo; -import static org.junit.Assert.assertThat; import java.io.IOException; import java.io.InputStream; @@ -16,14 +16,14 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author Joerg Wuethrich *

created on 08.10.2014

*/ -public class TestDataReaderIBM_J9_R28 { +class TestDataReaderIBM_J9_R28 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); @@ -34,7 +34,7 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void testAfScavenge() throws Exception { + void testAfScavenge() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R28_af_scavenge_full_header.txt"); @@ -69,7 +69,7 @@ public void testAfScavenge() throws Exception { } @Test - public void testAfGlobal() throws Exception { + void testAfGlobal() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R28_af_global.txt"); @@ -88,7 +88,7 @@ public void testAfGlobal() throws Exception { } @Test - public void testSysGlobal() throws Exception { + void testSysGlobal() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R28_sys_global.txt"); @@ -107,7 +107,7 @@ public void testSysGlobal() throws Exception { } @Test - public void testConcurrentMinimal() throws Exception { + void testConcurrentMinimal() throws Exception { // there are minimal concurrent blocks, that don't contain any information, that the parser can use (at least, at the moment) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -121,8 +121,9 @@ public void testConcurrentMinimal() throws Exception { assertThat("number of errors", handler.getCount(), is(0)); } - @Test @Ignore - public void testConcurrentCollection() throws Exception { + @Test + @Disabled + void testConcurrentCollection() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleIBMJ9_R28_concurrent_collection.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMi5OS1_4_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMi5OS1_4_2.java index 51c6f760..265f0455 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMi5OS1_4_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderIBMi5OS1_4_2.java @@ -1,15 +1,14 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -17,16 +16,17 @@ * Time: 5:53:55 PM * @author Ruwin Veldwijk */ -public class TestDataReaderIBMi5OS1_4_2 { +class TestDataReaderIBMi5OS1_4_2 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { String fileName = "SampleIBMi5OS1_4_2.txt"; - final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName); - final DataReader reader = new DataReaderIBMi5OS1_4_2(new GcResourceFile(fileName), in); - GCModel model = reader.read(); - - assertEquals("number of events", 53, model.size()); + try (final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.IBM, fileName)) { + final DataReader reader = new DataReaderIBMi5OS1_4_2(new GcResourceFile(fileName), in); + GCModel model = reader.read(); + + assertEquals(53, model.size(), "number of events"); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_4_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_4_2.java index faeab651..1a45d4b0 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_4_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_4_2.java @@ -1,8 +1,5 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -13,14 +10,17 @@ import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Date: Jan 30, 2002 * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderJRockit1_4_2 { +class TestDataReaderJRockit1_4_2 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.JROCKIT, fileName); @@ -35,155 +35,155 @@ private DataReader getDataReader1_5(String fileName) throws UnsupportedEncodingE } @Test - public void testParseGenCon() throws Exception { + void testParseGenCon() throws Exception { // TODO refactor JRockit DataReader DataReader reader = getDataReader1_5("SampleJRockit1_4_2gencon.txt"); GCModel model = reader.read(); - assertEquals("count", 123, model.size()); + assertEquals(123, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 77.737, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 630435, event.getPreUsed()); - assertEquals("after", 183741, event.getPostUsed()); - assertEquals("total", 1048576, event.getTotal()); - assertEquals("pause", 0.566158, event.getPause(), 0.0000001); + assertEquals(77.737, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(630435, event.getPreUsed(), "before"); + assertEquals(183741, event.getPostUsed(), "after"); + assertEquals(1048576, event.getTotal(), "total"); + assertEquals(0.566158, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseGenConBig() throws Exception { + void testParseGenConBig() throws Exception { // TODO refactor JRockit DataReader DataReader reader = getDataReader1_5("SampleJRockit1_4_2gencon-big.txt"); GCModel model = reader.read(); - assertEquals("count", 32420, model.size()); + assertEquals(32420, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 9.385, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 123930, event.getPreUsed()); - assertEquals("after", 27087, event.getPostUsed()); - assertEquals("total", 1048576, event.getTotal()); - assertEquals("pause", 0.053417, event.getPause(), 0.0000001); + assertEquals(9.385, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(123930, event.getPreUsed(), "before"); + assertEquals(27087, event.getPostUsed(), "after"); + assertEquals(1048576, event.getTotal(), "total"); + assertEquals(0.053417, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseParallel() throws Exception { + void testParseParallel() throws Exception { // TODO refactor JRockit DataReader DataReader reader = getDataReader1_5("SampleJRockit1_4_2parallel.txt"); GCModel model = reader.read(); - assertEquals("count", 92, model.size()); + assertEquals(92, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 226.002, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 1048576, event.getPreUsed()); - assertEquals("after", 133204, event.getPostUsed()); - assertEquals("total", 1048576, event.getTotal()); - assertEquals("pause", 0.544511, event.getPause(), 0.0000001); + assertEquals(226.002, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(1048576, event.getPreUsed(), "before"); + assertEquals(133204, event.getPostUsed(), "after"); + assertEquals(1048576, event.getTotal(), "total"); + assertEquals(0.544511, event.getPause(), 0.0000001, "pause"); } @Test - public void testParsePrioPauseTime() throws Exception { + void testParsePrioPauseTime() throws Exception { // TODO refactor JRockit DataReader DataReader reader = getDataReader1_5("SampleJRockit1_4_2priopausetime.txt"); GCModel model = reader.read(); - assertEquals("count", 1867, model.size()); + assertEquals(1867, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 12.622, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 320728, event.getPreUsed()); - assertEquals("after", 130908, event.getPostUsed()); - assertEquals("total", 358400, event.getTotal()); - assertEquals("pause", 0.025921, event.getPause(), 0.0000001); + assertEquals(12.622, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(320728, event.getPreUsed(), "before"); + assertEquals(130908, event.getPostUsed(), "after"); + assertEquals(358400, event.getTotal(), "total"); + assertEquals(0.025921, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseTsGCReportGencon() throws Exception { + void testParseTsGCReportGencon() throws Exception { DataReader reader = getDataReader1_4("SampleJRockit1_4_2ts-gcreport-gencon.txt"); GCModel model = reader.read(); - assertEquals("count", 63, model.size()); + assertEquals(63, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 13.594, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 13824, event.getPreUsed()); - assertEquals("after", 4553, event.getPostUsed()); - assertEquals("total", 32768, event.getTotal()); - assertEquals("pause", 0.028308, event.getPause(), 0.0000001); + assertEquals(13.594, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_NURSERY_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(13824, event.getPreUsed(), "before"); + assertEquals(4553, event.getPostUsed(), "after"); + assertEquals(32768, event.getTotal(), "total"); + assertEquals(0.028308, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseTsGCReportParallel() throws Exception { + void testParseTsGCReportParallel() throws Exception { DataReader reader = getDataReader1_4("SampleJRockit1_4_2ts-gcreport-parallel.txt"); GCModel model = reader.read(); - assertEquals("count", 31, model.size()); + assertEquals(31, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 20.547, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 32768, event.getPreUsed()); - assertEquals("after", 5552, event.getPostUsed()); - assertEquals("total", 32768, event.getTotal()); - assertEquals("pause", 0.072, event.getPause(), 0.0000001); + assertEquals(20.547, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(32768, event.getPreUsed(), "before"); + assertEquals(5552, event.getPostUsed(), "after"); + assertEquals(32768, event.getTotal(), "total"); + assertEquals(0.072, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseTsGCReportPrioPauseTime() throws Exception { + void testParseTsGCReportPrioPauseTime() throws Exception { String fileName = "SampleJRockit1_4_2ts-gcreport-gcpriopausetime.txt"; InputStream in = getInputStream(fileName); DataReader reader = new DataReaderFactory().getDataReader(new GcResourceFile(fileName), in); - assertTrue("should be DataReaderJRockit1_4_2 (but was " + reader.toString() + ")", reader instanceof DataReaderJRockit1_4_2); + assertTrue(reader instanceof DataReaderJRockit1_4_2, "should be DataReaderJRockit1_4_2 (but was " + reader.toString() + ")"); GCModel model = reader.read(); - assertEquals("count", 64, model.size()); + assertEquals(64, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 18.785, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 32260, event.getPreUsed()); - assertEquals("after", 4028, event.getPostUsed()); - assertEquals("total", 32768, event.getTotal()); - assertEquals("pause", 0.024491, event.getPause(), 0.0000001); + assertEquals(18.785, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(32260, event.getPreUsed(), "before"); + assertEquals(4028, event.getPostUsed(), "after"); + assertEquals(32768, event.getTotal(), "total"); + assertEquals(0.024491, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseTsGCReportPrioThroughput() throws Exception { + void testParseTsGCReportPrioThroughput() throws Exception { DataReader reader = getDataReader1_4("SampleJRockit1_4_2ts-gcreport-gcpriothroughput.txt"); GCModel model = reader.read(); - assertEquals("count", 70, model.size()); + assertEquals(70, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 20.021, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 32768, event.getPreUsed()); - assertEquals("after", 5561, event.getPostUsed()); - assertEquals("total", 32768, event.getTotal()); - assertEquals("pause", 0.061, event.getPause(), 0.0000001); + assertEquals(20.021, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(32768, event.getPreUsed(), "before"); + assertEquals(5561, event.getPostUsed(), "after"); + assertEquals(32768, event.getTotal(), "total"); + assertEquals(0.061, event.getPause(), 0.0000001, "pause"); } @Test - public void testParseTsGCReportSinglecon() throws Exception { + void testParseTsGCReportSinglecon() throws Exception { DataReader reader = getDataReader1_4("SampleJRockit1_4_2ts-gcreport-singlecon.txt"); GCModel model = reader.read(); - assertEquals("count", 41, model.size()); + assertEquals(41, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 18.906, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 32260, event.getPreUsed()); - assertEquals("after", 3997, event.getPostUsed()); - assertEquals("total", 32768, event.getTotal()); - assertEquals("pause", 0.020149, event.getPause(), 0.0000001); + assertEquals(18.906, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(32260, event.getPreUsed(), "before"); + assertEquals(3997, event.getPostUsed(), "after"); + assertEquals(32768, event.getTotal(), "total"); + assertEquals(0.020149, event.getPause(), 0.0000001, "pause"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_5_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_5_0.java index b32e3ef6..f1e28cb0 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_5_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_5_0.java @@ -6,8 +6,6 @@ */ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -25,7 +23,9 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** *

Test DataReaderJRockit1_5_0 implementation.

@@ -34,7 +34,7 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderJRockit1_5_0 { +class TestDataReaderJRockit1_5_0 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.JROCKIT, fileName); @@ -49,7 +49,7 @@ private DataReader getDataReader1_6(GCResource gcResource) throws UnsupportedEnc } @Test - public void testGcPrioPausetime() throws Exception { + void testGcPrioPausetime() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleJRockit1_5_12_gcpriopausetime.txt"); @@ -58,49 +58,49 @@ public void testGcPrioPausetime() throws Exception { DataReader reader = getDataReader1_5(gcResource); GCModel model = reader.read(); - assertEquals("count", 10, model.size()); + assertEquals(10, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 6.290, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 3128161, event.getPreUsed()); - assertEquals("after", 296406, event.getPostUsed()); - assertEquals("total", 3145728, event.getTotal()); - assertEquals("pause", 0.059084, event.getPause(), 0.0000001); + assertEquals(6.290, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(3128161, event.getPreUsed(), "before"); + assertEquals(296406, event.getPostUsed(), "after"); + assertEquals(3145728, event.getTotal(), "total"); + assertEquals(0.059084, event.getPause(), 0.0000001, "pause"); - assertEquals("number of warnings", 6, handler.getCount()); + assertEquals(6, handler.getCount(), "number of warnings"); } @Test - public void testGcPrioThroughput() throws Exception { + void testGcPrioThroughput() throws Exception { DataReader reader = getDataReader1_5(new GcResourceFile("SampleJRockit1_5_12_gcpriothroughput.txt")); GCModel model = reader.read(); - assertEquals("count", 8, model.size()); + assertEquals(8, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 4.817, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 1641728, event.getPreUsed()); - assertEquals("after", 148365, event.getPostUsed()); - assertEquals("total", 3145728, event.getTotal()); - assertEquals("pause", 0.039959, event.getPause(), 0.0000001); + assertEquals(4.817, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(1641728, event.getPreUsed(), "before"); + assertEquals(148365, event.getPostUsed(), "after"); + assertEquals(3145728, event.getTotal(), "total"); + assertEquals(0.039959, event.getPause(), 0.0000001, "pause"); } @Test - public void testGenCon() throws Exception { + void testGenCon() throws Exception { DataReader reader = getDataReader1_5(new GcResourceFile("SampleJRockit1_5_12_gencon.txt")); GCModel model = reader.read(); - assertEquals("count", 8, model.size()); + assertEquals(8, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 6.038, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 3089328, event.getPreUsed()); - assertEquals("after", 352551, event.getPostUsed()); - assertEquals("total", 3145728, event.getTotal()); - assertEquals("pause", 0.1186, event.getPause(), 0.0000001); + assertEquals(6.038, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(3089328, event.getPreUsed(), "before"); + assertEquals(352551, event.getPostUsed(), "after"); + assertEquals(3145728, event.getTotal(), "total"); + assertEquals(0.1186, event.getPause(), 0.0000001, "pause"); } /** @@ -109,33 +109,33 @@ public void testGenCon() throws Exception { * it can parse. */ @Test - public void testGenConMemstats() throws Exception { - // allthough this log file was written with JRockit 1.5 VM, it has the same structure + void testGenConMemstats() throws Exception { + // although this log file was written with JRockit 1.5 VM, it has the same structure // as a JRockit 1.6 gc log file. // TODO refactor JRockit DataReader DataReader reader = getDataReader1_6(new GcResourceFile("SampleJRockit1_5_20_memstats2.txt")); GCModel model = reader.read(); - assertEquals("count", 11, model.size()); + assertEquals(11, model.size(), "count"); } @Test - public void testGenPar() throws Exception { + void testGenPar() throws Exception { DataReader reader = getDataReader1_5(new GcResourceFile("SampleJRockit1_5_12_genpar.txt")); GCModel model = reader.read(); - assertEquals("count", 17, model.size()); + assertEquals(17, model.size(), "count"); // 2 types of events excpected: "GC" and "parallel nursery GC" Map gcEventPauses = model.getGcEventPauses(); - assertEquals("2 types of events found", 2, gcEventPauses.entrySet().size()); + assertEquals(2, gcEventPauses.entrySet().size(), "2 types of events found"); } /** * Test parsing of a malformed type. The test just expects an INFO to be logged - nothing else. */ @Test - public void testMalformedType() throws Exception { + void testMalformedType() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.INFO); GCResource gcResource = new GcResourceFile("byteArray"); @@ -152,27 +152,26 @@ public void testMalformedType() throws Exception { // Reading JRockit ... format // Failed to determine type ... // Reading done. - assertEquals("number of infos", 3, handler.getCount()); + assertEquals(3, handler.getCount(), "number of infos"); List logRecords = handler.getLogRecords(); - assertEquals("should start with 'Failed to determine type'", 0, logRecords.get(1).getMessage().indexOf("Failed to determine type")); + assertEquals(0, logRecords.get(1).getMessage().indexOf("Failed to determine type"), "should start with 'Failed to determine type'"); } @Test - public void testSimpleOpts() throws Exception { + void testSimpleOpts() throws Exception { DataReader reader = getDataReader1_5(new GcResourceFile("SampleJRockit1_5_12-gcreport-simpleopts-singlecon.txt")); GCModel model = reader.read(); - assertEquals("count", 5, model.size()); + assertEquals(5, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 6.771, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 3145728, event.getPreUsed()); - assertEquals("after", 296406, event.getPostUsed()); - assertEquals("total", 3145728, event.getTotal()); - assertEquals("pause", 0.066, event.getPause(), 0.0000001); - + assertEquals(6.771, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(3145728, event.getPreUsed(), "before"); + assertEquals(296406, event.getPostUsed(), "after"); + assertEquals(3145728, event.getTotal(), "total"); + assertEquals(0.066, event.getPause(), 0.0000001, "pause"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_6_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_6_0.java index 8c0d716b..ddca2777 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_6_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderJRockit1_6_0.java @@ -1,8 +1,5 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -18,7 +15,10 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for logs generated by JRockit 1.6 vm. @@ -26,7 +26,7 @@ * @author Joerg Wuethrich *

created on: 06.02.2013

*/ -public class TestDataReaderJRockit1_6_0 { +class TestDataReaderJRockit1_6_0 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.JROCKIT, fileName); @@ -37,7 +37,7 @@ private DataReader getDataReader(GCResource gcResource) throws UnsupportedEncodi } @Test - public void testGcPrioPauseSingleParCon() throws Exception { + void testGcPrioPauseSingleParCon() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleJRockit1_6_gc_mode_singleparcon.txt"); @@ -46,21 +46,21 @@ public void testGcPrioPauseSingleParCon() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("count", 42, model.size()); + assertEquals(42, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 24.930, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 464309, event.getPreUsed()); - assertEquals("after", 282831, event.getPostUsed()); - assertEquals("total", 524288, event.getTotal()); - assertEquals("pause", 0.020957, event.getPause(), 0.0000001); - - assertEquals("number of warnings", 5, handler.getCount()); + assertEquals(24.930, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(464309, event.getPreUsed(), "before"); + assertEquals(282831, event.getPostUsed(), "after"); + assertEquals(524288, event.getTotal(), "total"); + assertEquals(0.020957, event.getPause(), 0.0000001, "pause"); + + assertEquals(5, handler.getCount(), "number of warnings"); } @Test - public void testGcPrioPauseSingleParConVerbose() throws Exception { + void testGcPrioPauseSingleParConVerbose() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleJRockit1_6_verbose_gc_mode_singleparcon.txt"); @@ -68,21 +68,21 @@ public void testGcPrioPauseSingleParConVerbose() throws Exception { DataReader reader = getDataReader(gcResource); - assertTrue("should be DataReaderJRockit1_6_0 (but was " + reader.toString() + ")", reader instanceof DataReaderJRockit1_6_0); + assertTrue(reader instanceof DataReaderJRockit1_6_0, "should be DataReaderJRockit1_6_0 (but was " + reader.toString() + ")"); GCModel model = reader.read(); - assertEquals("count", 52, model.size()); + assertEquals(52, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 26.242, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 270909, event.getPreUsed()); - assertEquals("after", 210916, event.getPostUsed()); - assertEquals("total", 524288, event.getTotal()); - assertEquals("pause", 0.032087, event.getPause(), 0.0000001); - - assertEquals("number of warnings", 5, handler.getCount()); + assertEquals(26.242, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(270909, event.getPreUsed(), "before"); + assertEquals(210916, event.getPostUsed(), "after"); + assertEquals(524288, event.getTotal(), "total"); + assertEquals(0.032087, event.getPause(), 0.0000001, "pause"); + + assertEquals(5, handler.getCount(), "number of warnings"); } /** @@ -91,15 +91,15 @@ public void testGcPrioPauseSingleParConVerbose() throws Exception { * it can parse. */ @Test - public void testGenConVerbose() throws Exception { + void testGenConVerbose() throws Exception { DataReader reader = getDataReader(new GcResourceFile("SampleJRockit1_6_verbose_gc_mode_gencon.txt")); GCModel model = reader.read(); - assertEquals("count", 15, model.size()); + assertEquals(15, model.size(), "count"); } @Test - public void testGenParVerboseNursery() throws Exception { + void testGenParVerboseNursery() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleJRockit1_6_33_gc_mode_genpar_verbosenursery.txt"); @@ -108,42 +108,42 @@ public void testGenParVerboseNursery() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("count", 3, model.size()); + assertEquals(3, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 124.644, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_16_YOUNG_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 453996, event.getPreUsed()); - assertEquals("after", 188846, event.getPostUsed()); - assertEquals("total", 786432, event.getTotal()); - assertEquals("pause", 0.055369, event.getPause(), 0.0000001); + assertEquals(124.644, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_16_YOUNG_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(453996, event.getPreUsed(), "before"); + assertEquals(188846, event.getPostUsed(), "after"); + assertEquals(786432, event.getTotal(), "total"); + assertEquals(0.055369, event.getPause(), 0.0000001, "pause"); // generational algorithms have information about the generation sizing in the introduction of the gc log // -> check that it is present in the event event = event.getYoung(); - assertEquals("total", 393216, event.getTotal()); + assertEquals(393216, event.getTotal(), "total"); event = (GCEvent) model.get(2); - assertEquals("timestamp", 148.254, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 691255, event.getPreUsed()); - assertEquals("after", 279876, event.getPostUsed()); - assertEquals("total", 786432, event.getTotal()); - assertEquals("pause", 0.086713, event.getPause(), 0.0000001); + assertEquals(148.254, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_16_OLD_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(691255, event.getPreUsed(), "before"); + assertEquals(279876, event.getPostUsed(), "after"); + assertEquals(786432, event.getTotal(), "total"); + assertEquals(0.086713, event.getPause(), 0.0000001, "pause"); // generational algorithms have information about the generation sizing in the introduction of the gc log // -> check that it is present in the event GCEvent eventTenured = event.getTenured(); - assertEquals("total", 786432 - 393216, eventTenured.getTotal()); + assertEquals(786432 - 393216, eventTenured.getTotal(), "total"); GCEvent eventYoung = event.getYoung(); - assertEquals("total", 393216, eventYoung.getTotal()); + assertEquals(393216, eventYoung.getTotal(), "total"); - assertEquals("number of warnings", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of warnings"); } @Test - public void testMalformedType() throws Exception { + void testMalformedType() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.INFO); GCResource gcResource = new GcResourceFile("byteArray"); @@ -160,14 +160,14 @@ public void testMalformedType() throws Exception { // Reading JRockit ... format // Failed to determine type ... // Reading done. - assertEquals("number of infos", 3, handler.getCount()); + assertEquals(3, handler.getCount(), "number of infos"); List logRecords = handler.getLogRecords(); - assertEquals("should start with 'Failed to determine type'", 0, logRecords.get(1).getMessage().indexOf("Failed to determine type")); + assertEquals(0, logRecords.get(1).getMessage().indexOf("Failed to determine type"), "should start with 'Failed to determine type'"); } @Test - public void testStandardLine() throws Exception { + void testStandardLine() throws Exception { final ByteArrayInputStream in = new ByteArrayInputStream( ("[INFO ][memory ] [YC#1] 9.743-9.793: YC 294974KB->122557KB (524288KB), 0.050 s, sum of pauses 49.692 ms, longest pause 49.692 ms.") .getBytes()); @@ -175,15 +175,15 @@ public void testStandardLine() throws Exception { DataReader reader = new DataReaderJRockit1_6_0(new GcResourceFile("byteArray"), in); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); + assertEquals(1, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("timestamp", 9.743, event.getTimestamp(), 0.000001); - assertEquals("name", Type.JROCKIT_16_YOUNG_GC.getName(), event.getExtendedType().getName()); - assertEquals("before", 294974, event.getPreUsed()); - assertEquals("after", 122557, event.getPostUsed()); - assertEquals("total", 524288, event.getTotal()); - assertEquals("pause", 0.049692, event.getPause(), 0.0000001); + assertEquals(9.743, event.getTimestamp(), 0.000001, "timestamp"); + assertEquals(Type.JROCKIT_16_YOUNG_GC.getName(), event.getExtendedType().getName(), "name"); + assertEquals(294974, event.getPreUsed(), "before"); + assertEquals(122557, event.getPostUsed(), "after"); + assertEquals(524288, event.getTotal(), "total"); + assertEquals(0.049692, event.getPause(), 0.0000001, "pause"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_2_2.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_2_2.java index 0edf0ff0..fa52e861 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_2_2.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_2_2.java @@ -4,12 +4,12 @@ import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.util.Iterator; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -17,10 +17,10 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderSun1_2_2 { +class TestDataReaderSun1_2_2 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { AbstractGCEvent event1 = new GCEvent(0, 817, 187, 819, 0.008, AbstractGCEvent.Type.GC); event1.getGeneration(); AbstractGCEvent event2 = new GCEvent(0.02, 775, 188, 819, 0.005, AbstractGCEvent.Type.GC); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1.java index 3f5790d9..e01206a5 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1.java @@ -4,13 +4,12 @@ import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.util.Iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -18,10 +17,10 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderSun1_3_1 { +class TestDataReaderSun1_3_1 { @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { AbstractGCEvent event1 = new GCEvent(0, 8968, 8230, 10912, 0.0037192d, AbstractGCEvent.Type.GC); event1.getGeneration(); AbstractGCEvent event2 = new GCEvent(1, 8968, 8230, 10912, 0.0037192d, AbstractGCEvent.Type.GC); @@ -33,7 +32,7 @@ public void testParse1() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream("[GC 8968K->8230K(10912K), 0.0037192 secs]\r\n[GC 8968K->8230K(10[GC 8968K->8230K(10912K), 0.0037192 secs]912K), 0.0037192 secs]\r\n[Full GC 10753K->6046K(10912K), 0.3146707 secs]".getBytes()); DataReader reader = new DataReaderSun1_3_1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_3_1); GCModel model = reader.read(); - assertTrue(model.size() == 4); + assertEquals(4, model.size()); Iterator> i = model.getStopTheWorldEvents(); AbstractGCEvent event = i.next(); assertEquals(event, event1); @@ -44,7 +43,7 @@ public void testParse1() throws Exception { event = i.next(); assertEquals(event, event4); - assertEquals("throughput", 90.17011554119, model.getThroughput(), 0.00000001); + assertEquals(90.17011554119, model.getThroughput(), 0.00000001, "throughput"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1_19.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1_19.java index d06f29d2..709fa22c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1_19.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_3_1_19.java @@ -1,15 +1,15 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.InputStream; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -17,19 +17,20 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -@Ignore -public class TestDataReaderSun1_3_1_19 { +@Disabled +class TestDataReaderSun1_3_1_19 { @Test - public void testCMSPrintGCDetails() throws Exception { + void testCMSPrintGCDetails() throws Exception { // does not seem to be implemented at all String fileName = "SampleSun1_3_1_19SunOS.txt"; - final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); - final DataReader reader = new DataReaderSun1_3_1(new GcResourceFile(fileName), in, GcLogType.SUN1_3_1); - GCModel model = reader.read(); - - assertEquals("throughput", 95.21, model.getThroughput(), 0.01); + try (final InputStream in = UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName)) { + final DataReader reader = new DataReaderSun1_3_1(new GcResourceFile(fileName), in, GcLogType.SUN1_3_1); + GCModel model = reader.read(); + + assertEquals(95.21, model.getThroughput(), 0.01, "throughput"); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_4_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_4_0.java index 255f5fa3..b5884e03 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_4_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_4_0.java @@ -1,7 +1,5 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -15,7 +13,9 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests some cases for java 1.4 (using DataReaderSun1_6_0). @@ -24,7 +24,8 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderSun1_4_0 { +class TestDataReaderSun1_4_0 { + private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); } @@ -32,23 +33,24 @@ private InputStream getInputStream(String fileName) throws IOException { /** * Test output for -XX:+PrintAdaptiveSizePolicy */ - @Test - public void testAdaptiveSizePolicy() throws Exception { - String fileName = "SampleSun1_4_0AdaptiveSizePolicy.txt"; - InputStream in = getInputStream(fileName); - final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_4); - GCModel model = reader.read(); - - assertEquals("number of events", 9, model.getPause().getN()); - assertEquals("number of full gcs", 3, model.getFullGCPause().getN()); - assertEquals("number of gcs", 6, model.getGCPause().getN()); - assertEquals("total pause", 0.1978746, model.getPause().getSum(), 0.000001); - assertEquals("full gc pause", 0.026889, model.getFullGCPause().getSum(), 0.000001); - assertEquals("gc pause", 0.1709856, model.getGCPause().getSum(), 0.000001); - } + @Test + void testAdaptiveSizePolicy() throws Exception { + String fileName = "SampleSun1_4_0AdaptiveSizePolicy.txt"; + try (InputStream in = getInputStream(fileName)) { + final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_4); + GCModel model = reader.read(); + + assertEquals(9, model.getPause().getN(), "number of events"); + assertEquals(3, model.getFullGCPause().getN(), "number of full gcs"); + assertEquals(6, model.getGCPause().getN(), "number of gcs"); + assertEquals(0.1978746, model.getPause().getSum(), 0.000001, "total pause"); + assertEquals(0.026889, model.getFullGCPause().getSum(), 0.000001, "full gc pause"); + assertEquals(0.1709856, model.getGCPause().getSum(), 0.000001, "gc pause"); + } + } @Test - public void testParse1() throws Exception { + void testParse1() throws Exception { // original testcase was written with timestamp "2.23492e-006d" as first timestamp // I have never seen a timestamp writte in scientific format in the logfiles, so // I assume, that was some experiment here in the unittest @@ -67,27 +69,27 @@ public void testParse1() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream("0.0: [GC 8968K->8230K(10912K), 0.0037192 secs]\r\n1.0: [GC 8968K->8230K(10912K), 0.0037192 secs]\r\n2.0: [GC 8968K->8230K(10912K), 0.0037192 secs]\r\n3.0: [Full GC 10753K->6046K(10912K), 0.3146707 secs]\r\n4.0: [Inc GC 10753K->6046K(10912K), 0.3146707 secs]\r\n5.0: [GC Desired survivor size 3342336 bytes, new threshold 1 (max 32) - age 1: 6684672 bytes, 6684672 total 52471K->22991K(75776K), 1.0754938 secs]".getBytes()); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_4); GCModel model = reader.read(); - assertEquals("model size", 6, model.size()); + assertEquals(6, model.size(), "model size"); Iterator> i = model.getStopTheWorldEvents(); AbstractGCEvent event = i.next(); - assertEquals("event 1", event, event1); + assertEquals(event, event1, "event 1"); event = i.next(); - assertEquals("event 2", event, event2); + assertEquals(event, event2, "event 2"); event = i.next(); - assertEquals("event 3", event, event3); + assertEquals(event, event3, "event 3"); event = i.next(); - assertEquals("event 4", event, event4); + assertEquals(event, event4, "event 4"); event = i.next(); - assertEquals("event 5", event, event5); + assertEquals(event, event5, "event 5"); event = i.next(); - assertEquals("event 6", event, event6); + assertEquals(event, event6, "event 6"); - assertEquals("running time", 5 + 1.0754938, model.getRunningTime(), 0.0001); - assertEquals("throughput", 71.75550076275, model.getThroughput(), 0.0000001); + assertEquals(5 + 1.0754938, model.getRunningTime(), 0.0001, "running time"); + assertEquals(71.75550076275, model.getThroughput(), 0.0000001, "throughput"); } @Test - public void testNoFullGC() throws Exception { + void testNoFullGC() throws Exception { String fileName = "SampleSun1_4_2NoFullGC.txt"; InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_4); @@ -114,26 +116,26 @@ public void testNoFullGC() throws Exception { AbstractGCEvent event6 = new GCEvent(2.831d, 1202, 856, 1984, 0.0122599d, AbstractGCEvent.Type.GC); event6.getGeneration(); - assertEquals("model size", 12, model.size()); + assertEquals(12, model.size(), "model size"); Iterator i = model.getGCEvents(); AbstractGCEvent event = i.next(); - assertEquals("event 1", event, event1); + assertEquals(event, event1, "event 1"); event = i.next(); - assertEquals("event 2", event, event2); + assertEquals(event, event2, "event 2"); event = i.next(); - assertEquals("event 3", event, event3); + assertEquals(event, event3, "event 3"); event = i.next(); - assertEquals("event 4", event, event4); + assertEquals(event, event4, "event 4"); event = i.next(); - assertEquals("event 5", event, event5); + assertEquals(event, event5, "event 5"); event = i.next(); - assertEquals("event 6", event, event6); + assertEquals(event, event6, "event 6"); - assertEquals("throughput", 98.928592417159, model.getThroughput(), 0.00000000001); + assertEquals(98.928592417159, model.getThroughput(), 0.00000000001, "throughput"); } @Test - public void testPrintGCDetails() throws Exception { + void testPrintGCDetails() throws Exception { String fileName = "SampleSun1_4_2PrintGCDetails.txt"; InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_4); @@ -167,22 +169,22 @@ public void testPrintGCDetails() throws Exception { event4.add(childEvent4); event4.getGeneration(); - assertEquals("model.size()", 4, model.size()); + assertEquals(4, model.size(), "model.size()"); Iterator> i = model.getStopTheWorldEvents(); AbstractGCEvent event = i.next(); - assertEquals("event 1", event1, event); + assertEquals(event1, event, "event 1"); event = i.next(); - assertEquals("event 2", event2, event); + assertEquals(event2, event, "event 2"); event = i.next(); - assertEquals("event 3", event3, event); + assertEquals(event3, event, "event 3"); event = i.next(); - assertEquals("event 4", event4, event); + assertEquals(event4, event, "event 4"); - assertEquals("throughput", 94.133029724, model.getThroughput(), 0.000001); + assertEquals(94.133029724, model.getThroughput(), 0.000001, "throughput"); } @Test - public void testPrintHeapAtGC() throws Exception { + void testPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_4_0PSPrintHeapAtGC.txt"); @@ -192,11 +194,9 @@ public void testPrintHeapAtGC() throws Exception { final DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_4); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("GC pause", 0.0083579, model.getGCPause().getMax(), 0.00000001); - assertEquals("Full GC pause", 0.0299536, model.getFullGCPause().getMax(), 0.00000001); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0083579, model.getGCPause().getMax(), 0.00000001, "GC pause"); + assertEquals(0.0299536, model.getFullGCPause().getMax(), 0.00000001, "Full GC pause"); + assertEquals(0, handler.getCount(), "number of errors"); } - - } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_5_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_5_0.java index 798bb3f4..dd403c53 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_5_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_5_0.java @@ -1,7 +1,5 @@ package com.tagtraum.perf.gcviewer.imp; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -10,7 +8,9 @@ import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests some cases for java 1.5 (using DataReaderSun1_6_0). @@ -19,7 +19,7 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDataReaderSun1_5_0 { +class TestDataReaderSun1_5_0 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); @@ -29,85 +29,85 @@ private InputStream getInputStream(String fileName) throws IOException { * Test output for -XX:+PrintAdaptiveSizePolicy */ @Test - public void testAdaptiveSizePolicy() throws Exception { + void testAdaptiveSizePolicy() throws Exception { String fileName = "SampleSun1_5_0AdaptiveSizePolicy.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("number of events", 6, model.getPause().getN()); - assertEquals("number of full gcs", 1, model.getFullGCPause().getN()); - assertEquals("number of gcs", 5, model.getGCPause().getN()); - assertEquals("total pause", 0.1024222, model.getPause().getSum(), 0.000001); - assertEquals("full gc pause", 0.0583435, model.getFullGCPause().getSum(), 0.000001); - assertEquals("gc pause", 0.0440787, model.getGCPause().getSum(), 0.000001); + assertEquals(6, model.getPause().getN(), "number of events"); + assertEquals(1, model.getFullGCPause().getN(), "number of full gcs"); + assertEquals(5, model.getGCPause().getN(), "number of gcs"); + assertEquals(0.1024222, model.getPause().getSum(), 0.000001, "total pause"); + assertEquals(0.0583435, model.getFullGCPause().getSum(), 0.000001, "full gc pause"); + assertEquals(0.0440787, model.getGCPause().getSum(), 0.000001, "gc pause"); } @Test - public void testCMSPrintGCDetails() throws Exception { + void testCMSPrintGCDetails() throws Exception { String fileName = "SampleSun1_5_0CMS_PrintGCDetails.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("size", 515, model.size()); - assertEquals("throughput", 88.2823289184, model.getThroughput(), 0.00000001); - assertEquals("sum of pauses", model.getPause().getSum(), model.getFullGCPause().getSum() + model.getGCPause().getSum(), 0.0000001); - assertEquals("total pause", 9.1337492, model.getPause().getSum(), 0.0000001); - assertEquals("full gc pause", 7.4672903, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(515, model.size(), "size"); + assertEquals(88.2823289184, model.getThroughput(), 0.00000001, "throughput"); + assertEquals(model.getPause().getSum(), model.getFullGCPause().getSum() + model.getGCPause().getSum(), 0.0000001, "sum of pauses"); + assertEquals(9.1337492, model.getPause().getSum(), 0.0000001, "total pause"); + assertEquals(7.4672903, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testParallelOldGC() throws Exception { + void testParallelOldGC() throws Exception { String fileName = "SampleSun1_5_0ParallelOldGC.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("size", 1, model.size()); - assertEquals("gc pause", 27.0696262, model.getFullGCPause().getMax(), 0.000001); + assertEquals(1, model.size(), "size"); + assertEquals(27.0696262, model.getFullGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testCMSIncrementalPacing() throws Exception { + void testCMSIncrementalPacing() throws Exception { String fileName = "SampleSun1_5_0CMS_IncrementalPacing.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("size", 810, model.size()); - assertEquals("throughput", 94.181240109114, model.getThroughput(), 0.00000001); - assertEquals("total gc pause", 2.3410947, model.getPause().getSum(), 0.000000001); - assertEquals("gc pause", 2.3410947, model.getGCPause().getSum(), 0.000000001); - assertEquals("full gc paus", 0.0, model.getFullGCPause().getSum(), 0.01); + assertEquals(810, model.size(), "size"); + assertEquals(94.181240109114, model.getThroughput(), 0.00000001, "throughput"); + assertEquals(2.3410947, model.getPause().getSum(), 0.000000001, "total gc pause"); + assertEquals(2.3410947, model.getGCPause().getSum(), 0.000000001, "gc pause"); + assertEquals(0.0, model.getFullGCPause().getSum(), 0.01, "full gc paus"); } @Test - public void testPromotionFailure() throws Exception { + void testPromotionFailure() throws Exception { String fileName = "SampleSun1_5_0PromotionFailure.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("size", 6, model.size()); - assertEquals("throughput", 98.0937624615, model.getThroughput(), 0.00000001); - assertEquals("gc pause", 8.413616, model.getPause().getSum(), 0.000001); + assertEquals(6, model.size(), "size"); + assertEquals(98.0937624615, model.getThroughput(), 0.00000001, "throughput"); + assertEquals(8.413616, model.getPause().getSum(), 0.000001, "gc pause"); } @Test - public void testCMSConcurrentModeFailure() throws Exception { + void testCMSConcurrentModeFailure() throws Exception { String fileName = "SampleSun1_5_0ConcurrentModeFailure.txt"; final InputStream in = getInputStream(fileName); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("size", 3417, model.size()); - assertEquals("throughput", 78.558339113, model.getThroughput(), 0.00000001); - assertEquals("gc pause", 181.8116798, model.getPause().getSum(), 0.000000001); + assertEquals(3417, model.size(), "size"); + assertEquals(78.558339113, model.getThroughput(), 0.00000001, "throughput"); + assertEquals(181.8116798, model.getPause().getSum(), 0.000000001, "gc pause"); } @Test - public void testCmsScavengeBeforeRemark() throws Exception { + void testCmsScavengeBeforeRemark() throws Exception { final ByteArrayInputStream in = new ByteArrayInputStream( ("0.871: [GC[YG occupancy: 16241 K (16320 K)]0.871: [Scavenge-Before-Remark0.871: [Full GC 0.871: [ParNew: 16241K->0K(16320K), 0.0311294 secs] 374465K->374455K(524224K), 0.0312110 secs]" + "\n, 0.0312323 secs]" + @@ -117,9 +117,9 @@ public void testCmsScavengeBeforeRemark() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_5); GCModel model = reader.read(); - assertEquals("gc count", 2, model.size()); - assertEquals("full gc pause", 0.0312110, model.getFullGCPause().getMax(), 0.000001); - assertEquals("remark pause", 0.0624207 - 0.0312110, model.getGCPause().getMax(), 0.000000001); + assertEquals(2, model.size(), "gc count"); + assertEquals(0.0312110, model.getFullGCPause().getMax(), 0.000001, "full gc pause"); + assertEquals(0.0624207 - 0.0312110, model.getGCPause().getMax(), 0.000000001, "remark pause"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0.java index abef124d..bba7b760 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,9 +20,9 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.util.DateHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestDataReaderSun1_6_0 { +class TestDataReaderSun1_6_0 { private final DateTimeFormatter dateTimeFormatter = DateHelper.DATE_TIME_FORMATTER; @@ -31,7 +31,7 @@ private InputStream getInputStream(String fileName) throws IOException { } @Test - public void testPrintGCDateStamps() throws Exception { + void testPrintGCDateStamps() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T04:23:39.427+0200: 19.845: [GC 19.845: [ParNew: 93184K->5483K(104832K), 0.0384413 secs] 93184K->5483K(1036928K), 0.0388082 secs] [Times: user=0.41 sys=0.06, real=0.04 secs]") .getBytes()); @@ -39,15 +39,13 @@ public void testPrintGCDateStamps() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertTrue("hasDateStamp", model.hasDateStamp()); - assertEquals("DateStamp", - ZonedDateTime.parse("2011-10-05T04:23:39.427+0200", dateTimeFormatter), - model.getFirstDateStamp()); - assertEquals("gc pause", 0.0388082, model.getGCPause().getMax(), 0.000001); + assertTrue(model.hasDateStamp(), "hasDateStamp"); + assertEquals(ZonedDateTime.parse("2011-10-05T04:23:39.427+0200", dateTimeFormatter), model.getFirstDateStamp(), "DateStamp"); + assertEquals(0.0388082, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testCMSPromotionFailed() throws Exception { + void testCMSPromotionFailed() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T16:05:55.964+0200: 41985.374: [GC 41985.375: [ParNew (promotion failed): 104960K->100764K(104960K), 0.3379238 secs]41985.713: [CMS: 1239589K->897516K(1398144K), 38.3189415 secs] 1336713K->897516K(1503104K), [CMS Perm : 55043K->53511K(91736K)], 38.6583674 secs] [Times: user=39.22 sys=0.06, real=38.66 secs]") .getBytes()); @@ -55,11 +53,11 @@ public void testCMSPromotionFailed() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("gc pause", 38.6583674, model.getFullGCPause().getSum(), 0.000001); + assertEquals(38.6583674, model.getFullGCPause().getSum(), 0.000001, "gc pause"); } @Test - public void testCMSPromotionFailedPrintPromotionFailure() throws Exception { + void testCMSPromotionFailedPrintPromotionFailure() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-03-26T21:46:32.546+0200: 2.204: [GC 2.204: [ParNew (0: promotion failure size = 4098) (1: promotion failure size = 4098) (2: promotion failure size = 4098) (3: promotion failure size = 4098) (promotion failed): 39277K->39255K(39296K), 0.0175749 secs]2.221: [CMS: 87276K->43438K(87424K), 0.0276222 secs] 95765K->43438K(126720K), [CMS Perm : 2612K->2612K(21248K)], 0.0453577 secs] [Times: user=0.08 sys=0.00, real=0.05 secs]") .getBytes()); @@ -67,12 +65,12 @@ public void testCMSPromotionFailedPrintPromotionFailure() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("gc type", "GC; ParNew (promotion failed); CMS; CMS Perm", model.getFullGCEvents().next().getTypeAsString()); + assertEquals("GC; ParNew (promotion failed); CMS; CMS Perm", model.getFullGCEvents().next().getTypeAsString(), "gc type"); } @Test - public void testCMSConcurrentModeFailureDate() throws Exception { + void testCMSConcurrentModeFailureDate() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T15:53:24.119+0200: 41403.025: [GC 41403.025: [ParNew (promotion failed): 104960K->101572K(104960K), 0.3275017 secs]41403.353: [CMS2011-10-05T15:53:24.629+0200: 41403.534: [CMS-concurrent-abortable-preclean: 1.992/2.650 secs] [Times: user=4.40 sys=0.06, real=2.65 secs]" + "\n (concurrent mode failure): 1295417K->906090K(1398144K), 32.4123146 secs] 1395643K->906090K(1503104K), [CMS Perm : 54986K->53517K(91576K)], 32.7410609 secs] [Times: user=33.10 sys=0.05, real=32.74 secs]") @@ -80,13 +78,13 @@ public void testCMSConcurrentModeFailureDate() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("gc pause", 32.7410609, model.getFullGCPause().getMax(), 0.000001); + assertEquals(32.7410609, model.getFullGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testCMSConcurrentModeFailure() throws Exception { + void testCMSConcurrentModeFailure() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("25866.053: [GC 25866.054: [ParNew (promotion failed): 458123K->468193K(471872K), 0.9151441 secs]25866.969: [CMS25870.038: [CMS-concurrent-mark: 3.120/4.102 secs] [Times: user=26.00 sys=0.12, real=4.10 secs]" + "\n (concurrent mode failure): 1143630K->1154547K(1572864K), 40.1744087 secs] 1590086K->1154547K(2044736K), [CMS Perm : 65802K->63368K(109784K)], 41.0904457 secs] [Times: user=60.57 sys=0.07, real=41.09 secs]") @@ -95,13 +93,13 @@ public void testCMSConcurrentModeFailure() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("gc pause", 41.0904457, model.getFullGCPause().getMax(), 0.000001); + assertEquals(41.0904457, model.getFullGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testCMSConcurrentModeFailureCmsAbortPreclean() throws Exception { + void testCMSConcurrentModeFailureCmsAbortPreclean() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("39323.400: [GC 39323.400: [ParNew (promotion failed): 471871K->457831K(471872K), 10.5045897 secs]39333.905: [CMS CMS: abort preclean due to time 39334.591: [CMS-concurrent-abortable-preclean: 4.924/15.546 secs] [Times: user=24.45 sys=9.40, real=15.55 secs]" + "\n (concurrent mode failure): 1301661K->1299268K(1572864K), 43.3433234 secs] 1757009K->1299268K(2044736K), [CMS Perm : 64534K->63216K(110680K)], 53.8487115 secs] [Times: user=54.83 sys=9.22, real=53.85 secs]") @@ -110,13 +108,13 @@ public void testCMSConcurrentModeFailureCmsAbortPreclean() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("gc pause", 53.8487115, model.getFullGCPause().getMax(), 0.000001); + assertEquals(53.8487115, model.getFullGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testCMSFullGcCmsInterrupted() throws Exception { + void testCMSFullGcCmsInterrupted() throws Exception { // TODO CMS (concurrent mode interrupted) not recognised (ignored) ByteArrayInputStream in = new ByteArrayInputStream( "78.579: [Full GC (System) 78.579: [CMS (concurrent mode interrupted): 64171K->1538K(107776K), 0.0088356 secs] 75362K->1538K(126912K), [CMS Perm : 2554K->2554K(21248K)], 0.0089351 secs] [Times: user=0.00 sys=0.00, real=0.01 secs]" @@ -124,40 +122,40 @@ public void testCMSFullGcCmsInterrupted() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("count", 1, model.getPause().getN()); + assertEquals(1, model.getPause().getN(), "count"); - assertEquals("full gc pause", 0.0089351, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(0.0089351, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); assertThat("is system gc", model.get(0).isSystem(), is(true)); } @Test - public void testCMSAbortingPrecleanTimestamp() throws Exception { + void testCMSAbortingPrecleanTimestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( " CMS: abort preclean due to time 12467.886: [CMS-concurrent-abortable-preclean: 5.300/5.338 secs] [Times: user=10.70 sys=0.13, real=5.34 secs]" .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("gc pause", 5.3, model.getConcurrentGCEvents().next().getPause(), 0.001); + assertEquals(5.3, model.getConcurrentGCEvents().next().getPause(), 0.001, "gc pause"); } @Test - public void testCMSAbortingPrecleanDatestamp() throws Exception { + void testCMSAbortingPrecleanDatestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( " CMS: abort preclean due to time 2011-10-07T08:10:25.312+0200: 13454.979: [CMS-concurrent-abortable-preclean: 3.849/5.012 secs] [Times: user=5.58 sys=0.08, real=5.01 secs]" .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("gc pause", 3.849, model.getConcurrentGCEvents().next().getPause(), 0.0001); + assertEquals(3.849, model.getConcurrentGCEvents().next().getPause(), 0.0001, "gc pause"); } @Test - public void testFullGcIncrementalTimestamp() throws Exception { + void testFullGcIncrementalTimestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("42927.215: [Full GC 42927.215: [CMS42927.255: [CMS-concurrent-sweep: 0.416/6.288 secs] [Times: user=17.38 sys=0.44, real=6.29 secs]" + "\n (concurrent mode failure): 262166K->215967K(785256K), 7.8308614 secs] 273998K->215967K(800040K), [CMS Perm : 523009K->155678K(524288K)] icms_dc=8 , 7.8320634 secs] [Times: user=4.59 sys=0.04, real=7.83 secs]") @@ -165,65 +163,65 @@ public void testFullGcIncrementalTimestamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("full gc pause", 7.8320634, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(7.8320634, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testFullGcIncrementalTimestamp2() throws Exception { + void testFullGcIncrementalTimestamp2() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("44189.823: [Full GC 44189.824: [CMS: 274825K->223922K(892264K), 8.0594203 secs] 327565K->223922K(992616K), [CMS Perm : 524287K->158591K(524288K)] icms_dc=0 , 8.0600619 secs] [Times: user=4.51 sys=0.05, real=8.06 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("full gc pause", 8.0600619, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(8.0600619, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testCmsRemarkDatestamp() throws Exception { + void testCmsRemarkDatestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T04:23:39.427+0200: 13455.879: [GC[YG occupancy: 325751 K (471872 K)]13455.879: [Rescan (parallel) , 1.0591220 secs]13456.939: [weak refs processing, 0.0794109 secs] [1 CMS-remark: 1023653K(1572864K)] 1349404K(2044736K), 1.1490033 secs] [Times: user=19.09 sys=0.26, real=1.15 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("gc pause", 1.1490033, model.getGCPause().getSum(), 0.00000001); + assertEquals(1.1490033, model.getGCPause().getSum(), 0.00000001, "gc pause"); } @Test - public void testCmsRemarkTimestamp() throws Exception { + void testCmsRemarkTimestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("13455.879: [GC[YG occupancy: 325751 K (471872 K)]13455.879: [Rescan (parallel) , 1.0591220 secs]13456.939: [weak refs processing, 0.0794109 secs] [1 CMS-remark: 1023653K(1572864K)] 1349404K(2044736K), 1.1490033 secs] [Times: user=19.09 sys=0.26, real=1.15 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("gc pause", 1.1490033, model.getGCPause().getSum(), 0.00000001); + assertEquals(1.1490033, model.getGCPause().getSum(), 0.00000001, "gc pause"); } @Test - public void testCmsRemarkSerial() throws Exception { + void testCmsRemarkSerial() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("0.778: [GC[YG occupancy: 2179 K (19136 K)]0.778: [Rescan (non-parallel) 0.778: [grey object rescan, 0.0014243 secs]0.780: [root rescan, 0.0000909 secs], 0.0015484 secs]0.780: [weak refs processing, 0.0000066 secs] [1 CMS-remark: 444198K(444416K)] 446377K(463552K), 0.0015882 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("gc pause", 0.0015882, model.getGCPause().getSum(), 0.00000001); + assertEquals(0.0015882, model.getGCPause().getSum(), 0.00000001, "gc pause"); } @Test - public void testFullGcIncrementalDatestamp() throws Exception { + void testFullGcIncrementalDatestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T04:23:39.427+0200: 42927.215: [Full GC 42927.215: [CMS2011-10-05T04:23:39.427+0200: 42927.255: [CMS-concurrent-sweep: 0.416/6.288 secs] [Times: user=17.38 sys=0.44, real=6.29 secs]" + "\n (concurrent mode failure): 262166K->215967K(785256K), 7.8308614 secs] 273998K->215967K(800040K), [CMS Perm : 523009K->155678K(524288K)] icms_dc=8 , 7.8320634 secs] [Times: user=4.59 sys=0.04, real=7.83 secs]") @@ -231,27 +229,26 @@ public void testFullGcIncrementalDatestamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("full gc pause", 7.8320634, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(7.8320634, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testFullGcIncrementalDatestamp2() throws Exception { + void testFullGcIncrementalDatestamp2() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-05T04:23:39.427+0200: 44189.823: [Full GC 44189.824: [CMS: 274825K->223922K(892264K), 8.0594203 secs] 327565K->223922K(992616K), [CMS Perm : 524287K->158591K(524288K)] icms_dc=0 , 8.0600619 secs] [Times: user=4.51 sys=0.05, real=8.06 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("full gc pause", 8.0600619, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(8.0600619, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testMixedLineTimestamp() throws Exception { - + void testMixedLineTimestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("36628.590: [GC 36628.591: [ParNew36628.625: [CMS-concurrent-abortable-preclean: 0.128/0.873 secs] [Times: user=2.52 sys=0.02, real=0.87 secs]" + "\n: 14780K->1041K(14784K), 0.0417590 secs] 304001K->295707K(721240K) icms_dc=56 , 0.0419761 secs] [Times: user=0.81 sys=0.01, real=0.04 secs]") @@ -259,56 +256,50 @@ public void testMixedLineTimestamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); - assertEquals("gc pause", 0.0419761, model.getGCPause().getSum(), 0.00000001); + assertEquals(0.0419761, model.getGCPause().getSum(), 0.00000001, "gc pause"); } @Test - public void testFullGcSystem() throws Exception { - + void testFullGcSystem() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("164.078: [Full GC (System) 164.078: [Tenured: 107024K->86010K(349568K), 0.7964528 secs] 143983K->86010K(506816K), [Perm : 85883K->85855K(86016K)], 0.7965714 secs] [Times: user=0.84 sys=0.00, real=0.80 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); + assertEquals(1, model.size(), "GC count"); - assertEquals("full gc pause", 0.7965714, model.getFullGCPause().getSum(), 0.00000001); + assertEquals(0.7965714, model.getFullGCPause().getSum(), 0.00000001, "full gc pause"); } @Test - public void testCmsConcurrentMarkStart() throws Exception { - + void testCmsConcurrentMarkStart() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-10-24T08:12:24.375+0200: 3388.929: [CMS-concurrent-mark-start]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("full gc pause", 0.0, model.getFullGCPause().getSum(), 0.01); - + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0, model.getFullGCPause().getSum(), 0.01, "full gc pause"); } @Test - public void testCmsInitiatingOccupancyFraction() throws Exception { - + void testCmsInitiatingOccupancyFraction() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("12460.657: [GC [1 CMS-initial-mark: 789976K(1572864K)] 838178K(2044736K), 0.3114519 secs] [Times: user=0.32 sys=0.00, real=0.31 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("iof", 0.5022532145182292, model.getCmsInitiatingOccupancyFraction().average(), 0.0000001); - + assertEquals(1, model.size(), "GC count"); + assertEquals(0.5022532145182292, model.getCmsInitiatingOccupancyFraction().average(), 0.0000001, "iof"); } @Test - public void testMixedLineWithEmptyLine() throws Exception { - + void testMixedLineWithEmptyLine() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-01-25T17:10:16.889+0100: 12076.859: [GC 12076.859: [ParNew2011-01-25T17:10:16.896+0100: 12076.866: [CMS-concurrent-abortable-preclean: 0.929/4.899 secs] [Times: user=2.13 sys=0.04, real=4.90 secs]" + "\n" + @@ -319,14 +310,13 @@ public void testMixedLineWithEmptyLine() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("event pause", 0.0131346, model.getGCPause().getMax(), 0.0000001); - assertEquals("promotion", 2925, model.getPromotion().getMax()); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0131346, model.getGCPause().getMax(), 0.0000001, "event pause"); + assertEquals(2925, model.getPromotion().getMax(), "promotion"); } @Test - public void testPrintTenuringDistribution() throws Exception { - + void testPrintTenuringDistribution() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-02-14T13:15:24.164+0100: 31581.748: [GC 31581.748: [ParNew" + "\nDesired survivor size 5963776 bytes, new threshold 1 (max 4)" + @@ -336,15 +326,13 @@ public void testPrintTenuringDistribution() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("event pause", 0.0533874, model.getGCPause().getMax(), 0.0000001); - assertEquals("promotion", 0, model.getPromotion().getMax()); - + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0533874, model.getGCPause().getMax(), 0.0000001, "event pause"); + assertEquals(0, model.getPromotion().getMax(), "promotion"); } @Test - public void testPrintTenuringDistributionPromotionFailed() throws Exception { - + void testPrintTenuringDistributionPromotionFailed() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-02-14T13:14:36.298+0100: 31533.871: [GC 31533.871: [ParNew (promotion failed)" + "\nDesired survivor size 524288 bytes, new threshold 1 (max 4)" + @@ -355,14 +343,12 @@ public void testPrintTenuringDistributionPromotionFailed() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("event pause", 13.5959700, model.getFullGCPause().getMax(), 0.0000001); - + assertEquals(1, model.size(), "GC count"); + assertEquals(13.5959700, model.getFullGCPause().getMax(), 0.0000001, "event pause"); } @Test - public void testPrintTenuringDistributionPromotionFailedConcurrentModeFailure() throws Exception { - + void testPrintTenuringDistributionPromotionFailedConcurrentModeFailure() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-04-18T12:01:14.683+0200: 27401.763: [GC 27401.763: [ParNew (promotion failed)" + "\nDesired survivor size 557056 bytes, new threshold 1 (max 4)" + @@ -373,14 +359,12 @@ public void testPrintTenuringDistributionPromotionFailedConcurrentModeFailure() DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("event pause", 31.6248756, model.getFullGCPause().getMax(), 0.0000001); - + assertEquals(2, model.size(), "GC count"); + assertEquals(31.6248756, model.getFullGCPause().getMax(), 0.0000001, "event pause"); } @Test - public void testLineMixesPrintTenuringDistribution() throws Exception { - + void testLineMixesPrintTenuringDistribution() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2011-03-31T06:01:25.675+0200: 5682.440: [GC 5682.441: [ParNew2011-03-31T06:01:25.682+0200: 5682.447: [CMS-concurrent-abortable-preclean: 0.035/0.348 secs]" + "\nDesired survivor size 557056 bytes, new threshold 4 (max 4)" + @@ -393,46 +377,45 @@ public void testLineMixesPrintTenuringDistribution() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("event pause", 0.0067202, model.getGCPause().getMax(), 0.0000001); - + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0067202, model.getGCPause().getMax(), 0.0000001, "event pause"); } @Test - public void testCmsMemory() throws Exception { + void testCmsMemory() throws Exception { String fileName = "SampleSun1_6_0CMS.txt"; InputStream in = getInputStream(fileName); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 41, model.size()); - assertEquals("heap min allocated", 249088, model.getHeapAllocatedSizes().getMin()); - assertEquals("heap max allocated", 249088, model.getHeapAllocatedSizes().getMax()); - assertEquals("young min allocated", 118016, model.getYoungAllocatedSizes().getMin()); - assertEquals("young max allocated", 118016, model.getYoungAllocatedSizes().getMax()); - assertEquals("tenured min allocated", 131072, model.getTenuredAllocatedSizes().getMin()); - assertEquals("tenured max allocated", 131072, model.getTenuredAllocatedSizes().getMax()); - assertEquals("perm min allocated", 21248, model.getPermAllocatedSizes().getMin()); - assertEquals("perm max allocated", 21248, model.getPermAllocatedSizes().getMax()); - - assertEquals("heap min used", 80841, model.getHeapUsedSizes().getMin()); - assertEquals("heap max used", 209896, model.getHeapUsedSizes().getMax()); - assertEquals("young min used", 15160, model.getYoungUsedSizes().getMin()); - assertEquals("young max used", 118010, model.getYoungUsedSizes().getMax()); - assertEquals("tenured min used", 0, model.getTenuredUsedSizes().getMin()); - assertEquals("tenured max used", 115034, model.getTenuredUsedSizes().getMax()); - assertEquals("perm min used", 2560, model.getPermUsedSizes().getMin()); - assertEquals("perm max used", 2561, model.getPermUsedSizes().getMax()); - - assertEquals("promotion avg", 16998.3846, model.getPromotion().average(), 0.0001); - assertEquals("promotion total", 220979, model.getPromotion().getSum()); + assertEquals(41, model.size(), "GC count"); + assertEquals(249088, model.getHeapAllocatedSizes().getMin(), "heap min allocated"); + assertEquals(249088, model.getHeapAllocatedSizes().getMax(), "heap max allocated"); + assertEquals(118016, model.getYoungAllocatedSizes().getMin(), "young min allocated"); + assertEquals(118016, model.getYoungAllocatedSizes().getMax(), "young max allocated"); + assertEquals(131072, model.getTenuredAllocatedSizes().getMin(), "tenured min allocated"); + assertEquals(131072, model.getTenuredAllocatedSizes().getMax(), "tenured max allocated"); + assertEquals(21248, model.getPermAllocatedSizes().getMin(), "perm min allocated"); + assertEquals(21248, model.getPermAllocatedSizes().getMax(), "perm max allocated"); + + assertEquals(80841, model.getHeapUsedSizes().getMin(), "heap min used"); + assertEquals(209896, model.getHeapUsedSizes().getMax(), "heap max used"); + assertEquals(15160, model.getYoungUsedSizes().getMin(), "young min used"); + assertEquals(118010, model.getYoungUsedSizes().getMax(), "young max used"); + assertEquals(0, model.getTenuredUsedSizes().getMin(), "tenured min used"); + assertEquals(115034, model.getTenuredUsedSizes().getMax(), "tenured max used"); + assertEquals(2560, model.getPermUsedSizes().getMin(), "perm min used"); + assertEquals(2561, model.getPermUsedSizes().getMax(), "perm max used"); + + assertEquals(16998.3846, model.getPromotion().average(), 0.0001, "promotion avg"); + assertEquals(220979, model.getPromotion().getSum(), "promotion total"); assertThat("count tenured heap after full gc", model.getFootprintAfterFullGC().getN(), is(2)); assertThat("max tenured heap after full gc", model.getFootprintAfterFullGC().getMax(), is(31297)); } @Test - public void testPrintCmsStatistics() throws Exception { + void testPrintCmsStatistics() throws Exception { // will not be able to extract sense from this line, but must not loop ByteArrayInputStream in = new ByteArrayInputStream( ("0.521: [GC[YG occupancy: 2234 K (14784 K)]0.522: [Rescan (parallel) (Survivor:0chunks) Finished young gen rescan work in 1th thread: 0.000 sec") @@ -440,11 +423,11 @@ public void testPrintCmsStatistics() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 0, model.size()); + assertEquals(0, model.size(), "GC count"); } @Test - public void testPrintHeapAtGC() throws Exception { + void testPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0PrintHeapAtGC.txt"); @@ -454,14 +437,13 @@ public void testPrintHeapAtGC() throws Exception { DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("GC pause", 0.0134287, model.getGCPause().getMin(), 0.000000001); - assertEquals("number of errors", 0, handler.getCount()); - + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0134287, model.getGCPause().getMin(), 0.000000001, "GC pause"); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void testAdaptiveSizePolicy() throws Exception { + void testAdaptiveSizePolicy() throws Exception { // 0.175: [GCAdaptiveSizePolicy::compute_survivor_space_size_and_thresh: survived: 2721008 promoted: 13580768 overflow: trueAdaptiveSizeStart: 0.186 collection: 1 // PSAdaptiveSizePolicy::compute_generation_free_space: costs minor_time: 0.059538 major_cost: 0.000000 mutator_cost: 0.940462 throughput_goal: 0.990000 live_space: 273821824 free_space: 33685504 old_promo_size: 16842752 old_eden_size: 16842752 desired_promo_size: 16842752 desired_eden_size: 33685504 // AdaptiveSizePolicy::survivor space sizes: collection: 1 (2752512, 2752512) -> (2752512, 2752512) @@ -473,16 +455,16 @@ public void testAdaptiveSizePolicy() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile(fileName), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 10, model.size()); - assertEquals("GC pause", 0.0224480, model.getGCPause().getMax(), 0.00000001); - assertEquals("Full GC pause", 0.0204436, model.getFullGCPause().getMax(), 0.00000001); + assertEquals(10, model.size(), "GC count"); + assertEquals(0.0224480, model.getGCPause().getMax(), 0.00000001, "GC pause"); + assertEquals(0.0204436, model.getFullGCPause().getMax(), 0.00000001, "Full GC pause"); assertThat("count tenured size after full gc", model.getFootprintAfterFullGC().getN(), is(4)); assertThat("max tenured size after full gc", model.getFootprintAfterFullGC().getMax(), is(64781)); } @Test - public void testAdaptiveSizePolicyFullSystemGc() throws Exception { + void testAdaptiveSizePolicyFullSystemGc() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-03-21T20:49:09.624+0100: 9.993: [Full GC (System)AdaptiveSizeStart: 10.000 collection: 61" + "\nAdaptiveSizeStop: collection: 61" + @@ -492,13 +474,13 @@ public void testAdaptiveSizePolicyFullSystemGc() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("Full GC pause", 0.0070749, model.getFullGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0070749, model.getFullGCPause().getMax(), 0.00000001, "Full GC pause"); assertThat("is system gc", model.get(0).isSystem(), is(true)); } @Test - public void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { + void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { // issue #36 // -XX:+PrintAdaptiveSizePolicy // -XX:-UseAdaptiveSizePolicy @@ -510,12 +492,12 @@ public void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0132830, model.getGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0132830, model.getGCPause().getMax(), 0.00000001, "GC pause"); } @Test - public void testCMSScavengeBeforeRemarkTimeStamp() throws Exception { + void testCMSScavengeBeforeRemarkTimeStamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2.036: [GC[YG occupancy: 235954 K (235968 K)]2.036: [GC 2.036: [ParNew: 235954K->30K(235968K), 0.0004961 secs] 317153K->81260K(395712K), 0.0005481 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]" + "\n2.037: [Rescan (parallel) , 0.0002425 secs]2.037: [weak refs processing, 0.0000041 secs]2.037: [class unloading, 0.0000938 secs]2.037: [scrub symbol & string tables, 0.0003138 secs] [1 CMS-remark: 81230K(159744K)] 81260K(395712K), 0.0013653 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]") @@ -523,15 +505,15 @@ public void testCMSScavengeBeforeRemarkTimeStamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("1st event", "GC; ParNew", model.get(0).getTypeAsString()); - assertEquals("2nd event", "GC; CMS-remark", model.get(1).getTypeAsString()); - assertEquals("1st event pause", 0.0005481, ((GCEvent)model.get(0)).getPause(), 0.00000001); - assertEquals("2nd event pause", 0.0013653-0.0005481, ((GCEvent)model.get(1)).getPause(), 0.00000001); + assertEquals(2, model.size(), "GC count"); + assertEquals("GC; ParNew", model.get(0).getTypeAsString(), "1st event"); + assertEquals("GC; CMS-remark", model.get(1).getTypeAsString(), "2nd event"); + assertEquals(0.0005481, model.get(0).getPause(), 0.00000001, "1st event pause"); + assertEquals(0.0013653 - 0.0005481, model.get(1).getPause(), 0.00000001, "2nd event pause"); } @Test - public void testCMSScavengeBeforeRemarkDateStamp() throws Exception { + void testCMSScavengeBeforeRemarkDateStamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-03-07T22:19:49.110+0100: 2.479: [GC[YG occupancy: 227872 K (235968 K)]2012-03-07T22:19:49.110+0100: 2.479: [GC 2.479: [ParNew: 227872K->30K(235968K), 0.0005432 secs] 296104K->68322K(395712K), 0.0005809 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]" + "\n2.480: [Rescan (parallel) , 0.0001934 secs]2.480: [weak refs processing, 0.0000061 secs]2.480: [class unloading, 0.0001131 secs]2.480: [scrub symbol & string tables, 0.0003175 secs] [1 CMS-remark: 68292K(159744K)] 68322K(395712K), 0.0013506 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]") @@ -539,15 +521,15 @@ public void testCMSScavengeBeforeRemarkDateStamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("1st event", "GC; ParNew", model.get(0).getTypeAsString()); - assertEquals("2nd event", "GC; CMS-remark", model.get(1).getTypeAsString()); - assertEquals("1st event pause", 0.0005809, ((GCEvent)model.get(0)).getPause(), 0.00000001); - assertEquals("2nd event pause", 0.0013506-0.0005809, ((GCEvent)model.get(1)).getPause(), 0.00000001); + assertEquals(2, model.size(), "GC count"); + assertEquals("GC; ParNew", model.get(0).getTypeAsString(), "1st event"); + assertEquals("GC; CMS-remark", model.get(1).getTypeAsString(), "2nd event"); + assertEquals(0.0005809, model.get(0).getPause(), 0.00000001, "1st event pause"); + assertEquals(0.0013506 - 0.0005809, model.get(1).getPause(), 0.00000001, "2nd event pause"); } @Test - public void testCMSScavengeBeforeRemarkWithPrintTenuringDistribution() throws Exception { + void testCMSScavengeBeforeRemarkWithPrintTenuringDistribution() throws Exception { ByteArrayInputStream input = new ByteArrayInputStream( ("2012-03-07T22:19:48.736+0100: 2.104: [GC[YG occupancy: 235952 K (235968 K)]2012-03-07T22:19:48.736+0100: 2.104: [GC 2.104: [ParNew" + "\nDesired survivor size 13402112 bytes, new threshold 4 (max 4)" + @@ -558,15 +540,15 @@ public void testCMSScavengeBeforeRemarkWithPrintTenuringDistribution() throws Ex DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), input, GcLogType.SUN1_6); GCModel gcModel = reader.read(); - assertEquals("GC count", 2, gcModel.size()); - assertEquals("1st event", "GC; ParNew", gcModel.get(0).getTypeAsString()); - assertEquals("1st event pause", 0.0006030, ((GCEvent)gcModel.get(0)).getPause(), 0.00000001); - assertEquals("2nd event", "GC; CMS-remark", gcModel.get(1).getTypeAsString()); - assertEquals("2nd event pause", 0.0013199 - 0.0006030, ((GCEvent)gcModel.get(1)).getPause(), 0.00000001); + assertEquals(2, gcModel.size(), "GC count"); + assertEquals("GC; ParNew", gcModel.get(0).getTypeAsString(), "1st event"); + assertEquals(0.0006030, gcModel.get(0).getPause(), 0.00000001, "1st event pause"); + assertEquals("GC; CMS-remark", gcModel.get(1).getTypeAsString(), "2nd event"); + assertEquals(0.0013199 - 0.0006030, gcModel.get(1).getPause(), 0.00000001, "2nd event pause"); } @Test - public void testPSWithoutPrintTimeStamp() throws Exception { + void testPSWithoutPrintTimeStamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-04-03T20:35:40.033+0200: [GC [PSYoungGen: 16420K->2657K(19136K)] 16420K->15887K(62848K), 0.0143603 secs] [Times: user=0.02 sys=0.02, real=0.01 secs]" + "\n2012-04-03T20:35:40.056+0200: [GC [PSYoungGen: 19084K->2657K(35584K)] 32314K->32279K(79296K), 0.0236295 secs] [Times: user=0.01 sys=0.00, real=0.02 secs]" + @@ -575,28 +557,28 @@ public void testPSWithoutPrintTimeStamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 3, model.size()); - assertEquals("heap", 102976, model.getHeapAllocatedSizes().getMax()); - assertEquals("pause", 0.0236295, model.getGCPause().getMax(), 0.00000001); - assertEquals("2nd pause, timeStamp", 0.056 - 0.033, ((GCEvent)model.get(1)).getTimestamp(), 0.00001); - assertEquals("3nd pause, timeStamp", 0.079 - 0.033, ((GCEvent)model.get(2)).getTimestamp(), 0.00001); + assertEquals(3, model.size(), "GC count"); + assertEquals(102976, model.getHeapAllocatedSizes().getMax(), "heap"); + assertEquals(0.0236295, model.getGCPause().getMax(), 0.00000001, "pause"); + assertEquals(0.056 - 0.033, model.get(1).getTimestamp(), 0.00001, "2nd pause, timeStamp"); + assertEquals(0.079 - 0.033, model.get(2).getTimestamp(), 0.00001, "3nd pause, timeStamp"); } @Test - public void testCMSWithoutPrintTimeStamp() throws Exception { + void testCMSWithoutPrintTimeStamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-04-03T20:36:35.035+0200: [GC [ParNew: 16993K->2105K(19136K), 0.0270541 secs] 16993K->16424K(83008K), 0.0272020 secs] [Times: user=0.02 sys=0.05, real=0.03 secs]") .getBytes()); DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("heap", 83008, model.getHeapAllocatedSizes().getMax()); - assertEquals("pause", 0.0272020, model.getGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(83008, model.getHeapAllocatedSizes().getMax(), "heap"); + assertEquals(0.0272020, model.getGCPause().getMax(), 0.00000001, "pause"); } @Test - public void testCMSWithoutPrintTimeStampConcurrentModeFailure() throws Exception { + void testCMSWithoutPrintTimeStampConcurrentModeFailure() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-04-03T20:36:35.284+0200: [GC [ParNew: 19081K->19081K(19136K), 0.0000205 secs][CMS2012-04-03T20:36:35.285+0200: [CMS-concurrent-abortable-preclean: 0.005/0.150 secs] [Times: user=0.14 sys=0.14, real=0.15 secs]" + "\n (concurrent mode failure): 98182K->3832K(98624K), 0.0195864 secs] 117264K->3832K(117760K), [CMS Perm : 2614K->2613K(21248K)], 0.0199322 secs] [Times: user=0.02 sys=0.00, real=0.02 secs]") @@ -604,16 +586,16 @@ public void testCMSWithoutPrintTimeStampConcurrentModeFailure() throws Exception DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("heap", 117760, model.getHeapAllocatedSizes().getMax()); - assertEquals("pause", 0.0199322, model.getFullGCPause().getMax(), 0.00000001); + assertEquals(2, model.size(), "GC count"); + assertEquals(117760, model.getHeapAllocatedSizes().getMax(), "heap"); + assertEquals(0.0199322, model.getFullGCPause().getMax(), 0.00000001, "pause"); } /** * Tests -XX:+PrintTenuringDistribution with -XX:+UseParallelGC */ @Test - public void testPSPrintTenuringDistribution() throws Exception { + void testPSPrintTenuringDistribution() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-04-10T20:58:43.009+0200: 0.690: [GC" + "\nDesired survivor size 89456640 bytes, new threshold 7 (max 15)" @@ -622,32 +604,32 @@ public void testPSPrintTenuringDistribution() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("heap", 2009792, model.getHeapAllocatedSizes().getMax()); - assertEquals("pause", 0.0240717, model.getGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(2009792, model.getHeapAllocatedSizes().getMax(), "heap"); + assertEquals(0.0240717, model.getGCPause().getMax(), 0.00000001, "pause"); } @Test - public void testCMSAdaptiveSizePolicy() throws Exception { + void testCMSAdaptiveSizePolicy() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0CMSAdaptiveSizePolicy.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_6); - - GCModel model = reader.read(); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_6); - assertEquals("event count", 24, model.size()); - assertEquals("young gc count", 11, model.getGCPause().getN()); - assertEquals("full gc count", 1, model.getFullGCPause().getN()); - assertEquals("number of errors", 0, handler.getCount()); + GCModel model = reader.read(); + assertEquals(24, model.size(), "event count"); + assertEquals(11, model.getGCPause().getN(), "young gc count"); + assertEquals(1, model.getFullGCPause().getN(), "full gc count"); + assertEquals(0, handler.getCount(), "number of errors"); + } } @Test - public void testCMSAdaptiveSizePolicyPrintHeapAtGC() throws Exception { + void testCMSAdaptiveSizePolicyPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -666,13 +648,13 @@ public void testCMSAdaptiveSizePolicyPrintHeapAtGC() throws Exception { DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0269605, model.getGCPause().getMin(), 0.000000001); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0269605, model.getGCPause().getMin(), 0.000000001, "GC pause"); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void testPrintCmsStatisticsConcurrentMark() throws Exception { + void testPrintCmsStatisticsConcurrentMark() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:04:57.850+0200: 1.327: [CMS-concurrent-mark: 0.011/0.011 secs] (CMS-concurrent-mark yielded 0 times)" + "\n [Times: user=0.03 sys=0.00, real=0.01 secs]") @@ -681,12 +663,12 @@ public void testPrintCmsStatisticsConcurrentMark() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.011, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.011, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001, "GC pause"); } @Test - public void testPrintCmsStatisticsConcurrentPreclean() throws Exception { + void testPrintCmsStatisticsConcurrentPreclean() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:04:57.850+0200: 1.329: [CMS-concurrent-preclean: 0.002/0.002 secs] (CMS-concurrent-preclean yielded 0 times)" + "\n [Times: user=0.00 sys=0.00, real=0.00 secs]") @@ -695,12 +677,12 @@ public void testPrintCmsStatisticsConcurrentPreclean() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("concurrent time", 0.002, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.002, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001, "concurrent time"); } @Test - public void testPrintCmsStatisticsConcurrentModeFailure() throws Exception { + void testPrintCmsStatisticsConcurrentModeFailure() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:04:58.147+0200: 1.621: [GC 1.621: [ParNew: 78631K->78631K(78656K), 0.0000164 secs]1.621: [CMS [9 iterations, 5 waits, 5367 cards)] 2012-10-20T18:04:58.147+0200: 1.621: [CMS-concurrent-abortable-preclean: 0.020/0.292 secs] (CMS-concurrent-abortable-preclean yielded 0 times)" + "\n [Times: user=0.30 sys=0.23, real=0.30 secs]" @@ -710,13 +692,13 @@ public void testPrintCmsStatisticsConcurrentModeFailure() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("failure pause", 0.0395686, model.getFullGCPause().getMax(), 0.0000001); - assertEquals("concurrent time", 0.02, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0395686, model.getFullGCPause().getMax(), 0.0000001, "failure pause"); + assertEquals(0.02, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001, "concurrent time"); } @Test - public void testPrintCmsStatisticsRemark() throws Exception { + void testPrintCmsStatisticsRemark() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:04:59.443+0200: 2.918: [GC[YG occupancy: 8752 K (78656 K)]2.918: [Rescan (parallel) (Survivor:1chunks) Finished young gen rescan work in 2th thread: 0.000 sec" + "\nFinished young gen rescan work in 1th thread: 0.000 sec" @@ -741,15 +723,15 @@ public void testPrintCmsStatisticsRemark() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0014952, model.getGCPause().getMin(), 0.000000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0014952, model.getGCPause().getMin(), 0.000000001, "GC pause"); } /** * Tests the combination of -XX:PrintCmsStatistics=2 and -XX:+CMSScavengeBeforeRemark */ @Test - public void testPrintCmsStatisticsScavengeBeforeRemark() throws Exception { + void testPrintCmsStatisticsScavengeBeforeRemark() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-26T18:31:09.699+0200: 15.473: [GC[YG occupancy: 8752 K (78656 K)]2012-10-26T18:31:09.699+0200: 15.473: [GC 15.473: [ParNew: 8752K->64K(78656K), 0.0052352 secs] 388874K->388870K(515584K), 0.0052868 secs] [Times: user=0.00 sys=0.00, real=0.00 secs]" + "\n15.478: [Rescan (parallel) (Survivor:0chunks) Finished young gen rescan work in 1th thread: 0.000 sec" @@ -775,17 +757,17 @@ public void testPrintCmsStatisticsScavengeBeforeRemark() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); + assertEquals(2, model.size(), "GC count"); GCEvent parNew = (GCEvent) model.get(0); GCEvent remarkEvent = (GCEvent) model.get(1); - assertEquals("GC pause ParNew", 0.0052868, parNew.getPause(), 0.000000001); - assertEquals("GC pause Remark", 0.0067111 - 0.0052868, remarkEvent.getPause(), 0.000000001); + assertEquals(0.0052868, parNew.getPause(), 0.000000001, "GC pause ParNew"); + assertEquals(0.0067111 - 0.0052868, remarkEvent.getPause(), 0.000000001, "GC pause Remark"); } @Test - public void testPrintCmsStatisticsParNewBeforeRemark() throws Exception { + void testPrintCmsStatisticsParNewBeforeRemark() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:04:59.412+0200: 2.897: [GC 2.897: [ParNew [15 iterations, 8 waits, 4115 cards)] 2012-10-20T18:04:59.443+0200: 2.917: [CMS-concurrent-abortable-preclean: 0.031/0.593 secs] (CMS-concurrent-abortable-preclean yielded 0 times)" + "\n [Times: user=0.66 sys=0.00, real=0.59 secs]" @@ -795,13 +777,13 @@ public void testPrintCmsStatisticsParNewBeforeRemark() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("GC pause", 0.0204543, model.getGCPause().getMax(), 0.0000001); - assertEquals("concurrent time", 0.031, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0204543, model.getGCPause().getMax(), 0.0000001, "GC pause"); + assertEquals(0.031, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001, "concurrent time"); } @Test - public void testPrintCmsStatisticsParNewBeforeRemark2() throws Exception { + void testPrintCmsStatisticsParNewBeforeRemark2() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2012-10-20T18:05:00.083+0200: 3.556: [GC 3.556: [ParNew: 78624K->8688K(78656K), 0.0302267 secs] 451513K->438445K(515584K), 0.0302972 secs] [Times: user=0.13 sys=0.00, real=0.03 secs]" + "\n [11 iterations, 6 waits, 7020 cards)] 2012-10-20T18:05:00.114+0200: 3.587: [CMS-concurrent-abortable-preclean: 0.024/0.391 secs] (CMS-concurrent-abortable-preclean yielded 0 times)" @@ -811,13 +793,13 @@ public void testPrintCmsStatisticsParNewBeforeRemark2() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("GC pause", 0.0302972, model.getGCPause().getMax(), 0.0000001); - assertEquals("concurrent time", 0.024, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.0302972, model.getGCPause().getMax(), 0.0000001, "GC pause"); + assertEquals(0.024, model.getConcurrentEventPauses().values().iterator().next().getMin(), 0.000000001, "concurrent time"); } @Test - public void testCommaInTimestamp() throws Exception { + void testCommaInTimestamp() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "12,655: [GC [PSYoungGen: 262656K->28075K(306432K)] 262656K->28075K(1006848K), 0,3541657 secs] [Times: user=0,22 sys=0,48, real=0,35 secs]" .getBytes()); @@ -825,9 +807,9 @@ public void testCommaInTimestamp() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.3541657, model.getGCPause().getMax(), 0.0000001); - assertEquals("GC timestamp", 12.655, model.get(0).getTimestamp(), 0.000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.3541657, model.getGCPause().getMax(), 0.0000001, "GC pause"); + assertEquals(12.655, model.get(0).getTimestamp(), 0.000001, "GC timestamp"); } /** @@ -836,7 +818,7 @@ public void testCommaInTimestamp() throws Exception { * information. */ @Test - public void testDerivedGenerationValues() throws Exception { + void testDerivedGenerationValues() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "10.675: [GC [PSYoungGen: 21051K->4947K(22656K)] 23342K->7238K(67712K), 0.0191817 secs] [Times: user=0.09 sys=0.01, real=0.02 secs]" .getBytes()); @@ -844,15 +826,15 @@ public void testDerivedGenerationValues() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("young used", 21051, model.getYoungUsedSizes().getMin()); - assertEquals("young allocated", 22656, model.getYoungAllocatedSizes().getMax()); - assertEquals("tenured used", 23342-21051, model.getTenuredUsedSizes().getMin()); - assertEquals("tenured allocated", 67712-22656, model.getTenuredAllocatedSizes().getMax()); + assertEquals(1, model.size(), "GC count"); + assertEquals(21051, model.getYoungUsedSizes().getMin(), "young used"); + assertEquals(22656, model.getYoungAllocatedSizes().getMax(), "young allocated"); + assertEquals(23342 - 21051, model.getTenuredUsedSizes().getMin(), "tenured used"); + assertEquals(67712 - 22656, model.getTenuredAllocatedSizes().getMax(), "tenured allocated"); } @Test - public void testPrintTenuringDistributionOpenJdk6() throws Exception { + void testPrintTenuringDistributionOpenJdk6() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "3.141: [GCDesired survivor size 134217728 bytes, new threshold 7 (max 2) [PSYoungGen: 188744K->13345K(917504K)] 188744K->13345K(4063232K), 0.0285820 secs] [Times: user=0.06 sys=0.01, real=0.03 secs]" .getBytes()); @@ -860,13 +842,13 @@ public void testPrintTenuringDistributionOpenJdk6() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("main type", "GC", model.get(0).getExtendedType().getName()); - assertEquals("detail type", "PSYoungGen", model.get(0).details().next().getExtendedType().getName()); + assertEquals(1, model.size(), "count"); + assertEquals("GC", model.get(0).getExtendedType().getName(), "main type"); + assertEquals("PSYoungGen", model.get(0).details().next().getExtendedType().getName(), "detail type"); } @Test - public void testPromotionFailedWithReference() throws Exception { + void testPromotionFailedWithReference() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-09-02T18:22:23.195+0000: 1837.498: [GC1837.600: [SoftReference, 0 refs, 0.0000060 secs]1837.600: [WeakReference, 374 refs, 0.0000550 secs]1837.600: [FinalReference, 347 refs, 0.0002090 secs]1837.600: [PhantomReference, 0 refs, 0.0000020 secs]1837.600: [JNI Weak Reference, 0.0000050 secs]-- [PSYoungGen: 1330796K->1330796K(1403264K)] 4172533K->4251241K(4323712K), 0.6580190 secs] [Times: user=2.35 sys=0.02, real=0.66 secs]" .getBytes()); @@ -874,13 +856,13 @@ public void testPromotionFailedWithReference() throws Exception { DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("main type", "GC--", model.get(0).getExtendedType().getName()); - assertEquals("detail type", "PSYoungGen", model.get(0).details().next().getExtendedType().getName()); + assertEquals(1, model.size(), "count"); + assertEquals("GC--", model.get(0).getExtendedType().getName(), "main type"); + assertEquals("PSYoungGen", model.get(0).details().next().getExtendedType().getName(), "detail type"); } @Test - public void testCmsGcLocker() throws Exception { + void testCmsGcLocker() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -904,7 +886,7 @@ public void testCmsGcLocker() throws Exception { } @Test - public void cmsConcurrentModeFailureWithComma() throws Exception { + void cmsConcurrentModeFailureWithComma() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -925,7 +907,7 @@ public void cmsConcurrentModeFailureWithComma() throws Exception { } @Test - public void logfileRollingProducesNoWarnings() throws Exception { + void logfileRollingProducesNoWarnings() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0RollingLogfile.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0G1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0G1.java index 9e22da49..2007fc16 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0G1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_6_0G1.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,9 +20,9 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.util.DateHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestDataReaderSun1_6_0G1 { +class TestDataReaderSun1_6_0G1 { private final DateTimeFormatter dateTimeFormatter = DateHelper.DATE_TIME_FORMATTER; @@ -34,7 +34,7 @@ private InputStream getInputStream(String fileName) throws IOException { * Test G1 parser with a gc verbose file (not -XX:+PrintGCDetails) */ @Test - public void testG1GcVerbose() throws Exception { + void testG1GcVerbose() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0G1_gc_verbose.txt"); @@ -44,15 +44,15 @@ public void testG1GcVerbose() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("gc pause sum", 62.616796, model.getPause().getSum(), 0.000000001); - assertEquals("throughput", 47.7730602904, model.getThroughput(), 0.000000001); - assertEquals("longest pause", 0.1581177, model.getPause().getMax(), 0.000001); - assertEquals("total runtime", 119.8936724, model.getRunningTime(), 0.000001); + assertEquals(62.616796, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(47.7730602904, model.getThroughput(), 0.000000001, "throughput"); + assertEquals(0.1581177, model.getPause().getMax(), 0.000001, "longest pause"); + assertEquals(119.8936724, model.getRunningTime(), 0.000001, "total runtime"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); - assertEquals("max interval", 0.211, model.getPauseInterval().getMax(), 0.000001); - assertEquals("avg interval", 0.048291297, model.getPauseInterval().average(), 0.0000001); + assertEquals(0.211, model.getPauseInterval().getMax(), 0.000001, "max interval"); + assertEquals(0.048291297, model.getPauseInterval().average(), 0.0000001, "avg interval"); assertThat("count footprint after full gc", model.getFootprintAfterFullGC().getN(), is(5)); assertThat("max footprint after full gc", model.getFootprintAfterFullGC().getMax(), is(33*1024)); @@ -65,7 +65,7 @@ public void testG1GcVerbose() throws Exception { } @Test - public void testSimpleEventDateStamp() throws Exception { + void testSimpleEventDateStamp() throws Exception { InputStream in = new ByteArrayInputStream( ("2012-02-29T13:41:00.721+0100: 0.163: [GC pause (young) 4096K->3936K(16M), 0.0032067 secs]") .getBytes()); @@ -73,15 +73,14 @@ public void testSimpleEventDateStamp() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("gc pause", 0.0032067, model.getGCPause().getMax(), 0.000001); - assertEquals("datestamp", - ZonedDateTime.parse("2012-02-29T13:41:00.721+0100", dateTimeFormatter), - model.getGCEvents().next().getDatestamp()); + assertEquals(1, model.size(), "count"); + assertEquals(0.0032067, model.getGCPause().getMax(), 0.000001, "gc pause"); + assertEquals(ZonedDateTime.parse("2012-02-29T13:41:00.721+0100", dateTimeFormatter), + model.getGCEvents().next().getDatestamp(), "datestamp"); } @Test - public void testG1FullGcSystemGc() throws Exception { + void testG1FullGcSystemGc() throws Exception { InputStream in = new ByteArrayInputStream( ("9.978: [Full GC (System.gc()) 597M->1142K(7168K), 0.1604955 secs]") .getBytes()); @@ -89,13 +88,13 @@ public void testG1FullGcSystemGc() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0.1604955, model.getFullGCPause().getMax(), 0.000001); + assertEquals(1, model.size(), "count"); + assertEquals(0.1604955, model.getFullGCPause().getMax(), 0.000001, "full gc pause"); assertThat("is system gc", model.get(0).isSystem(), is(true)); } @Test - public void testG1MixedLine1() throws Exception { + void testG1MixedLine1() throws Exception { InputStream in = new ByteArrayInputStream( ("0.388: [GC pause (young) (initial-mark) 10080K->10080K(16M)0.390: [GC concurrent-mark-start]" + "\n, 0.0013065 secs]") @@ -104,12 +103,12 @@ public void testG1MixedLine1() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 2, model.size()); - assertEquals("gc pause", 0.0013065, model.getGCPause().getMax(), 0.000001); + assertEquals(2, model.size(), "count"); + assertEquals(0.0013065, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testG1MixedLine2() throws Exception { + void testG1MixedLine2() throws Exception { InputStream in = new ByteArrayInputStream( ("61.059: [GC pause (young) (initial-mark) 135M->127M(256M)61.078: , 0.0187031 secs]" + "\n[GC concurrent-mark-start]") @@ -118,26 +117,26 @@ public void testG1MixedLine2() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("gc pause", 0.0187031, model.getGCPause().getMax(), 0.000001); + assertEquals(2, model.size(), "count"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(0.0187031, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void testDetailedYoungCollection() throws Exception { + void testDetailedYoungCollection() throws Exception { // parse one detailed event String fileName = "SampleSun1_6_0G1_Detailed-young.txt"; InputStream in = getInputStream(fileName); DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00594747, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 4096 - 3936, model.getFreedMemoryByGC().getMax()); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00594747, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(4096 - 3936, model.getFreedMemoryByGC().getMax(), "gc memory"); } @Test - public void testDetailedCollectionMixed1() throws Exception { + void testDetailedCollectionMixed1() throws Exception { // parse one detailed event with a mixed line (concurrent event starts in the middle of an stw collection) // 8.775: [GC pause (young)8.775: [GC concurrent-mark-end, 0.0101638 sec] // , 0.00831998 secs] @@ -146,157 +145,163 @@ public void testDetailedCollectionMixed1() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("nummber of events", 2, model.size()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00831998, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 169*1024 - 162*1024, model.getFreedMemoryByGC().getMax()); + assertEquals(2, model.size(), "number of events"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00831998, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(169*1024 - 162*1024, model.getFreedMemoryByGC().getMax(), "gc memory"); } @Test - public void testDetailedCollectionMixed2() throws Exception { + void testDetailedCollectionMixed2() throws Exception { // parse one detailed event with a mixed line (part of concurrent event starts in the middle of an stw collection) // 0.230: [GC pause (young)0.235: (initial-mark), 0.00430038 secs] // [GC concurrent-mark-start] String fileName = "SampleSun1_6_0G1_Detailed-mixedLine2.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00430038, model.getPause().getSum(), 0.000000001); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(2, model.size(), "number of events"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00430038, model.getPause().getSum(), 0.000000001, "gc pause sum"); + } } @Test - public void testDetailedCollectionMixed3() throws Exception { + void testDetailedCollectionMixed3() throws Exception { // parse one detailed event with a mixed line (part of concurrent event starts in the middle of an stw collection) // 0.331: [GC pause (young)0.333 (initial-mark), 0.00178520 secs] // : [GC concurrent-mark-start] String fileName = "SampleSun1_6_0G1_Detailed-mixedLine3.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00178520, model.getPause().getSum(), 0.000000001); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(2, model.size(), "number of events"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00178520, model.getPause().getSum(), 0.000000001, "gc pause sum"); + } } @Test - public void testFullGcMixed() throws Exception { + void testFullGcMixed() throws Exception { InputStream in = new ByteArrayInputStream(("107.222: [Full GC107.248: [GC concurrent-mark-end, 0.0437048 sec]" + "\n 254M->59M(199M), 0.0687356 secs]" + "\n [Times: user=0.06 sys=0.02, real=0.07 secs]").getBytes()); DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("number of events", 2, model.size()); - assertEquals("number of full gc pauses", 1, model.getFullGCPause().getN()); - assertEquals("full gc pause sum", 0.0687356, model.getFullGCPause().getSum(), 0.0000001); + assertEquals(2, model.size(), "number of events"); + assertEquals(1, model.getFullGCPause().getN(), "number of full gc pauses"); + assertEquals(0.0687356, model.getFullGCPause().getSum(), 0.0000001, "full gc pause sum"); } @Test - public void testYoungToSpaceOverflow() throws Exception { + void testYoungToSpaceOverflow() throws Exception { // special type of GC: 0.838: "[GC pause (young) (to-space overflow)..." String fileName = "SampleSun1_6_0G1_young_toSpaceOverflow.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 1, model.size()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.04674512, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 228*1024 - 102*1024, model.getFreedMemoryByGC().getMax()); - assertEquals("max memory", 256*1024, model.getFootprint()); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(1, model.size(), "number of events"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.04674512, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(228 * 1024 - 102 * 1024, model.getFreedMemoryByGC().getMax(), "gc memory"); + assertEquals(256 * 1024, model.getFootprint(), "max memory"); + } } @Test - public void testPartialToSpaceOverflow() throws Exception { + void testPartialToSpaceOverflow() throws Exception { // special type of GC: 0.838: "[GC pause (partial) (to-space overflow)..." String fileName = "SampleSun1_6_0G1_partial_toSpaceOverflow.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 1, model.size()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00271976, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 255*1024 - 181*1024, model.getFreedMemoryByGC().getMax()); - assertEquals("max memory", 256*1024, model.getFootprint()); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(1, model.size(), "number of events"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00271976, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(255 * 1024 - 181 * 1024, model.getFreedMemoryByGC().getMax(), "gc memory"); + assertEquals(256 * 1024, model.getFootprint(), "max memory"); + } } @Test - public void testYoungToSpaceOverflowInitialMark() throws Exception { + void testYoungToSpaceOverflowInitialMark() throws Exception { // special type of GC: 0.838: "[GC pause (young) (to-space overflow) (initial-mark)..." String fileName = "SampleSun1_6_0G1_young_initialMarkToSpaceOverflow.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00316185, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 254*1024 - 170*1024, model.getFreedMemoryByGC().getMax()); - assertEquals("max memory", 256*1024, model.getFootprint()); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(2, model.size(), "number of events"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00316185, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(254 * 1024 - 170 * 1024, model.getFreedMemoryByGC().getMax(), "gc memory"); + assertEquals(256 * 1024, model.getFootprint(), "max memory"); + } } @Test - public void testPartialToSpaceOverflowInitialMark() throws Exception { + void testPartialToSpaceOverflowInitialMark() throws Exception { // special type of GC: 0.838: "[GC pause (partial) (to-space overflow) (initial-mark)..." String fileName = "SampleSun1_6_0G1_partial_initialMarkToSpaceOverflow.txt"; - InputStream in = getInputStream(fileName); - DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); - - assertEquals("nummber of events", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.00588343, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 255*1024 - 197*1024, model.getFreedMemoryByGC().getMax()); - assertEquals("max memory", 256*1024, model.getFootprint()); + try (InputStream in = getInputStream(fileName)) { + DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile(fileName), in, GcLogType.SUN1_6G1); + GCModel model = reader.read(); + + assertEquals(2, model.size(), "number of events"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.00588343, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(255 * 1024 - 197 * 1024, model.getFreedMemoryByGC().getMax(), "gc memory"); + assertEquals(256 * 1024, model.getFootprint(), "max memory"); + } } @Test - public void testGcPattern() throws Exception { + void testGcPattern() throws Exception { InputStream in = new ByteArrayInputStream(("0.452: [GC concurrent-count-start]").getBytes()); DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0, model.getFullGCPause().getN()); - assertEquals("gc pause", 0, model.getGCPause().getN()); + assertEquals(1, model.size(), "count"); + assertEquals(0, model.getFullGCPause().getN(), "full gc pause"); + assertEquals(0, model.getGCPause().getN(), "gc pause"); } @Test - public void testGcPausePattern() throws Exception { + void testGcPausePattern() throws Exception { InputStream in = new ByteArrayInputStream(("0.360: [GC concurrent-count-end, 0.0242674]").getBytes()); DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0, model.getFullGCPause().getN()); + assertEquals(1, model.size(), "count"); + assertEquals(0, model.getFullGCPause().getN(), "full gc pause"); } @Test - public void testGcMemoryPausePattern() throws Exception { + void testGcMemoryPausePattern() throws Exception { InputStream in = new ByteArrayInputStream(("0.360: [GC cleanup 19M->19M(36M), 0.0007889 secs]").getBytes()); DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0, model.getFullGCPause().getN()); - assertEquals("gc pause", 0.0007889, model.getGCPause().getMax(), 0.0000001); - assertEquals("memory", 0, model.getFreedMemoryByGC().getMax()); + assertEquals(1, model.size(), "count"); + assertEquals(0, model.getFullGCPause().getN(), "full gc pause"); + assertEquals(0.0007889, model.getGCPause().getMax(), 0.0000001, "gc pause"); + assertEquals(0, model.getFreedMemoryByGC().getMax(), "memory"); } @Test - public void testInitialMark() throws Exception { + void testInitialMark() throws Exception { InputStream in = new ByteArrayInputStream( ("0.319: [GC pause (young) (initial-mark), 0.00188271 secs]" + "\n [Times: user=0.00 sys=0.00, real=0.00 secs] ").getBytes()); @@ -304,36 +309,37 @@ public void testInitialMark() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0, model.getFullGCPause().getN()); - assertEquals("gc pause", 0.00188271, model.getGCPause().getMax(), 0.0000001); - assertEquals("memory", 0, model.getFreedMemoryByGC().getMax()); + assertEquals(1, model.size(), "count"); + assertEquals(0, model.getFullGCPause().getN(), "full gc pause"); + assertEquals(0.00188271, model.getGCPause().getMax(), 0.0000001, "gc pause"); + assertEquals(0, model.getFreedMemoryByGC().getMax(), "memory"); } @Test - public void initialMarkHeapAtGcMixed() throws Exception { + void initialMarkHeapAtGcMixed() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0G1InitialMarkMixed.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - - GCModel model = reader.read(); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - assertThat("GC count", model.size(), is(2)); - assertThat("GC pause", model.getGCPause().getSum(), closeTo(0.03643900, 0.000000001)); - assertThat("heap size", model.getHeapAllocatedSizes().getMax(), is(10240 * 1024)); - assertThat("number of errors", handler.getCount(), is(0)); - - assertThat("concurrent type name", - model.getConcurrentGCEvents().next().getTypeAsString(), - equalTo("GC concurrent-mark-start")); + GCModel model = reader.read(); + + assertThat("GC count", model.size(), is(2)); + assertThat("GC pause", model.getGCPause().getSum(), closeTo(0.03643900, 0.000000001)); + assertThat("heap size", model.getHeapAllocatedSizes().getMax(), is(10240 * 1024)); + assertThat("number of errors", handler.getCount(), is(0)); + + assertThat("concurrent type name", + model.getConcurrentGCEvents().next().getTypeAsString(), + equalTo("GC concurrent-mark-start")); + } } @Test - public void testRemark() throws Exception { + void testRemark() throws Exception { InputStream in = new ByteArrayInputStream( ("0.334: [GC remark, 0.0009506 secs]" + "\n [Times: user=0.00 sys=0.00, real=0.00 secs] ").getBytes()); @@ -341,76 +347,80 @@ public void testRemark() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("full gc pause", 0, model.getFullGCPause().getN()); - assertEquals("gc pause", 0.0009506, model.getGCPause().getMax(), 0.0000001); - assertEquals("memory", 0, model.getFreedMemoryByGC().getMax()); + assertEquals(1, model.size(), "count"); + assertEquals(0, model.getFullGCPause().getN(), "full gc pause"); + assertEquals(0.0009506, model.getGCPause().getMax(), 0.0000001, "gc pause"); + assertEquals(0, model.getFreedMemoryByGC().getMax(), "memory"); } @Test - public void testPrintHeapAtGC() throws Exception { + void testPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0G1_PrintHeapAtGC.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); + GCModel model = reader.read(); - assertEquals("GC count", 2, model.size()); - assertEquals("GC pause", 0.00582962 + 0.00228253, model.getGCPause().getSum(), 0.000000001); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(2, model.size(), "GC count"); + assertEquals(0.00582962 + 0.00228253, model.getGCPause().getSum(), 0.000000001, "GC pause"); + assertEquals(0, handler.getCount(), "number of errors"); + } } @Test - public void testMarkStackFull() throws Exception { + void testMarkStackFull() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0G1_MarkStackFull.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - GCModel model = reader.read(); + GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.08032150, model.getGCPause().getSum(), 0.000000001); - assertEquals("heap size", 3985 * 1024, model.getHeapAllocatedSizes().getMax()); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.08032150, model.getGCPause().getSum(), 0.000000001, "GC pause"); + assertEquals(3985 * 1024, model.getHeapAllocatedSizes().getMax(), "heap size"); + assertEquals(0, handler.getCount(), "number of errors"); + } } @Test - public void printHeapAtGcPrintTenuringDistributionFullGc() throws Exception { + void printHeapAtGcPrintTenuringDistributionFullGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_6_0G1FullGcTenuringDistribution.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - - GCModel model = reader.read(); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); + + GCModel model = reader.read(); - assertThat("GC count", model.size(), is(1)); - assertThat("GC pause", model.getFullGCPause().getSum(), closeTo(37.0629320, 0.000000001)); - assertThat("heap size", model.getHeapAllocatedSizes().getMax(), is(10240 * 1024)); - assertThat("number of errors", handler.getCount(), is(0)); + assertThat("GC count", model.size(), is(1)); + assertThat("GC pause", model.getFullGCPause().getSum(), closeTo(37.0629320, 0.000000001)); + assertThat("heap size", model.getHeapAllocatedSizes().getMax(), is(10240 * 1024)); + assertThat("number of errors", handler.getCount(), is(0)); + } } @Test - public void logfileRollingProducesNoWarnings() throws Exception { + void logfileRollingProducesNoWarnings() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0RollingLogfile.txt"); gcResource.getLogger().addHandler(handler); - InputStream in = getInputStream(gcResource.getResourceName()); - DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); - reader.read(); + try (InputStream in = getInputStream(gcResource.getResourceName())) { + DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_6G1); + reader.read(); - assertThat("number of errors", handler.getCount(), is(0)); + assertThat("number of errors", handler.getCount(), is(0)); + } } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0.java index df8f96aa..017d79e7 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -21,7 +21,7 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.util.DateHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for logs generated specifically by jdk 1.7.0. @@ -29,7 +29,7 @@ * @author Joerg Wuethrich *

created on: 13.09.2013

*/ -public class TestDataReaderSun1_7_0 { +class TestDataReaderSun1_7_0 { private final DateTimeFormatter dateTimeFormatter = DateHelper.DATE_TIME_FORMATTER; @@ -42,21 +42,21 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void testPrintGCCause() throws Exception { + void testPrintGCCause() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "111.080: [GC (Allocation Failure)111.080: [ParNew: 140365K->605K(157248K), 0.0034070 secs] 190158K->50399K(506816K), 0.0035370 secs] [Times: user=0.02 sys=0.00, real=0.00 secs]" .getBytes()); final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0035370, model.getGCPause().getMax(), 0.0000001); - assertEquals("GC timestamp", 111.080, model.get(0).getTimestamp(), 0.000001); - assertEquals("GC (Allocation Failure); ParNew", model.get(0).getTypeAsString()); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0035370, model.getGCPause().getMax(), 0.0000001, "GC pause"); + assertEquals(111.080, model.get(0).getTimestamp(), 0.000001, "GC timestamp"); + assertEquals(model.get(0).getTypeAsString(), "GC (Allocation Failure); ParNew"); } @Test - public void testAdaptiveSizePolicyPrintGCCause() throws Exception { + void testAdaptiveSizePolicyPrintGCCause() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( ("2013-05-25T17:02:46.238+0200: 0.194: [GC (Allocation Failure) AdaptiveSizePolicy::compute_survivor_space_size_and_thresh: survived: 2720928 promoted: 13416848 overflow: trueAdaptiveSizeStart: 0.205 collection: 1" + "\nPSAdaptiveSizePolicy::compute_eden_space_size: costs minor_time: 0.054157 major_cost: 0.000000 mutator_cost: 0.945843 throughput_goal: 0.990000 live_space: 271156384 free_space: 33685504 old_eden_size: 16842752 desired_eden_size: 33685504" @@ -67,14 +67,14 @@ public void testAdaptiveSizePolicyPrintGCCause() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0109373, model.getGCPause().getMax(), 0.0000001); - assertEquals("GC timestamp", 0.194, model.get(0).getTimestamp(), 0.000001); - assertEquals("GC (Allocation Failure); PSYoungGen", model.get(0).getTypeAsString()); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0109373, model.getGCPause().getMax(), 0.0000001, "GC pause"); + assertEquals(0.194, model.get(0).getTimestamp(), 0.000001, "GC timestamp"); + assertEquals(model.get(0).getTypeAsString(), "GC (Allocation Failure); PSYoungGen"); } @Test - public void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { + void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { // -XX:+PrintAdaptiveSizePolicy // -XX:-UseAdaptiveSizePolicy // -XX:+PrintGCCause @@ -86,12 +86,12 @@ public void testPrintWithoutUseAdaptiveSizePolicy() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0115757, model.getGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0115757, model.getGCPause().getMax(), 0.00000001, "GC pause"); } @Test - public void testPrintWithoutUseAdaptiveSizePolicyFullGc() throws Exception { + void testPrintWithoutUseAdaptiveSizePolicyFullGc() throws Exception { // -XX:+PrintAdaptiveSizePolicy // -XX:-UseAdaptiveSizePolicy // -XX:+PrintGCCause @@ -103,12 +103,12 @@ public void testPrintWithoutUseAdaptiveSizePolicyFullGc() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("GC pause", 0.0087315, model.getFullGCPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals(0.0087315, model.getFullGCPause().getMax(), 0.00000001, "GC pause"); } @Test - public void cmsRemarkWithTimestamps() throws Exception { + void cmsRemarkWithTimestamps() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-09-11T23:03:44.987+0200: 1518.733: [GC[YG occupancy: 3247177 K (4718592 K)]2013-09-11T23:03:45.231+0200: 1518.977: [Rescan (parallel) , 0.0941360 secs]2013-09-11T23:03:45.325+0200: 1519.071: [weak refs processing, 0.0006010 secs]2013-09-11T23:03:45.325+0200: 1519.071: [scrub string table, 0.0028480 secs] [1 CMS-remark: 4246484K(8388608K)] 4557930K(13107200K), 0.3410220 secs] [Times: user=2.48 sys=0.01, real=0.34 secs]" .getBytes()); @@ -116,13 +116,13 @@ public void cmsRemarkWithTimestamps() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("type name", "GC; CMS-remark", model.get(0).getTypeAsString()); - assertEquals("GC pause", 0.3410220, model.getPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals("GC; CMS-remark", model.get(0).getTypeAsString(), "type name"); + assertEquals(0.3410220, model.getPause().getMax(), 0.00000001, "GC pause"); } @Test - public void cmsWithoutTimestamps() throws Exception { + void cmsWithoutTimestamps() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-12-19T17:52:49.323+0100: [GC2013-12-19T17:52:49.323+0100: [ParNew: 4872K->480K(4928K), 0.0031563 secs] 102791K->102785K(140892K), 0.0032042 secs] [Times: user=0.00 sys=0.00, real=0.01 secs]" .getBytes()); @@ -130,38 +130,39 @@ public void cmsWithoutTimestamps() throws Exception { final DataReader reader = new DataReaderSun1_6_0(new GcResourceFile("byteArray"), in, GcLogType.SUN1_6); GCModel model = reader.read(); - assertEquals("GC count", 1, model.size()); - assertEquals("type name", "GC; ParNew", model.get(0).getTypeAsString()); - assertEquals("GC pause", 0.0032042, model.getPause().getMax(), 0.00000001); + assertEquals(1, model.size(), "GC count"); + assertEquals("GC; ParNew", model.get(0).getTypeAsString(), "type name"); + assertEquals(0.0032042, model.getPause().getMax(), 0.00000001, "GC pause"); } /** * Test output of -XX:+PrintAdaptiveSizePolicy -XX:+UseAdaptiveSizePolicy -XX:+PrintReferenceGC */ @Test - public void parallelPrintUseAdaptiveSizeReference() throws Exception { + void parallelPrintUseAdaptiveSizeReference() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0ParallelAdaptiveSizeReference.txt"); gcResource.getLogger().addHandler(handler); - final InputStream in = getInputStream(gcResource.getResourceName()); - final DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_7); + try (final InputStream in = getInputStream(gcResource.getResourceName())) { + final DataReader reader = new DataReaderSun1_6_0(gcResource, in, GcLogType.SUN1_7); - GCModel model = reader.read(); + GCModel model = reader.read(); - assertThat("count", model.size(), is(1)); - GCEvent event = (GCEvent) model.get(0); - assertThat("type name", event.getTypeAsString(), equalTo("GC (Allocation Failure); PSYoungGen")); - assertThat("gc pause", event.getPause(), closeTo(0.0134562, 0.00000001)); - assertThat("error count", handler.getCount(), is(0)); + assertThat("count", model.size(), is(1)); + GCEvent event = (GCEvent) model.get(0); + assertThat("type name", event.getTypeAsString(), equalTo("GC (Allocation Failure); PSYoungGen")); + assertThat("gc pause", event.getPause(), closeTo(0.0134562, 0.00000001)); + assertThat("error count", handler.getCount(), is(0)); + } } /** * Test output of -XX:+PrintAdaptiveSizePolicy -XX:-UseAdaptiveSizePolicy -XX:+PrintReferenceGC */ @Test - public void parallelAdaptiveReference() throws Exception { + void parallelAdaptiveReference() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-10-13T09:54:00.664+0200: 0.180: [GC (Allocation Failure)2013-10-13T09:54:00.680+0200: 0.191: [SoftReference, 0 refs, 0.0001032 secs]2013-10-13T09:54:00.680+0200: 0.192: [WeakReference, 5 refs, 0.0000311 secs]2013-10-13T09:54:00.680+0200: 0.192: [FinalReference, 10 refs, 0.0000389 secs]2013-10-13T09:54:00.680+0200: 0.192: [PhantomReference, 0 refs, 0.0000283 secs]2013-10-13T09:54:00.680+0200: 0.192: [JNI Weak Reference, 0.0000340 secs]AdaptiveSizePolicy::compute_survivor_space_size_and_thresh: survived: 2589792 promoted: 13949568 overflow: true [PSYoungGen: 16865K->2529K(19456K)] 16865K->16151K(62976K), 0.0117505 secs] [Times: user=0.00 sys=0.06, real=0.02 secs]" .getBytes()); @@ -178,7 +179,7 @@ public void parallelAdaptiveReference() throws Exception { * Test output of -XX:-PrintAdaptiveSizePolicy -XX:-UseAdaptiveSizePolicy -XX:+PrintReferenceGC */ @Test - public void parallelReference() throws Exception { + void parallelReference() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-10-13T10:32:07.669+0200: 0.182: [GC (Allocation Failure)2013-10-13T10:32:07.685+0200: 0.195: [SoftReference, 0 refs, 0.0001086 secs]2013-10-13T10:32:07.685+0200: 0.195: [WeakReference, 5 refs, 0.0000311 secs]2013-10-13T10:32:07.685+0200: 0.195: [FinalReference, 10 refs, 0.0000377 secs]2013-10-13T10:32:07.685+0200: 0.195: [PhantomReference, 0 refs, 0.0000283 secs]2013-10-13T10:32:07.685+0200: 0.195: [JNI Weak Reference, 0.0000328 secs] [PSYoungGen: 16865K->2529K(19456K)] 16865K->16151K(62976K), 0.0137921 secs] [Times: user=0.03 sys=0.02, real=0.02 secs]" .getBytes()); @@ -192,7 +193,7 @@ public void parallelReference() throws Exception { } @Test - public void serialPrintReferenceGC() throws Exception { + void serialPrintReferenceGC() throws Exception { ByteArrayInputStream in = new ByteArrayInputStream( "2013-10-13T09:52:30.164+0200: 0.189: [GC (Allocation Failure)2013-10-13T09:52:30.164+0200: 0.189: [DefNew2013-10-13T09:52:30.180+0200: 0.205: [SoftReference, 0 refs, 0.0001004 secs]2013-10-13T09:52:30.180+0200: 0.205: [WeakReference, 0 refs, 0.0000287 secs]2013-10-13T09:52:30.180+0200: 0.205: [FinalReference, 0 refs, 0.0000283 secs]2013-10-13T09:52:30.180+0200: 0.205: [PhantomReference, 0 refs, 0.0000279 secs]2013-10-13T09:52:30.180+0200: 0.205: [JNI Weak Reference, 0.0000332 secs]: 17472K->2176K(19648K), 0.0159181 secs] 17472K->16957K(63360K), 0.0161033 secs] [Times: user=0.02 sys=0.00, real=0.02 secs]" .getBytes()); @@ -208,7 +209,7 @@ public void serialPrintReferenceGC() throws Exception { } @Test - public void printCMSInitiationStatistics() throws Exception { + void printCMSInitiationStatistics() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -244,7 +245,7 @@ public void printCMSInitiationStatistics() throws Exception { } @Test - public void printTenuringDistributionCMSInitiationStatistics() throws Exception { + void printTenuringDistributionCMSInitiationStatistics() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0CMSTenuringDistributionInitiationStatistics.txt"); @@ -261,7 +262,7 @@ public void printTenuringDistributionCMSInitiationStatistics() throws Exception } @Test - public void parallelPrintGCApplicationStoppedTime() throws Exception { + void parallelPrintGCApplicationStoppedTime() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -289,12 +290,12 @@ public void parallelPrintGCApplicationStoppedTime() throws Exception { assertThat("number of parse problems", handler.getCount(), is(0)); } - @Test /** * The only difference, between this test and {@link TestDataReaderSun1_8_0#parallelPrintTenuringGcCause()} * is the missing space character in the end of the line before the TenuringDistribution information. */ - public void parallelPrintTenuringGcCause() throws Exception { + @Test + void parallelPrintTenuringGcCause() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0Parallel_Tenuring_PrintGCCause.txt"); @@ -307,11 +308,11 @@ public void parallelPrintTenuringGcCause() throws Exception { assertThat("gc name", model.get(0).getTypeAsString(), equalTo("GC (Allocation Failure); PSYoungGen")); assertThat("pause", model.get(0).getPause(), closeTo(0.0278950, 0.000000001)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void cmsPrintGCApplicationStopped() throws Exception { + void cmsPrintGCApplicationStopped() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_51_CMS_PrintApplStoppedTime.txt"); @@ -335,7 +336,7 @@ public void cmsPrintGCApplicationStopped() throws Exception { } @Test - public void cmsPrintGCApplicationStoppedTimeTenuringDist() throws Exception { + void cmsPrintGCApplicationStoppedTimeTenuringDist() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_51_CMS_PrintApplStoppedTime_TenuringDist.txt"); @@ -367,7 +368,7 @@ public void cmsPrintGCApplicationStoppedTimeTenuringDist() throws Exception { * Test here, that they are still added to the {@link GCModel}. */ @Test - public void cmsPrintGCApplicationStoppedTimeWithoutTimestampsTenuringDist() throws Exception { + void cmsPrintGCApplicationStoppedTimeWithoutTimestampsTenuringDist() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -398,7 +399,7 @@ public void cmsPrintGCApplicationStoppedTimeWithoutTimestampsTenuringDist() thro } @Test - public void cmsPrintFlsStatistics1() throws Exception { + void cmsPrintFlsStatistics1() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0CmsPrintFlsStats1.txt"); @@ -413,11 +414,10 @@ public void cmsPrintFlsStatistics1() throws Exception { assertThat("event 3 is full", model.get(2).isFull(), is(true)); assertThat("event 3 pause", model.get(2).getPause(), closeTo(0.0339164, 0.00000001)); assertThat("number of parse problems", handler.getCount(), is(0)); - } @Test - public void cmsPrintFlsStatistics2() throws Exception { + void cmsPrintFlsStatistics2() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0CmsPrintFlsStats2.txt"); @@ -435,11 +435,10 @@ public void cmsPrintFlsStatistics2() throws Exception { assertThat("event 5 is full", model.get(4).isFull(), is(true)); assertThat("event 5 pause", model.get(4).getPause(), closeTo(0.0264843, 0.00000001)); assertThat("number of parse problems", handler.getCount(), is(0)); - } @Test - public void cmsPrintFlsStatistics3() throws Exception { + void cmsPrintFlsStatistics3() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0CmsPrintFlsStats3.txt"); @@ -452,11 +451,10 @@ public void cmsPrintFlsStatistics3() throws Exception { assertThat("event 1 pause", model.get(1).getPause(), closeTo(0.0252550, 0.00000001)); assertThat("event 1 name", model.get(1).getTypeAsString(), equalTo("GC; ParNew")); assertThat("number of parse problems", handler.getCount(), is(0)); - } @Test - public void cmsPrintPromotionFailureTenuringDistribution() throws Exception { + void cmsPrintPromotionFailureTenuringDistribution() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0CMS_PrintTenuringDistributionPromotionFailure.txt"); @@ -471,7 +469,7 @@ public void cmsPrintPromotionFailureTenuringDistribution() throws Exception { } @Test - public void psAdaptiveSizePolicyTenuringDistributionApplicationStopped() throws Exception { + void psAdaptiveSizePolicyTenuringDistributionApplicationStopped() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0PS_Adaptive_Tenuring_AppStopped.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0G1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0G1.java index 3bbb34be..f29fa0be 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0G1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_7_0G1.java @@ -1,11 +1,11 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -21,9 +21,9 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestDataReaderSun1_7_0G1 { +class TestDataReaderSun1_7_0G1 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); @@ -38,7 +38,7 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void youngPause_u1() throws Exception { + void youngPause_u1() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0-01_G1_young.txt"); @@ -47,16 +47,16 @@ public void youngPause_u1() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause", 0.00631825, model.getPause().getMax(), 0.000000001); - assertEquals("heap", 64*1024, model.getHeapAllocatedSizes().getMax()); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0.00631825, model.getPause().getMax(), 0.000000001, "gc pause"); + assertEquals(64*1024, model.getHeapAllocatedSizes().getMax(), "heap"); + assertEquals(0, handler.getCount(), "number of errors"); } /** * Parse memory format of java 1.7.0_u2. */ @Test - public void youngPause_u2() throws Exception { + void youngPause_u2() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0-02_G1_young.txt"); @@ -65,29 +65,29 @@ public void youngPause_u2() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause", 0.14482200, model.getPause().getMax(), 0.000000001); + assertEquals(0.14482200, model.getPause().getMax(), 0.000000001, "gc pause"); GCEvent heap = (GCEvent) model.getEvents().next(); - assertEquals("heap before", 1105*1024, heap.getPreUsed()); - assertEquals("heap after", 380*1024, heap.getPostUsed()); - assertEquals("heap", 2*1024*1024, heap.getTotal()); + assertEquals(1105*1024, heap.getPreUsed(), "heap before"); + assertEquals(380*1024, heap.getPostUsed(), "heap after"); + assertEquals(2*1024*1024, heap.getTotal(), "heap"); GCEvent young = model.getGCEvents().next().getYoung(); - assertNotNull("young", young); - assertEquals("young before", 1024*1024, young.getPreUsed()); - assertEquals("young after", 128*1024, young.getPostUsed()); - assertEquals("young total", (896+128)*1024, young.getTotal()); + assertNotNull(young, "young"); + assertEquals(1024*1024, young.getPreUsed(), "young before"); + assertEquals(128*1024, young.getPostUsed(), "young after"); + assertEquals((896+128)*1024, young.getTotal(), "young total"); GCEvent tenured = model.getGCEvents().next().getTenured(); - assertNotNull("tenured", tenured); - assertEquals("tenured before", (1105-1024)*1024, tenured.getPreUsed()); - assertEquals("tenured after", (380-128)*1024, tenured.getPostUsed()); - assertEquals("tenured total", 1024*1024, tenured.getTotal()); + assertNotNull(tenured, "tenured"); + assertEquals((1105-1024)*1024, tenured.getPreUsed(), "tenured before"); + assertEquals((380-128)*1024, tenured.getPostUsed(), "tenured after"); + assertEquals(1024*1024, tenured.getTotal(), "tenured total"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void youngPauseDateStamp_u2() throws Exception { + void youngPauseDateStamp_u2() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_02_G1_young_datestamp.txt"); @@ -96,20 +96,20 @@ public void youngPauseDateStamp_u2() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause", 0.14482200, model.getPause().getMax(), 0.000000001); + assertEquals(0.14482200, model.getPause().getMax(), 0.000000001, "gc pause"); GCEvent heap = (GCEvent) model.getEvents().next(); - assertEquals("heap", 1105*1024, heap.getPreUsed()); - assertEquals("heap", 380*1024, heap.getPostUsed()); - assertEquals("heap", 2048*1024, heap.getTotal()); + assertEquals(1105*1024, heap.getPreUsed(), "heap"); + assertEquals(380*1024, heap.getPostUsed(), "heap"); + assertEquals(2048*1024, heap.getTotal(), "heap"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } /** * Test parsing GC logs that have PrintAdaptiveSizePolicy turned on */ @Test - public void printAdaptiveSizePolicy() throws Exception { + void printAdaptiveSizePolicy() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_12PrintAdaptiveSizePolicy.txt"); @@ -118,14 +118,14 @@ public void printAdaptiveSizePolicy() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause", 0.158757, model.getPause().getMax(), 0.000000001); + assertEquals(0.158757, model.getPause().getMax(), 0.000000001, "gc pause"); GCEvent heap = (GCEvent) model.getEvents().next(); - assertEquals("heap", 65*1024*1024, heap.getPreUsed()); + assertEquals(65*1024*1024, heap.getPreUsed(), "heap"); // test parsing of decimal values - assertEquals("heap", 64.3*1024*1024, heap.getPostUsed(), 1e2); - assertEquals("heap", 92.0*1024*1024, heap.getTotal(), 1e2); + assertEquals(64.3*1024*1024, heap.getPostUsed(), 1e2, "heap"); + assertEquals(92.0*1024*1024, heap.getTotal(), 1e2, "heap"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @@ -133,7 +133,7 @@ public void printAdaptiveSizePolicy() throws Exception { * Test parsing GC logs that have PrintGCCause turned on */ @Test - public void printGCCause() throws Exception { + void printGCCause() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_40PrintGCCause.txt"); @@ -142,21 +142,21 @@ public void printGCCause() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause", 0.077938, model.getPause().getMax(), 0.000000001); + assertEquals(0.077938, model.getPause().getMax(), 0.000000001, "gc pause"); GCEvent heap = (GCEvent) model.getEvents().next(); - assertEquals("heap", 32*1024, heap.getPreUsed()); + assertEquals(32*1024, heap.getPreUsed(), "heap"); // test parsing of decimal values - assertEquals("heap", 7136, (double)heap.getPostUsed(), 1e2); - assertEquals("heap", 88.0*1024*1024, (double)heap.getTotal(), 1e2); + assertEquals(7136, heap.getPostUsed(), 1e2, "heap"); + assertEquals(88.0*1024*1024, heap.getTotal(), 1e2, "heap"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } /** * Test parsing GC logs that have PrintGCCause turned on */ @Test - public void printGCCause2() throws Exception { + void printGCCause2() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_40PrintGCCause2.txt"); @@ -165,28 +165,28 @@ public void printGCCause2() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); + assertEquals(1, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("type name", "GC pause (G1 Evacuation Pause) (young) (to-space exhausted)", event.getTypeAsString()); - assertEquals("gc pause", 0.0398848, model.getPause().getMax(), 0.000000001); + assertEquals("GC pause (G1 Evacuation Pause) (young) (to-space exhausted)", event.getTypeAsString(), "type name"); + assertEquals(0.0398848, model.getPause().getMax(), 0.000000001, "gc pause"); } @Test - public void testDetailedCollectionDatestampMixed1() throws Exception { + void testDetailedCollectionDatestampMixed1() throws Exception { // parse one detailed event with a mixed line (concurrent event starts in the middle of an stw collection) // 2012-02-24T03:49:09.100-0800: 312.402: [GC pause (young)2012-02-24T03:49:09.378-0800: 312.680: [GC concurrent-mark-start] // (initial-mark), 0.28645100 secs] final DataReader reader = getDataReader("SampleSun1_7_0G1_DateStamp_Detailed-mixedLine1.txt"); GCModel model = reader.read(); - assertEquals("nummber of events", 2, model.size()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.28645100, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 17786*1024 - 17147*1024, model.getFreedMemoryByGC().getMax()); + assertEquals(2, model.size(), "number of events"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.28645100, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(17786*1024 - 17147*1024, model.getFreedMemoryByGC().getMax(), "gc memory"); } @Test - public void testDetailedCollectionDatestampMixed2() throws Exception { + void testDetailedCollectionDatestampMixed2() throws Exception { // parse one detailed event with a mixed line (concurrent event starts in the middle of an stw collection) // 2012-02-24T03:50:08.274-0800: 371.576: [GC pause (young)2012-02-24T03:50:08.554-0800: (initial-mark), 0.28031200 secs] // 371.856: [Parallel Time: 268.0 ms] @@ -200,31 +200,31 @@ public void testDetailedCollectionDatestampMixed2() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("number of events", 3, model.size()); - assertEquals("number of warnings", 0, handler.getCount()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 2, model.getPause().getN()); - assertEquals("gc pause max", 0.28031200, model.getPause().getMax(), 0.000000001); - assertEquals("gc memory", 20701*1024 - 20017*1024, model.getFreedMemoryByGC().getMax()); + assertEquals(3, model.size(), "number of events"); + assertEquals(0, handler.getCount(), "number of warnings"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(2, model.getPause().getN(), "number of pauses"); + assertEquals(0.28031200, model.getPause().getMax(), 0.000000001, "gc pause max"); + assertEquals(20701*1024 - 20017*1024, model.getFreedMemoryByGC().getMax(), "gc memory"); } @Test - public void testDetailedCollectionDatestampMixed3() throws Exception { + void testDetailedCollectionDatestampMixed3() throws Exception { // parse one detailed event with a mixed line // -> concurrent event occurs somewhere in the detail lines below the stw event DataReader reader = getDataReader("SampleSun1_7_0G1_DateStamp_Detailed-mixedLine3.txt"); GCModel model = reader.read(); - assertEquals("nummber of events", 2, model.size()); - assertEquals("concurrent event type", Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString()); - assertEquals("number of pauses", 1, model.getPause().getN()); - assertEquals("gc pause sum", 0.08894900, model.getPause().getSum(), 0.000000001); - assertEquals("gc memory", 29672*1024 - 28733*1024, model.getFreedMemoryByGC().getMax()); + assertEquals(2, model.size(), "number of events"); + assertEquals(Type.G1_CONCURRENT_MARK_START.toString(), model.getConcurrentGCEvents().next().getTypeAsString(), "concurrent event type"); + assertEquals(1, model.getPause().getN(), "number of pauses"); + assertEquals(0.08894900, model.getPause().getSum(), 0.000000001, "gc pause sum"); + assertEquals(29672*1024 - 28733*1024, model.getFreedMemoryByGC().getMax(), "gc memory"); } @Test - public void applicationStoppedMixedLine() throws Exception { + void applicationStoppedMixedLine() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -247,7 +247,7 @@ public void applicationStoppedMixedLine() throws Exception { } @Test - public void applicationTimeMixed() throws Exception { + void applicationTimeMixed() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -262,7 +262,7 @@ public void applicationTimeMixed() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(gcResource, in, GcLogType.SUN1_7G1); GCModel model = reader.read(); - assertEquals("count", 2, model.size()); + assertEquals(2, model.size(), "count"); assertThat("gc type (0)", "GC concurrent-root-region-scan-end", equalTo(model.get(0).getTypeAsString())); assertThat("gc timestamp (0)", model.get(0).getTimestamp(), closeTo(3.1, 0.01)); @@ -274,7 +274,7 @@ public void applicationTimeMixed() throws Exception { } @Test - public void eventNoMemory() throws Exception { + void eventNoMemory() throws Exception { // there are (rarely) events, where the memory information could not be parsed, // because the line with the memory information was mixed with another event // looks like this: [251.448: 213M->174M(256M)[GC concurrent-mark-start] @@ -290,11 +290,11 @@ public void eventNoMemory() throws Exception { model.add(event); DoubleData initiatingOccupancyFraction = model.getCmsInitiatingOccupancyFraction(); - assertEquals("fraction", 0, initiatingOccupancyFraction.getSum(), 0.1); + assertEquals(0, initiatingOccupancyFraction.getSum(), 0.1, "fraction"); } @Test - public void gcRemark() throws Exception { + void gcRemark() throws Exception { final InputStream in = new ByteArrayInputStream( ("0.197: [GC remark 0.197: [GC ref-proc, 0.0000070 secs], 0.0005297 secs]" + "\n [Times: user=0.00 sys=0.00, real=0.00 secs]") @@ -303,12 +303,12 @@ public void gcRemark() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_7G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("gc pause", 0.0005297, model.getGCPause().getMax(), 0.000001); + assertEquals(1, model.size(), "count"); + assertEquals(0.0005297, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void gcRemarkWithDateTimeStamp() throws Exception { + void gcRemarkWithDateTimeStamp() throws Exception { final InputStream in = new ByteArrayInputStream( ("2013-09-08T22:11:22.639+0000: 52131.385: [GC remark 2013-09-08T22:11:22.640+0000: 52131.386: [GC ref-proc, 0.0120750 secs], 0.0347170 secs]\n" + " [Times: user=0.43 sys=0.00, real=0.03 secs] \n") @@ -317,12 +317,12 @@ public void gcRemarkWithDateTimeStamp() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("byteArray"), in, GcLogType.SUN1_7G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("gc pause", 0.0347170, model.getGCPause().getMax(), 0.000001); + assertEquals(1, model.size(), "count"); + assertEquals(0.0347170, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void printTenuringDistribution() throws Exception { + void printTenuringDistribution() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1TenuringDistribution.txt"); @@ -331,14 +331,14 @@ public void printTenuringDistribution() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("number of events", 11, model.size()); - assertEquals("number of concurrent events", 4, model.getConcurrentEventPauses().size()); + assertEquals(11, model.size(), "number of events"); + assertEquals(4, model.getConcurrentEventPauses().size(), "number of concurrent events"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void printApplicationTimePrintTenuringDistribution() throws Exception { + void printApplicationTimePrintTenuringDistribution() throws Exception { // test parsing when the following options are set: // -XX:+PrintTenuringDistribution (output ignored) // -XX:+PrintGCApplicationStoppedTime (output ignored) @@ -351,25 +351,25 @@ public void printApplicationTimePrintTenuringDistribution() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("number of events", 9, model.size()); - assertEquals("number of concurrent events", 2, model.getConcurrentEventPauses().size()); + assertEquals(9, model.size(), "number of events"); + assertEquals(2, model.getConcurrentEventPauses().size(), "number of concurrent events"); GCEvent youngEvent = (GCEvent) model.get(0); - assertEquals("gc pause (young)", 0.00784501, youngEvent.getPause(), 0.000000001); - assertEquals("heap (young)", 20 * 1024, youngEvent.getTotal()); + assertEquals(0.00784501, youngEvent.getPause(), 0.000000001, "gc pause (young)"); + assertEquals(20 * 1024, youngEvent.getTotal(), "heap (young)"); GCEvent partialEvent = (GCEvent) model.get(7); - assertEquals("gc pause (partial)", 0.02648319, partialEvent.getPause(), 0.000000001); - assertEquals("heap (partial)", 128 * 1024, partialEvent.getTotal()); + assertEquals(0.02648319, partialEvent.getPause(), 0.000000001, "gc pause (partial)"); + assertEquals(128 * 1024, partialEvent.getTotal(), "heap (partial)"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } /** * Usually "cleanup" events have memory information; if it doesn't the parser should just continue */ @Test - public void simpleLogCleanUpNoMemory() throws Exception { + void simpleLogCleanUpNoMemory() throws Exception { final InputStream in = new ByteArrayInputStream( ("2013-06-22T18:58:45.955+0200: 1.433: [Full GC 128M->63M(128M), 0.0385026 secs]" + "\n2013-06-22T18:58:45.986+0200: 1.472: [GC cleanup, 0.0000004 secs]" @@ -380,15 +380,15 @@ public void simpleLogCleanUpNoMemory() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("bytearray"), in, GcLogType.SUN1_7G1); GCModel model = reader.read(); - assertEquals("count", 4, model.size()); + assertEquals(4, model.size(), "count"); // the order of the events is in fact wrong; but for the sake of simplicity in the parser I accept it - assertEquals("cleanup event", "GC cleanup", model.get(2).getTypeAsString()); - assertEquals("concurrent-mark-abort event", "GC concurrent-mark-abort", model.get(1).getTypeAsString()); + assertEquals("GC cleanup", model.get(2).getTypeAsString(), "cleanup event"); + assertEquals("GC concurrent-mark-abort", model.get(1).getTypeAsString(), "concurrent-mark-abort event"); } @Test - public void printHeapAtGcWithConcurrentEvents() throws Exception { + void printHeapAtGcWithConcurrentEvents() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1_PrintHeapAtGC_withConcurrent.txt"); @@ -397,23 +397,23 @@ public void printHeapAtGcWithConcurrentEvents() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("number of events", 3, model.size()); - assertEquals("number of concurrent events", 2, model.getConcurrentEventPauses().size()); + assertEquals(3, model.size(), "number of events"); + assertEquals(2, model.getConcurrentEventPauses().size(), "number of concurrent events"); ConcurrentGCEvent concurrentEvent = (ConcurrentGCEvent) model.get(0); - assertEquals("GC concurrent-root-region-scan-end expected", "GC concurrent-root-region-scan-end", concurrentEvent.getTypeAsString()); + assertEquals("GC concurrent-root-region-scan-end", concurrentEvent.getTypeAsString(), "GC concurrent-root-region-scan-end expected"); concurrentEvent = (ConcurrentGCEvent) model.get(1); - assertEquals("GC concurrent-mark-start expected", "GC concurrent-mark-start", concurrentEvent.getTypeAsString()); + assertEquals("GC concurrent-mark-start", concurrentEvent.getTypeAsString(), "GC concurrent-mark-start expected"); GCEvent fullGcEvent = (GCEvent) model.get(2); - assertEquals("full gc", "Full GC", fullGcEvent.getTypeAsString()); + assertEquals("Full GC", fullGcEvent.getTypeAsString(), "full gc"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void printPrintHeapAtGC() throws Exception { + void printPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_40PrintHeapAtGC.txt"); @@ -422,15 +422,15 @@ public void printPrintHeapAtGC() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); + assertEquals(1, model.size(), "count"); GCEvent event = (GCEvent) model.get(0); - assertEquals("type name", "GC pause (G1 Evacuation Pause) (young)", event.getTypeAsString()); - assertEquals("gc pause", 0.0147015, model.getPause().getMax(), 0.000000001); - assertEquals("error count", 0, handler.getCount()); + assertEquals("GC pause (G1 Evacuation Pause) (young)", event.getTypeAsString(), "type name"); + assertEquals(0.0147015, model.getPause().getMax(), 0.000000001, "gc pause"); + assertEquals(0, handler.getCount(), "error count"); } @Test - public void printAdaptiveSizePolicyPrintReferencePolicy() throws Exception { + void printAdaptiveSizePolicyPrintReferencePolicy() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1AdaptiveSize_Reference.txt"); @@ -456,7 +456,7 @@ public void printAdaptiveSizePolicyPrintReferencePolicy() throws Exception { } @Test - public void printReferencePolicy() throws Exception { + void printReferencePolicy() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1PrintReferencePolicy.txt"); @@ -473,7 +473,7 @@ public void printReferencePolicy() throws Exception { } @Test - public void printDetailsWithoutTimestamp() throws Exception { + void printDetailsWithoutTimestamp() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1_DetailsWoTimestamp.txt"); @@ -490,7 +490,7 @@ public void printDetailsWithoutTimestamp() throws Exception { } @Test - public void printSimpleToSpaceOverflow() throws Exception { + void printSimpleToSpaceOverflow() throws Exception { InputStream in = new ByteArrayInputStream( ("2013-12-21T15:48:44.062+0100: 0.441: [GC pause (G1 Evacuation Pause) (young)-- 90M->94M(128M), 0.0245257 secs]") .getBytes()); @@ -498,13 +498,12 @@ public void printSimpleToSpaceOverflow() throws Exception { DataReader reader = new DataReaderSun1_6_0G1(new GcResourceFile("bytearray"), in, GcLogType.SUN1_7G1); GCModel model = reader.read(); - assertEquals("count", 1, model.size()); - assertEquals("gc pause", 0.0245257, model.getGCPause().getMax(), 0.000001); - + assertEquals(1, model.size(), "count"); + assertEquals(0.0245257, model.getGCPause().getMax(), 0.000001, "gc pause"); } @Test - public void pauseWithComma() throws Exception { + void pauseWithComma() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1_PauseWithComma.txt"); @@ -543,21 +542,21 @@ private void verifyYoungToSpaceOverflowInitialMarkMixedOrder(String fileName, Ty } @Test - public void testYoungToSpaceOverflowInitialMarkOriginalOrder() throws Exception { + void testYoungToSpaceOverflowInitialMarkOriginalOrder() throws Exception { verifyYoungToSpaceOverflowInitialMarkMixedOrder( "SampleSun1_7_0_G1_young_initial_mark_to_space_exhausted_original_order.txt", Type.G1_YOUNG_TO_SPACE_EXHAUSTED_INITIAL_MARK); } @Test - public void testYoungToSpaceOverflowInitialMarkReverseOrder() throws Exception { + void testYoungToSpaceOverflowInitialMarkReverseOrder() throws Exception { verifyYoungToSpaceOverflowInitialMarkMixedOrder( "SampleSun1_7_0_G1_young_initial_mark_to_space_exhausted_reverse_order.txt", Type.G1_YOUNG_INITIAL_MARK_TO_SPACE_EXHAUSTED); } @Test - public void printGCApplicationStoppedTimeTenuringDist() throws Exception { + void printGCApplicationStoppedTimeTenuringDist() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0_51_G1_PrintApplicationTimeTenuringDistribution.txt"); @@ -587,7 +586,7 @@ public void printGCApplicationStoppedTimeTenuringDist() throws Exception { } @Test - public void printGCApplicationStoppedTimeTenuringDistErgonomicsComma() throws Exception { + void printGCApplicationStoppedTimeTenuringDistErgonomicsComma() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_7_0G1_AppStopped_TenuringDist_Ergonomics_comma.txt"); @@ -616,7 +615,7 @@ public void printGCApplicationStoppedTimeTenuringDistErgonomicsComma() throws Ex } @Test - public void printGCApplicationStoppedMixed() throws Exception { + void printGCApplicationStoppedMixed() throws Exception { // TODO relax G1 parser: don't warn, when 2 timestamps are in the beginning of a line TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -637,7 +636,7 @@ public void printGCApplicationStoppedMixed() throws Exception { } @Test - public void printAdaptiveSizePolicyFullGc() throws Exception { + void printAdaptiveSizePolicyFullGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0.java index f86f0ccc..4a6b279c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0.java @@ -1,11 +1,11 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -19,7 +19,7 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test logs generated specifically by java 1.8. @@ -27,7 +27,7 @@ * @author Joerg Wuethrich *

created on: 25.09.2013

*/ -public class TestDataReaderSun1_8_0 { +class TestDataReaderSun1_8_0 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); @@ -38,7 +38,7 @@ private DataReader getDataReader(GCResource gcResource) throws IOException { } @Test - public void parallelPrintHeapAtGC() throws Exception { + void parallelPrintHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0ParallelPrintHeapAtGC.txt"); @@ -53,7 +53,7 @@ public void parallelPrintHeapAtGC() throws Exception { } @Test - public void scavengeBeforeRemarkPrintHeapAtGC_YGOccupancy() throws Exception { + void scavengeBeforeRemarkPrintHeapAtGC_YGOccupancy() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0CMS_ScavengeBeforeRemark_HeapAtGc.txt"); @@ -66,11 +66,11 @@ public void scavengeBeforeRemarkPrintHeapAtGC_YGOccupancy() throws Exception { assertThat("scavenge before remark event", model.get(0).getPause(), closeTo(0.0000778, 0.000000001)); assertThat("remark event", model.get(1).getPause(), closeTo(0.0019970 - 0.0000778, 0.000000001)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void scavengeBeforeRemark_HeapAtGC_PrintTenuringDistribution_PrintFLSStats() throws Exception { + void scavengeBeforeRemark_HeapAtGC_PrintTenuringDistribution_PrintFLSStats() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0CMS_ScavengeBR_HeapAtGC_TenuringDist_PrintFLS.txt"); @@ -83,11 +83,11 @@ public void scavengeBeforeRemark_HeapAtGC_PrintTenuringDistribution_PrintFLSStat assertThat("scavenge before remark event", model.get(0).getPause(), closeTo(0.1306264, 0.000000001)); assertThat("remark event", model.get(1).getPause(), closeTo(0.1787717 - 0.1306264, 0.000000001)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void parallelPrintTenuringGcCause() throws Exception { + void parallelPrintTenuringGcCause() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0Parallel_Tenuring_PrintGCCause.txt"); @@ -100,11 +100,11 @@ public void parallelPrintTenuringGcCause() throws Exception { assertThat("gc name", model.get(0).getTypeAsString(), equalTo("GC (Allocation Failure); PSYoungGen")); assertThat("pause", model.get(0).getPause(), closeTo(0.0199218, 0.000000001)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void parallelApple() throws Exception { + void parallelApple() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0Parallel_Apple.txt"); @@ -115,11 +115,11 @@ public void parallelApple() throws Exception { assertThat("gc count", model.size(), is(6)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void cmsPrintHeapBeforeFullGc() throws Exception { + void cmsPrintHeapBeforeFullGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0CMS_HeadDumpBeforeFullGc.txt"); @@ -134,11 +134,11 @@ public void cmsPrintHeapBeforeFullGc() throws Exception { assertThat("gc name full gc", model.get(1).getTypeAsString(), equalTo("Full GC (GCLocker Initiated GC); CMS (concurrent mode failure); Metaspace")); assertThat("pause", model.get(1).getPause(), closeTo(218.6928810, 0.000000001)); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void shenandoahPauseMark() throws Exception { + void shenandoahPauseMark() throws Exception { // in its early implementation (jdk8u171), Shenandoah had memory information in the "Pause Final Mark" event, which was dropped later (jdk8u232) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -176,7 +176,7 @@ public void shenandoahPauseMark() throws Exception { } @Test - public void shenandoahPauseUpdateRefs() throws Exception { + void shenandoahPauseUpdateRefs() throws Exception { // in its early implementation (jdk8u171), Shenandoah had memory information in the "Pause Final Update Refs" event, which was dropped later (jdk8u232) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -208,7 +208,7 @@ public void shenandoahPauseUpdateRefs() throws Exception { } @Test - public void shehandoahConcurrentEventsjsk8u171() throws Exception { + void shehandoahConcurrentEventsjsk8u171() throws Exception { // probably jdk8u171 TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -238,7 +238,7 @@ public void shehandoahConcurrentEventsjsk8u171() throws Exception { } @Test - public void shehandoahConcurrentEventsjsk8u232() throws Exception { + void shehandoahConcurrentEventsjsk8u232() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -286,7 +286,7 @@ public void shehandoahConcurrentEventsjsk8u232() throws Exception { } @Test - public void shenandoahIgnoredLines() throws Exception { + void shenandoahIgnoredLines() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -305,7 +305,7 @@ public void shenandoahIgnoredLines() throws Exception { } @Test - public void shenandoaPauseInitMarkDetails() throws Exception { + void shenandoaPauseInitMarkDetails() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -329,7 +329,7 @@ public void shenandoaPauseInitMarkDetails() throws Exception { } @Test - public void shenandoahConcurrentCleanup() throws Exception { + void shenandoahConcurrentCleanup() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -360,7 +360,7 @@ public void shenandoahConcurrentCleanup() throws Exception { } @Test - public void shenandoahDetailsShutdown() throws Exception { + void shenandoahDetailsShutdown() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.INFO); GCResource gcResource = new GcResourceFile("SampleOpenJdk1_8_0ShenandoahDetailsShutdown.txt"); @@ -379,7 +379,7 @@ public void shenandoahDetailsShutdown() throws Exception { } @Test - public void shenandoah_171_Beginning() throws Exception { + void shenandoah_171_Beginning() throws Exception { // in its early implementation (jdk8u171), Shenandoah had memory information in the "Pause Final Mark" event, which was dropped later (jdk8u232) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.INFO); @@ -399,7 +399,7 @@ public void shenandoah_171_Beginning() throws Exception { } @Test - public void shenandoah_232_Beginning() throws Exception { + void shenandoah_232_Beginning() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.INFO); GCResource gcResource = new GcResourceFile("SampleOpenJdk1_8_0-232-ShenandoahBeginning.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0G1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0G1.java index 33e34216..a5859d97 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0G1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderSun1_8_0G1.java @@ -1,15 +1,14 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.util.logging.Level; import com.tagtraum.perf.gcviewer.UnittestHelper; @@ -19,7 +18,7 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test logs generated specifically by JDK 1.8 G1 algorithm. @@ -27,18 +26,18 @@ * @author Joerg Wuethrich *

created on: 22.07.2014

*/ -public class TestDataReaderSun1_8_0G1 { +class TestDataReaderSun1_8_0G1 { private InputStream getInputStream(String fileName) throws IOException { return UnittestHelper.getResourceAsStream(FOLDER.OPENJDK, fileName); } - private DataReader getDataReader(GCResource gcResource) throws UnsupportedEncodingException, IOException { + private DataReader getDataReader(GCResource gcResource) throws IOException { return new DataReaderSun1_6_0G1(gcResource, getInputStream(gcResource.getResourceName()), GcLogType.SUN1_8G1); } @Test - public void fullConcurrentCycle() throws Exception { + void fullConcurrentCycle() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1_ConcurrentCycle.txt"); @@ -62,7 +61,7 @@ public void fullConcurrentCycle() throws Exception { * sizes again. Test, that they are parsed correctly. */ @Test - public void fullGcWithDetailedSizes() throws Exception { + void fullGcWithDetailedSizes() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -89,7 +88,7 @@ public void fullGcWithDetailedSizes() throws Exception { } @Test - public void printGCCauseTenuringDistribution() throws Exception { + void printGCCauseTenuringDistribution() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1PrintGCCausePrintTenuringDistribution.txt"); @@ -98,13 +97,13 @@ public void printGCCauseTenuringDistribution() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause sum", 16.7578613, model.getPause().getSum(), 0.000000001); + assertEquals(16.7578613, model.getPause().getSum(), 0.000000001, "gc pause sum"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void printHeapAtGC() throws Exception { + void printHeapAtGC() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1PrintHeapAtGc.txt"); @@ -113,13 +112,13 @@ public void printHeapAtGC() throws Exception { DataReader reader = getDataReader(gcResource); GCModel model = reader.read(); - assertEquals("gc pause sum", 0.0055924, model.getPause().getSum(), 0.000000001); + assertEquals(0.0055924, model.getPause().getSum(), 0.000000001, "gc pause sum"); - assertEquals("number of errors", 0, handler.getCount()); + assertEquals(0, handler.getCount(), "number of errors"); } @Test - public void humongousMixed() throws Exception { + void humongousMixed() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1HumongousMixed.txt"); @@ -133,7 +132,7 @@ public void humongousMixed() throws Exception { } @Test - public void extendedRemark() throws Exception { + void extendedRemark() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1extended-remark.txt"); @@ -148,7 +147,7 @@ public void extendedRemark() throws Exception { } @Test - public void youngInitialMarkSystemGc() throws Exception { + void youngInitialMarkSystemGc() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1SystemGcYoung.txt"); @@ -164,7 +163,7 @@ public void youngInitialMarkSystemGc() throws Exception { } @Test - public void youngInitialMarkMetadataThreshold() throws Exception { + void youngInitialMarkMetadataThreshold() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1YoungMetadataGcThreshold.txt"); @@ -179,7 +178,7 @@ public void youngInitialMarkMetadataThreshold() throws Exception { } @Test - public void doubleTimeStamp() throws Exception { + void doubleTimeStamp() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -199,7 +198,7 @@ public void doubleTimeStamp() throws Exception { } @Test - public void ignorePrintStringDeduplicationStatistics() throws Exception { + void ignorePrintStringDeduplicationStatistics() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("SampleSun1_8_0G1StringDeduplication.txt"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLCMS.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLCMS.java index 31138213..8cc17c86 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLCMS.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLCMS.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,7 +17,7 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests unified jvm logging parser for cms gc events. @@ -28,7 +28,7 @@ private GCModel getGCModelFromLogFile(String fileName) throws IOException { } @Test - public void parseGcDefaults() throws Exception { + void parseGcDefaults() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-cms-gc-defaults.txt"); assertThat("size", model.size(), is(16)); assertThat("amount of gc event types", model.getGcEventPauses().size(), is(3)); @@ -89,7 +89,7 @@ public void parseGcDefaults() throws Exception { } @Test - public void parseGcAllSafepointOsCpu() throws Exception { + void parseGcAllSafepointOsCpu() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-cms-gc-all,safepoint,os+cpu.txt"); assertThat("size", model.size(), is(26)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(3)); @@ -145,7 +145,7 @@ public void parseGcAllSafepointOsCpu() throws Exception { } @Test - public void testParseFullGcWithPhases() throws Exception { + void testParseFullGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1.java index e9b0d084..1208a046 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,18 +20,18 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests unified jvm logging parser for cms gc events. */ -public class TestDataReaderUJLG1 { +class TestDataReaderUJLG1 { private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } @Test - public void parseGcDefaults() throws Exception { + void parseGcDefaults() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-g1-gc-defaults.txt"); assertThat("size", model.size(), is(15)); assertThat("amount of gc event types", model.getGcEventPauses().size(), is(6)); @@ -106,7 +106,7 @@ public void parseGcDefaults() throws Exception { } @Test - public void parseGcAllSafepointOsCpu() throws Exception { + void parseGcAllSafepointOsCpu() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-g1-gc-all,safepoint,os+cpu.txt"); assertThat("size", model.size(), is(15)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(4)); @@ -168,7 +168,7 @@ public void parseGcAllSafepointOsCpu() throws Exception { } @Test - public void parseGcAllSafepointOsCpuWithToSpaceExhausted() throws Exception { + void parseGcAllSafepointOsCpuWithToSpaceExhausted() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-g1-gc-all,safepoint,os+cpu-to-space-exhausted.txt"); assertThat("size", model.size(), is(1)); AbstractGCEvent youngEvent = model.get(0); @@ -196,7 +196,7 @@ public void parseGcAllSafepointOsCpuWithToSpaceExhausted() throws Exception { } @Test - public void testParseGcWithPhases() throws Exception { + void testParseGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK11.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK11.java index 0e0214aa..31aa2904 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK11.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK11.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -15,18 +15,18 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test unified java logging G1 algorithm in OpenJDK 11 */ -public class TestDataReaderUJLG1JDK11 { +class TestDataReaderUJLG1JDK11 { private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } @Test - public void testDefaultsPauseYoungNormal() throws Exception { + void testDefaultsPauseYoungNormal() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -44,7 +44,7 @@ public void testDefaultsPauseYoungNormal() throws Exception { } @Test - public void testNewUptimestamp() throws Exception { + void testNewUptimestamp() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -60,7 +60,7 @@ public void testNewUptimestamp() throws Exception { } @Test - public void testDefaultsPauseYoungConcurrentStart() throws Exception { + void testDefaultsPauseYoungConcurrentStart() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -78,7 +78,7 @@ public void testDefaultsPauseYoungConcurrentStart() throws Exception { } @Test - public void testDefaultsPauseYoungPrepareMixed() throws Exception { + void testDefaultsPauseYoungPrepareMixed() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -96,7 +96,7 @@ public void testDefaultsPauseYoungPrepareMixed() throws Exception { } @Test - public void testDefaultsPauseYoungMixed() throws Exception { + void testDefaultsPauseYoungMixed() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -114,7 +114,7 @@ public void testDefaultsPauseYoungMixed() throws Exception { } @Test - public void testFullGcWithPhases() throws Exception { + void testFullGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -151,7 +151,7 @@ public void testFullGcWithPhases() throws Exception { } @Test - public void testPauseYoungConcurrentStartMetadataGcThreshold() throws Exception { + void testPauseYoungConcurrentStartMetadataGcThreshold() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK12.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK12.java index b30d4d7e..d25e23d3 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK12.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLG1JDK12.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -12,14 +12,15 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test unified java logging G1 algorithm in OpenJDK 12 */ -public class TestDataReaderUJLG1JDK12 { +class TestDataReaderUJLG1JDK12 { + @Test - public void testG1ArchiveRegions() throws Exception { + void testG1ArchiveRegions() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLParallel.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLParallel.java index 1100b678..d88a2658 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLParallel.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLParallel.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,18 +17,18 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests unified jvm logging parser for parallel gc events. */ -public class TestDataReaderUJLParallel { +class TestDataReaderUJLParallel { private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } @Test - public void parseGcDefaults() throws Exception { + void parseGcDefaults() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-parallel-gc-defaults.txt"); assertThat("size", model.size(), is(11)); assertThat("amount of gc event types", model.getGcEventPauses().size(), is(1)); @@ -57,7 +57,7 @@ public void parseGcDefaults() throws Exception { } @Test - public void parseGcAllSafepointOsCpu() throws Exception { + void parseGcAllSafepointOsCpu() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-parallel-gc-all,safepoint,os+cpu.txt"); assertThat("size", model.size(), is(8)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(1)); @@ -99,7 +99,7 @@ public void parseGcAllSafepointOsCpu() throws Exception { } @Test - public void testParseFullGcWithPhases() throws Exception { + void testParseFullGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLSerial.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLSerial.java index 709d1737..5efbdc5b 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLSerial.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLSerial.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,18 +17,18 @@ import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests unified jvm logging parser for serial gc events. */ -public class TestDataReaderUJLSerial { +class TestDataReaderUJLSerial { private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } @Test - public void parseGcDefaults() throws Exception { + void parseGcDefaults() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-serial-gc-defaults.txt"); assertThat("size", model.size(), is(11)); assertThat("amount of gc event types", model.getGcEventPauses().size(), is(1)); @@ -63,7 +63,7 @@ public void parseGcDefaults() throws Exception { } @Test - public void parseGcAllSafepointOsCpu() throws Exception { + void parseGcAllSafepointOsCpu() throws Exception { GCModel model = getGCModelFromLogFile("sample-ujl-serial-gc-all,safepoint,os+cpu.txt"); assertThat("size", model.size(), is(4)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(1)); @@ -94,7 +94,7 @@ public void parseGcAllSafepointOsCpu() throws Exception { } @Test - public void testParseUnknownLineFormat() throws Exception { + void testParseUnknownLineFormat() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -111,7 +111,7 @@ public void testParseUnknownLineFormat() throws Exception { } @Test - public void testParseUnknownGcType() throws Exception { + void testParseUnknownGcType() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -128,7 +128,7 @@ public void testParseUnknownGcType() throws Exception { } @Test - public void testParseFullGcWithPhases() throws Exception { + void testParseFullGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLShenandoah.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLShenandoah.java index 748875ad..cfa0376c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLShenandoah.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLShenandoah.java @@ -1,10 +1,10 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,18 +20,18 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.util.DateHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Created by Mart on 10/05/2017. */ -public class TestDataReaderUJLShenandoah { +class TestDataReaderUJLShenandoah { private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } @Test - public void parseAllocationFailure() throws Exception { + void parseAllocationFailure() throws Exception { GCModel model = getGCModelFromLogFile("SampleShenandoahAllocationFailure.txt"); assertThat("size", model.size(), is(1)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(0)); @@ -51,7 +51,7 @@ public void parseAllocationFailure() throws Exception { } @Test - public void parsePassiveHeuristics() throws Exception { + void parsePassiveHeuristics() throws Exception { GCModel model = getGCModelFromLogFile("SampleShenandoahPassiveHeuristics.txt"); assertThat("size", model.size(), is(0)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(0)); @@ -61,7 +61,7 @@ public void parsePassiveHeuristics() throws Exception { @Test - public void parseSingleSystemGCEvent() throws Exception { + void parseSingleSystemGCEvent() throws Exception { // this kind of system.gc event logging might have been removed in jdk1.8_232 GCModel model = getGCModelFromLogFile("SampleShenandoahSingleSystemGC.txt"); assertThat("size", model.size(), is(1)); @@ -80,7 +80,7 @@ public void parseSingleSystemGCEvent() throws Exception { } @Test - public void parseSeveralSystemGCEvents() throws Exception { + void parseSeveralSystemGCEvents() throws Exception { GCModel model = getGCModelFromLogFile("SampleShenandoahSeveralSystemGC.txt"); assertThat("size", model.size(), is(438)); assertThat("amount of STW GC pause types", model.getGcEventPauses().size(), is(0)); @@ -98,14 +98,14 @@ public void parseSeveralSystemGCEvents() throws Exception { } @Test - public void parseJdk11Beginning() throws Exception { + void parseJdk11Beginning() throws Exception { // the main purpose if this test is to make sure, that no warnings are printed, when parsing the beginning of a shenandoah gc log file GCModel model = getGCModelFromLogFile("Sample-ujl-shenandoah-jdk11-beginning.txt"); assertThat("size", model.size(), is(1)); } @Test - public void testConcurrentReset() throws Exception { + void testConcurrentReset() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -131,7 +131,7 @@ public void testConcurrentReset() throws Exception { } @Test - public void testPauseInitMark() throws Exception { + void testPauseInitMark() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -161,7 +161,7 @@ public void testPauseInitMark() throws Exception { } @Test - public void testConcurrentMark() throws Exception { + void testConcurrentMark() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -185,7 +185,7 @@ public void testConcurrentMark() throws Exception { } @Test - public void testConcurrentPrecleaning() throws Exception { + void testConcurrentPrecleaning() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -209,7 +209,7 @@ public void testConcurrentPrecleaning() throws Exception { } @Test - public void testPauseFinalMark() throws Exception { + void testPauseFinalMark() throws Exception { // in its early implementation (2017), Shenandoah had memory information in this event, which was dropped later (2019) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -240,7 +240,7 @@ public void testPauseFinalMark() throws Exception { } @Test - public void testConcurrentCleanup() throws Exception { + void testConcurrentCleanup() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -263,7 +263,7 @@ public void testConcurrentCleanup() throws Exception { } @Test - public void testConcurrentEvacuation() throws Exception { + void testConcurrentEvacuation() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -290,7 +290,7 @@ public void testConcurrentEvacuation() throws Exception { } @Test - public void testPauseInitUpdateRefs() throws Exception { + void testPauseInitUpdateRefs() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -315,7 +315,7 @@ public void testPauseInitUpdateRefs() throws Exception { } @Test - public void testConcurrentUpdateRefs() throws Exception { + void testConcurrentUpdateRefs() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); @@ -338,7 +338,7 @@ public void testConcurrentUpdateRefs() throws Exception { } @Test - public void testPauseFinalUpdateRefs() throws Exception { + void testPauseFinalUpdateRefs() throws Exception { // in its early implementation (2017), Shenandoah had memory information in this event, which was dropped later (2019) TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -364,7 +364,7 @@ public void testPauseFinalUpdateRefs() throws Exception { } @Test - public void testConcurrentUncommit() throws Exception { + void testConcurrentUncommit() throws Exception { // in the sequence of gc events, there seem to be two "concurrent cleanup" events - one somewhere in the middle, the other the last TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); @@ -389,7 +389,7 @@ public void testConcurrentUncommit() throws Exception { } @Test - public void testPauseDegeneratedGc() throws Exception { + void testPauseDegeneratedGc() throws Exception { GCModel model = getGCModelFromLogFile("Sample-ujl-shenandoah-jdk11-PauseDegeneratedGc.txt"); assertThat("number of events", model.size(), is(1)); @@ -401,7 +401,7 @@ public void testPauseDegeneratedGc() throws Exception { } @Test - public void testParseFullGcWithPhases() throws Exception { + void testParseFullGcWithPhases() throws Exception { TestLogHandler handler = new TestLogHandler(); handler.setLevel(Level.WARNING); GCResource gcResource = new GcResourceFile("byteArray"); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLZGC.java b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLZGC.java index 25bbb79c..88e6e57c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLZGC.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/imp/TestDataReaderUJLZGC.java @@ -1,16 +1,16 @@ package com.tagtraum.perf.gcviewer.imp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.IOException; import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test unified java logging ZGC algorithm in OpenJDK 11 @@ -32,20 +32,20 @@ private GCModel getGCModelFromLogFile(String fileName) throws IOException { return UnittestHelper.getGCModelFromLogFile(fileName, UnittestHelper.FOLDER.OPENJDK_UJL, DataReaderUnifiedJvmLogging.class); } - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { gcAllModel = getGCModelFromLogFile("sample-ujl-zgc-gc-all.txt"); gcDefaultModel = getGCModelFromLogFile("sample-ujl-zgc-gc-default.txt"); } - @After - public void tearDown() { + @AfterEach + void tearDown() { gcAllModel = null; gcDefaultModel = null; } @Test - public void testGcAll() { + void testGcAll() { assertThat("size", gcAllModel.size(), is(8)); assertThat("amount of gc event types", gcAllModel.getGcEventPauses().size(), is(1)); assertThat("amount of gc events", gcAllModel.getGCPause().getN(), is(1)); @@ -56,7 +56,7 @@ public void testGcAll() { } @Test - public void testGcAllGarbageCollection() { + void testGcAllGarbageCollection() { AbstractGCEvent garbageCollectionEvent = gcAllModel.get(gcAllModel.size()-1); UnittestHelper.testMemoryPauseEvent(garbageCollectionEvent, "Garbage Collection", @@ -68,7 +68,7 @@ public void testGcAllGarbageCollection() { } @Test - public void testGcAllPauseMarkStart() { + void testGcAllPauseMarkStart() { AbstractGCEvent pauseMarkStartEvent = gcAllModel.getGCEvents().next().getPhases().get(0); UnittestHelper.testMemoryPauseEvent(pauseMarkStartEvent, "Pause Mark Start", @@ -80,7 +80,7 @@ public void testGcAllPauseMarkStart() { } @Test - public void testGcAllConcurrentMark() { + void testGcAllConcurrentMark() { AbstractGCEvent concurrentMarkEvent = gcAllModel.get(CONCURRENT_MARK_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentMarkEvent, "Concurrent Mark", @@ -92,7 +92,7 @@ public void testGcAllConcurrentMark() { } @Test - public void testGcAllPauseMarkEnd() { + void testGcAllPauseMarkEnd() { AbstractGCEvent pauseMarkEndEvent = gcAllModel.getGCEvents().next().getPhases().get(1); UnittestHelper.testMemoryPauseEvent(pauseMarkEndEvent, "Pause Mark End", @@ -104,7 +104,7 @@ public void testGcAllPauseMarkEnd() { } @Test - public void testGcAllConcurrentNonref() { + void testGcAllConcurrentNonref() { AbstractGCEvent concurrentNonrefEvent = gcAllModel.get(CONCURRENT_PROCESS_REFERENCES_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentNonrefEvent, "Concurrent Process Non-Strong References", @@ -116,7 +116,7 @@ public void testGcAllConcurrentNonref() { } @Test - public void testGcAllConcurrentResetRelocSet() { + void testGcAllConcurrentResetRelocSet() { AbstractGCEvent concurrentResetRelocSetEvent = gcAllModel.get(CONCURRENT_RESET_RELOCATION_SET_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentResetRelocSetEvent, "Concurrent Reset Relocation Set", @@ -128,7 +128,7 @@ public void testGcAllConcurrentResetRelocSet() { } @Test - public void testGcAllConcurrentDetachedPages() { + void testGcAllConcurrentDetachedPages() { AbstractGCEvent concurrentDetachedPagesEvent = gcAllModel.get(CONCURRENT_DESTROY_DETACHED_PAGES_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentDetachedPagesEvent, "Concurrent Destroy Detached Pages", @@ -140,7 +140,7 @@ public void testGcAllConcurrentDetachedPages() { } @Test - public void testGcAllConcurrentSelectRelocSet() { + void testGcAllConcurrentSelectRelocSet() { AbstractGCEvent concurrentSelectRelocSetEvent = gcAllModel.get(CONCURRENT_SELECT_RELOCATION_SET_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentSelectRelocSetEvent, "Concurrent Select Relocation Set", @@ -152,7 +152,7 @@ public void testGcAllConcurrentSelectRelocSet() { } @Test - public void testGcAllConcurrentPrepareRelocSet() { + void testGcAllConcurrentPrepareRelocSet() { AbstractGCEvent concurrentPrepareRelocSetEvent = gcAllModel.get(CONCURRENT_PREPARE_RELOCATION_SET_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentPrepareRelocSetEvent, "Concurrent Prepare Relocation Set", @@ -164,7 +164,7 @@ public void testGcAllConcurrentPrepareRelocSet() { } @Test - public void testGcAllPauseRelocateStart() { + void testGcAllPauseRelocateStart() { AbstractGCEvent pauseRelocateStartEvent = gcAllModel.getGCEvents().next().getPhases().get(2); UnittestHelper.testMemoryPauseEvent(pauseRelocateStartEvent, "Pause Relocate Start", @@ -176,7 +176,7 @@ public void testGcAllPauseRelocateStart() { } @Test - public void testGcAllConcurrentRelocate() { + void testGcAllConcurrentRelocate() { AbstractGCEvent concurrentRelocateEvent = gcAllModel.get(CONCURRENT_RELOCATE_INDEX); UnittestHelper.testMemoryPauseEvent(concurrentRelocateEvent, "Concurrent Relocate", @@ -188,7 +188,7 @@ public void testGcAllConcurrentRelocate() { } @Test - public void testGcDefault() { + void testGcDefault() { assertThat("size", gcDefaultModel.size(), is(5)); assertThat("amount of STW GC pause types", gcDefaultModel.getGcEventPauses().size(), is(5)); assertThat("amount of STW Full GC pause types", gcDefaultModel.getFullGcEventPauses().size(), is(0)); @@ -196,7 +196,7 @@ public void testGcDefault() { } @Test - public void testGcDefaultMetadataGcThreshold() { + void testGcDefaultMetadataGcThreshold() { // Default gc log gives no pause time or total heap size AbstractGCEvent metadataGcThresholdEvent = gcDefaultModel.get(0); UnittestHelper.testMemoryPauseEvent(metadataGcThresholdEvent, @@ -209,7 +209,7 @@ public void testGcDefaultMetadataGcThreshold() { } @Test - public void testGcDefaultWarmup() { + void testGcDefaultWarmup() { AbstractGCEvent warmupEvent = gcDefaultModel.get(1); UnittestHelper.testMemoryPauseEvent(warmupEvent, "Warmup heap", @@ -221,7 +221,7 @@ public void testGcDefaultWarmup() { } @Test - public void testGcDefaultProactive() { + void testGcDefaultProactive() { AbstractGCEvent proactiveEvent = gcDefaultModel.get(2); UnittestHelper.testMemoryPauseEvent(proactiveEvent, "Proactive heap", @@ -233,7 +233,7 @@ public void testGcDefaultProactive() { } @Test - public void testGcDefaultAllocationRate() { + void testGcDefaultAllocationRate() { AbstractGCEvent allocationRateEvent = gcDefaultModel.get(3); UnittestHelper.testMemoryPauseEvent(allocationRateEvent, "Allocation Rate heap", @@ -245,7 +245,7 @@ public void testGcDefaultAllocationRate() { } @Test - public void testDefaultGcSystemGc() { + void testDefaultGcSystemGc() { AbstractGCEvent systemGcEvent = gcDefaultModel.get(4); UnittestHelper.testMemoryPauseEvent(systemGcEvent, "System.gc() heap", diff --git a/src/test/java/com/tagtraum/perf/gcviewer/math/TestDoubleData.java b/src/test/java/com/tagtraum/perf/gcviewer/math/TestDoubleData.java index 4da30334..07e3ddee 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/math/TestDoubleData.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/math/TestDoubleData.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.math; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -10,22 +10,23 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestDoubleData { +class TestDoubleData { @Test - public void testSimpleAverage() throws Exception { + void testSimpleAverage() { double[] x = {1.0, 2.0}; - assertEquals("Simple average", 1.5, DoubleData.average(x), 0.0); + assertEquals( 1.5, DoubleData.average(x), 0.0, "Simple average"); } - public void testSimpleStandardDeviation() throws Exception { + @Test + void testSimpleStandardDeviation() { DoubleData doubleData = new DoubleData(); doubleData.add(1); doubleData.add(1); doubleData.add(-1); doubleData.add(-1); - assertEquals("Simple std deviation", 1.1547005383792515, doubleData.standardDeviation(), 0.0000001); + assertEquals(1.1547005383792515, doubleData.standardDeviation(), 0.0000001, "Simple std deviation"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/math/TestIntData.java b/src/test/java/com/tagtraum/perf/gcviewer/math/TestIntData.java index e4bbfc52..40aab4eb 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/math/TestIntData.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/math/TestIntData.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.math; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -10,25 +10,26 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestIntData { +class TestIntData { @Test - public void testSimpleAverage() throws Exception { + void testSimpleAverage() { IntData intData = new IntData(); intData.add(1); intData.add(2); - assertEquals("Simple average", 1.5, intData.average(), 0.0); + assertEquals(1.5, intData.average(), 0.0, "Simple average"); } - public void testSimpleStandardDeviation() throws Exception { + @Test + void testSimpleStandardDeviation() { IntData intData = new IntData(); intData.add(1); intData.add(1); intData.add(-1); intData.add(-1); - assertEquals("Simple std deviation", 1.1547005383792515, intData.standardDeviation(), 0.0000001); + assertEquals(1.1547005383792515, intData.standardDeviation(), 0.0000001, "Simple std deviation"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/math/TestRegressionLine.java b/src/test/java/com/tagtraum/perf/gcviewer/math/TestRegressionLine.java index 966d0845..88fc5543 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/math/TestRegressionLine.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/math/TestRegressionLine.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.math; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -10,14 +10,14 @@ * Time: 5:53:55 PM * @author Hendrik Schreiber */ -public class TestRegressionLine { +class TestRegressionLine { @Test - public void testSimpleSlope() throws Exception { + void testSimpleSlope() { double[] x = {0.0, 1.0, 2.0, 3.0}; double[] y = {0.0, 1.0, 2.0, 3.0}; - assertEquals("Simple regression line slope test", 1.0, RegressionLine.slope(x, y), 0.0); + assertEquals(1.0, RegressionLine.slope(x, y), 0.0, "Simple regression line slope test"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/GcResourceSeriesTest.java b/src/test/java/com/tagtraum/perf/gcviewer/model/GcResourceSeriesTest.java index e4c477a7..603ca0ce 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/GcResourceSeriesTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/GcResourceSeriesTest.java @@ -2,6 +2,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,20 +11,16 @@ import com.tagtraum.perf.gcviewer.UnittestHelper; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class GcResourceSeriesTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); +class GcResourceSeriesTest { private GcResourceSeries resourceSeries; private List resourceList; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { resourceList = new ArrayList<>(); resourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath())); resourceList.add(new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part2.txt").getPath())); @@ -33,7 +30,7 @@ public void setUp() throws Exception { } @Test - public void hasUnderlyingResourceChanged() throws Exception { + void hasUnderlyingResourceChanged() throws Exception { for (GCResource resource : resourceList) { GCModel model = new GCModel(); model.setURL(((GcResourceFile) resource).getResourceNameAsUrl()); @@ -52,18 +49,18 @@ public void hasUnderlyingResourceChanged() throws Exception { } @Test - public void buildName() throws Exception { + void buildName() throws Exception { assertThat(GcResourceSeries.buildName(resourceList), is( UnittestHelper.getResource(FOLDER.OPENJDK.getFolderName()).getPath() + "/" + "SampleSun1_8_0Series-Part1-3")); } @Test - public void buildName_ForRotatedFile() throws Exception { + void buildName_ForRotatedFile() { assertThat(GcResourceSeries.buildName("garbageCollection.log.0", "garbageCollection.log.6.current"), is("garbageCollection.log.0-6")); } @Test - public void buildName_WhenOnlyOneEntryExists() throws Exception { + void buildName_WhenOnlyOneEntryExists() throws Exception { resourceList = new ArrayList<>(); GcResourceFile gcResourceFile = new GcResourceFile(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_8_0Series-Part1.txt").getPath()); @@ -72,7 +69,7 @@ public void buildName_WhenOnlyOneEntryExists() throws Exception { } @Test - public void buildName_WhenNoCommonPrefixExists() throws Exception { + void buildName_WhenNoCommonPrefixExists() { List resources = new ArrayList<>(); GCResource resource1 = mock(GCResource.class); when(resource1.getResourceName()).thenReturn("abc.log"); @@ -85,8 +82,7 @@ public void buildName_WhenNoCommonPrefixExists() throws Exception { } @Test - public void buildName_WhenListIsEmpty() throws Exception { - expectedException.expect(IllegalArgumentException.class); - GcResourceSeries.buildName(new ArrayList<>()); + void buildName_WhenListIsEmpty() { + assertThrows(IllegalArgumentException.class, () -> GcResourceSeries.buildName(new ArrayList<>())); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/TestAbstractGCEvent.java b/src/test/java/com/tagtraum/perf/gcviewer/model/TestAbstractGCEvent.java index ae2832bd..7492d382 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/TestAbstractGCEvent.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/TestAbstractGCEvent.java @@ -1,14 +1,15 @@ package com.tagtraum.perf.gcviewer.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.ExtendedType; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Generation; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for methods written in {@link AbstractGCEvent}. @@ -16,10 +17,10 @@ * @author Joerg Wuethrich *

created on: 30.09.2012

*/ -public class TestAbstractGCEvent { +class TestAbstractGCEvent { @Test - public void getGenerationParNew() { + void getGenerationParNew() { // 6.727: [GC 6.727: [ParNew: 1610619K->7990K(22649280K), 0.0379110 secs] 1610619K->7990K(47815104K), 0.0380570 secs] [Times: user=0.59 sys=0.04, real=0.04 secs] GCEvent event = new GCEvent(); event.setType(Type.GC); @@ -29,11 +30,11 @@ public void getGenerationParNew() { event.add(parNewEvent); - assertEquals("generation", Generation.YOUNG, event.getGeneration()); + assertEquals(Generation.YOUNG, event.getGeneration(), "generation"); } @Test - public void getGenerationCmsInitialMark() { + void getGenerationCmsInitialMark() { // 6.765: [GC [1 CMS-initial-mark: 0K(25165824K)] 410644K(47815104K), 0.0100670 secs] [Times: user=0.01 sys=0.00, real=0.01 secs] GCEvent event = new GCEvent(); event.setType(Type.GC); @@ -43,11 +44,11 @@ public void getGenerationCmsInitialMark() { event.add(CmsInitialMarkEvent); - assertEquals("generation", Generation.TENURED, event.getGeneration()); + assertEquals(Generation.TENURED, event.getGeneration(), "generation"); } @Test - public void getGenerationCmsRemark() { + void getGenerationCmsRemark() { // 12.203: [GC[YG occupancy: 11281900 K (22649280 K)]12.203: [Rescan (parallel) , 0.3773770 secs]12.580: [weak refs processing, 0.0000310 secs]12.580: [class unloading, 0.0055480 secs]12.586: [scrub symbol & string tables, 0.0041920 secs] [1 CMS-remark: 0K(25165824K)] 11281900K(47815104K), 0.3881550 secs] [Times: user=17.73 sys=0.04, real=0.39 secs] GCEvent event = new GCEvent(); event.setType(Type.GC); @@ -57,20 +58,20 @@ public void getGenerationCmsRemark() { event.add(CmsRemarkEvent); - assertEquals("generation", Generation.TENURED, event.getGeneration()); + assertEquals(Generation.TENURED, event.getGeneration(), "generation"); } @Test - public void getGenerationConcurrentMarkStart() { + void getGenerationConcurrentMarkStart() { // 3749.995: [CMS-concurrent-mark-start] ConcurrentGCEvent event = new ConcurrentGCEvent(); event.setType(Type.CMS_CONCURRENT_MARK_START); - assertEquals("generation", Generation.TENURED, event.getGeneration()); + assertEquals(Generation.TENURED, event.getGeneration(), "generation"); } @Test - public void getGenerationFullGc() { + void getGenerationFullGc() { // 2012-04-07T01:14:29.222+0000: 37571.083: [Full GC [PSYoungGen: 21088K->0K(603712K)] [PSOldGen: 1398086K->214954K(1398144K)] 1419174K->214954K(2001856K) [PSPermGen: 33726K->33726K(131072K)], 0.4952250 secs] [Times: user=0.49 sys=0.00, real=0.49 secs] GCEvent event = new GCEvent(); event.setType(Type.FULL_GC); @@ -87,11 +88,11 @@ public void getGenerationFullGc() { detailedEvent.setType(Type.PS_PERM_GEN); event.add(detailedEvent); - assertEquals("generation", Generation.ALL, event.getGeneration()); + assertEquals(Generation.ALL, event.getGeneration(), "generation"); } @Test - public void addExtendedTypePrintGcCause() { + void addExtendedTypePrintGcCause() { // 2013-05-25T17:02:46.238+0200: 0.194: [GC (Allocation Failure) [PSYoungGen: 16430K->2657K(19136K)] 16430K->15759K(62848K), 0.0109373 secs] [Times: user=0.05 sys=0.02, real=0.02 secs] GCEvent event = new GCEvent(); event.setExtendedType(ExtendedType.lookup(Type.GC, "GC (Allocation Failure)")); @@ -101,11 +102,11 @@ public void addExtendedTypePrintGcCause() { event.add(detailedEvent); - assertEquals("typeAsString", "GC (Allocation Failure); PSYoungGen", event.getTypeAsString()); + assertEquals("GC (Allocation Failure); PSYoungGen", event.getTypeAsString(), "typeAsString"); } @Test - public void isFullShenandoah() { + void isFullShenandoah() { AbstractGCEvent event = getNewAbstractEvent(); event.setType(Type.UJL_PAUSE_FULL); @@ -113,28 +114,28 @@ public void isFullShenandoah() { } @Test - public void testInitialPhaseList() { + void testInitialPhaseList() { AbstractGCEvent event = getNewAbstractEvent(); - assertTrue("phases list is empty", event.getPhases().isEmpty()); + assertTrue(event.getPhases().isEmpty(), "phases list is empty"); } - @Test(expected = IllegalArgumentException.class) - public void testAddNullPhase() { + @Test + void testAddNullPhase() { AbstractGCEvent event = getNewAbstractEvent(); - event.addPhase(null); + assertThrows(IllegalArgumentException.class, () -> event.addPhase(null)); } @Test - public void testAddValidPhase() { + void testAddValidPhase() { AbstractGCEvent event = getNewAbstractEvent(); GCEvent phaseEvent = new GCEvent(161.23, 0, 0, 0, 0.0004235, Type.UJL_ZGC_PAUSE_MARK_START); event.addPhase(phaseEvent); - assertEquals("number of phase events", 1, event.getPhases().size()); - assertEquals("get phase event", phaseEvent, event.getPhases().get(0)); + assertEquals(1, event.getPhases().size(), "number of phase events"); + assertEquals(phaseEvent, event.getPhases().get(0), "get phase event"); } private AbstractGCEvent getNewAbstractEvent() { diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCEventUJL.java b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCEventUJL.java index 4f190628..80682d8d 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCEventUJL.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCEventUJL.java @@ -1,52 +1,51 @@ package com.tagtraum.perf.gcviewer.model; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class TestGCEventUJL { +class TestGCEventUJL { private GCEventUJL parentGCEvent; - @Before - public void setUp() { + @BeforeEach + void setUp() { parentGCEvent = createGcEventUJL(87.11, 120390, 67880, 194540, 0, Type.UJL_ZGC_GARBAGE_COLLECTION); } - @After - public void tearDown() { + @AfterEach + void tearDown() { parentGCEvent = null; } @Test - public void addPhaseSerial() { + void addPhaseSerial() { GCEvent gcEventSerial = createGcEventUJL(101.53, 0, 0, 0, 0.0053923, Type.UJL_ZGC_PAUSE_MARK_START); parentGCEvent.addPhase(gcEventSerial); - assertEquals("size of phases list", 1, parentGCEvent.getPhases().size()); - assertEquals("phase event", gcEventSerial, parentGCEvent.getPhases().get(0)); + assertEquals(1, parentGCEvent.getPhases().size(), "size of phases list"); + assertEquals(gcEventSerial, parentGCEvent.getPhases().get(0), "phase event"); assertThat("total phases pause time", 0.0053923, closeTo(parentGCEvent.getPause(), 0.00001)); } @Test - public void addPhaseNonSerial() { + void addPhaseNonSerial() { ConcurrentGCEvent gcEventConcurrent = createConcurrentGcEvent(101.53, 0, 0, 0, 0.0053923, Type.UJL_ZGC_CONCURRENT_MARK); parentGCEvent.addPhase(gcEventConcurrent); - assertEquals("size of phases list", 1, parentGCEvent.getPhases().size()); - assertEquals("phase event", gcEventConcurrent, parentGCEvent.getPhases().get(0)); + assertEquals(1, parentGCEvent.getPhases().size(), "size of phases list"); + assertEquals(gcEventConcurrent, parentGCEvent.getPhases().get(0), "phase event"); assertThat("total phases pause time", 0d, closeTo(parentGCEvent.getPause(), 0.00001)); } @Test - public void addMultiplePhases() { + void addMultiplePhases() { GCEvent gcEventSerialMarkStart = createGcEventUJL(101.53, 0, 0, 0, 0.0053923, Type.UJL_ZGC_PAUSE_MARK_START); GCEvent gcEventSerialMarkEnd = createGcEventUJL(107.67, 0, 0, 0, 0.0037829, Type.UJL_ZGC_PAUSE_MARK_END); GCEvent gcEventSerialRelocateStart = createGcEventUJL(108.17, 0, 0, 0, 0.0061948, Type.UJL_ZGC_PAUSE_RELOCATE_START); @@ -59,12 +58,12 @@ public void addMultiplePhases() { parentGCEvent.addPhase(gcEventConcurrentMark); parentGCEvent.addPhase(gcEventConcurrentRelocate); - assertEquals("size of phases list", 5, parentGCEvent.getPhases().size()); - assertEquals("phase event 1", gcEventSerialMarkStart, parentGCEvent.getPhases().get(0)); - assertEquals("phase event 2", gcEventSerialMarkEnd, parentGCEvent.getPhases().get(1)); - assertEquals("phase event 3", gcEventSerialRelocateStart, parentGCEvent.getPhases().get(2)); - assertEquals("phase event 4", gcEventConcurrentMark, parentGCEvent.getPhases().get(3)); - assertEquals("phase event 5", gcEventConcurrentRelocate, parentGCEvent.getPhases().get(4)); + assertEquals(5, parentGCEvent.getPhases().size(), "size of phases list"); + assertEquals(gcEventSerialMarkStart, parentGCEvent.getPhases().get(0), "phase event 1"); + assertEquals(gcEventSerialMarkEnd, parentGCEvent.getPhases().get(1), "phase event 2"); + assertEquals(gcEventSerialRelocateStart, parentGCEvent.getPhases().get(2), "phase event 3"); + assertEquals(gcEventConcurrentMark, parentGCEvent.getPhases().get(3), "phase event 4"); + assertEquals(gcEventConcurrentRelocate, parentGCEvent.getPhases().get(4), "phase event 5"); assertThat("total phases pause time", 0.01537, closeTo(parentGCEvent.getPause(), 0.00001)); } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCModel.java b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCModel.java index b387ab4f..662ba0f0 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCModel.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCModel.java @@ -1,8 +1,8 @@ package com.tagtraum.perf.gcviewer.model; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.IOException; import java.time.Instant; @@ -18,14 +18,15 @@ import com.tagtraum.perf.gcviewer.imp.DataReaderFacade; import com.tagtraum.perf.gcviewer.math.DoubleData; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Specific tests for {@link GCModel} implementation. */ -public class TestGCModel { +class TestGCModel { + @Test - public void fullGcInterval() throws Exception { + void fullGcInterval() { GCModel gcModel = new GCModel(); gcModel.add(new GCEvent(1.0, 10, 5, 100, 0.1, Type.GC)); gcModel.add(new GCEvent(2.0, 10, 5, 100, 0.1, Type.GC)); @@ -42,7 +43,7 @@ public void fullGcInterval() throws Exception { } @Test - public void testEquals_ForIdenticalModels() throws IOException, ExecutionException, InterruptedException, DataReaderException { + void testEquals_ForIdenticalModels() throws IOException, ExecutionException, InterruptedException, DataReaderException { // load model twice, should be identical GCResource gcResource = new GcResourceFile(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); DataReaderFacade dataReader = new DataReaderFacade(); @@ -53,12 +54,12 @@ public void testEquals_ForIdenticalModels() throws IOException, ExecutionExcepti } @Test - public void testEquals_ForEmptyModels() { + void testEquals_ForEmptyModels() { assertThat(new GCModel(), is(new GCModel())); } @Test - public void testGetStartDate_WhenNeitherDateNorTimeStampsAreAvailable() throws Exception { + void testGetStartDate_WhenNeitherDateNorTimeStampsAreAvailable() throws Exception { GCModel model = new GCModel(); model.setURL(UnittestHelper.getResource(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); @@ -66,7 +67,7 @@ public void testGetStartDate_WhenNeitherDateNorTimeStampsAreAvailable() throws E } @Test - public void testGetStartDate_WhenDateStampsAreAvailable() throws Exception { + void testGetStartDate_WhenDateStampsAreAvailable() throws Exception { DataReaderFacade dataReader = new DataReaderFacade(); GCModel model = dataReader.loadModel(new GcResourceFile(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMSAdaptiveSizePolicy.txt"))); @@ -75,7 +76,7 @@ public void testGetStartDate_WhenDateStampsAreAvailable() throws Exception { } @Test - public void testGetStartDate_WhenNoDateButTimestampsAreAvailable() throws Exception { + void testGetStartDate_WhenNoDateButTimestampsAreAvailable() throws Exception { DataReaderFacade dataReader = new DataReaderFacade(); GcResourceFile gcResource = new GcResourceFile(UnittestHelper.getResourceAsString(FOLDER.OPENJDK, "SampleSun1_6_0CMS.txt")); GCModel model = dataReader.loadModel(gcResource); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCResource.java b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCResource.java index 7c765aae..009359d6 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCResource.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGCResource.java @@ -1,21 +1,21 @@ package com.tagtraum.perf.gcviewer.model; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.RandomAccessFile; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; /** * @author Joerg Wuethrich

created on: 19.08.2015

*/ -public class TestGCResource { +class TestGCResource { @Test - public void hasUnderlyingResourceChanged() throws Exception { + void hasUnderlyingResourceChanged() throws Exception { File testFile = File.createTempFile("GCResourceUnittest", ".txt"); try { try (RandomAccessFile file = new RandomAccessFile(testFile, "rws")) { diff --git a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGcEvent.java b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGcEvent.java index 79c75f10..c4dc7f7e 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/model/TestGcEvent.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/model/TestGcEvent.java @@ -1,14 +1,14 @@ package com.tagtraum.perf.gcviewer.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; - import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.ExtendedType; import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Tests for class {@link GCEvent}. @@ -16,13 +16,13 @@ * @author Joerg Wuethrich *

created on: 04.02.2012

*/ -public class TestGcEvent { +class TestGcEvent { private GCEvent gcEvent; private GCEvent fullGcEvent; - @Before - public void setUp() { + @BeforeEach + void setUp() { // 87.707: [GC 87.707: [DefNew: 139904K->5655K(157376K), 0.0543079 secs] 194540K->60292K(506944K), 0.0544020 secs] [Times: user=0.03 sys=0.02, real=0.06 secs] gcEvent = new GCEvent(87.707, 194540, 60292, 506944, 0.0544020, Type.GC); GCEvent defNewEvent = new GCEvent(87.707, 139904, 5655, 157376, 0.0543079, Type.DEF_NEW); @@ -37,57 +37,57 @@ public void setUp() { } @Test - public void testAddGc() { + void testAddGc() { // when GC was parsed, only "young" information really is present; "tenured" must be inferred - assertEquals("number of details", 1, gcEvent.details.size()); + assertEquals(1, gcEvent.details.size(), "number of details"); GCEvent defNewEvent = gcEvent.details().next(); - assertEquals("type", Type.DEF_NEW.getName(), defNewEvent.getExtendedType().getName()); - assertEquals("getYoung", defNewEvent, gcEvent.getYoung()); + assertEquals(Type.DEF_NEW.getName(), defNewEvent.getExtendedType().getName(), "type"); + assertEquals(defNewEvent, gcEvent.getYoung(), "getYoung"); GCEvent tenured = gcEvent.getTenured(); - assertNotNull("tenured", tenured); + assertNotNull(tenured, "tenured"); } @Test - public void testAddFullGc() { + void testAddFullGc() { // when Full GC was parsed, "young" information was deferred, other were parsed. - assertEquals("number of details", 2, fullGcEvent.details.size()); + assertEquals(2, fullGcEvent.details.size(), "number of details"); GCEvent tenured = fullGcEvent.details.get(0); - assertEquals("type", Type.TENURED.getName(), tenured.getExtendedType().getName()); - assertEquals("getTenured", tenured, fullGcEvent.getTenured()); + assertEquals(Type.TENURED.getName(), tenured.getExtendedType().getName(), "type"); + assertEquals(tenured, fullGcEvent.getTenured(), "getTenured"); GCEvent perm = fullGcEvent.details.get(1); - assertEquals("type", Type.PERM.getName(), perm.getExtendedType().getName()); - assertEquals("getPerm", perm, fullGcEvent.getPerm()); + assertEquals(Type.PERM.getName(), perm.getExtendedType().getName(), "type"); + assertEquals(perm, fullGcEvent.getPerm(), "getPerm"); GCEvent young = fullGcEvent.getYoung(); - assertNotNull("young", young); + assertNotNull(young, "young"); } @Test - public void testGetInferredYoungFullGcEvent() { + void testGetInferredYoungFullGcEvent() { GCEvent young = fullGcEvent.getYoung(); - assertEquals("type", ExtendedType.UNDEFINED, young.getExtendedType()); - assertEquals("preused", 141564 - 38156, young.getPreUsed()); - assertEquals("postused", 54636 - 54636, young.getPostUsed()); - assertEquals("total", 506944 - 349568, young.getTotal()); - assertEquals("pause", 0.6013150, young.getPause(), 0.00000001); + assertEquals(ExtendedType.UNDEFINED, young.getExtendedType(), "type"); + assertEquals(141564 - 38156, young.getPreUsed(), "preused"); + assertEquals(54636 - 54636, young.getPostUsed(), "postused"); + assertEquals(506944 - 349568, young.getTotal(), "total"); + assertEquals(0.6013150, young.getPause(), 0.00000001, "pause"); } @Test - public void testGetInferredTenuredGcEvent() { + void testGetInferredTenuredGcEvent() { GCEvent tenured = gcEvent.getTenured(); - assertEquals("tenured type", ExtendedType.UNDEFINED, tenured.getExtendedType()); - assertEquals("preused", 194540 - 139904, tenured.getPreUsed()); - assertEquals("postused", 60292 - 5655, tenured.getPostUsed()); - assertEquals("total tenured", 506944 - 157376, tenured.getTotal()); - assertEquals("pause", 0.0543079, tenured.getPause(), 0.000001); + assertEquals(ExtendedType.UNDEFINED, tenured.getExtendedType(), "tenured type"); + assertEquals(194540 - 139904, tenured.getPreUsed(), "preused"); + assertEquals(60292 - 5655, tenured.getPostUsed(), "postused"); + assertEquals(506944 - 157376, tenured.getTotal(), "total tenured"); + assertEquals(0.0543079, tenured.getPause(), 0.000001, "pause"); } @Test - public void testCloneAndMerge() throws Exception { + void testCloneAndMerge() { // 87.707: [GC 87.707: [DefNew: 139904K->5655K(157376K), 0.0543079 secs] 194540K->60292K(506944K), 0.0544020 secs] [Times: user=0.03 sys=0.02, real=0.06 secs] // 83.403: [Full GC 83.403: [Tenured: 38156K->54636K(349568K), 0.6013150 secs] 141564K->54636K(506944K), [Perm : 73727K->73727K(73728K)], 0.6014256 secs] [Times: user=0.58 sys=0.00, real=0.59 secs] GCEvent detailEvent1 = new GCEvent(0.01, 100, 90, 1000, 0.25, Type.G1_YOUNG); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/util/TestHttpUrlConnectionHelper.java b/src/test/java/com/tagtraum/perf/gcviewer/util/TestHttpUrlConnectionHelper.java index 5ea479e9..e47c644b 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/util/TestHttpUrlConnectionHelper.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/util/TestHttpUrlConnectionHelper.java @@ -1,9 +1,9 @@ package com.tagtraum.perf.gcviewer.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -25,9 +25,9 @@ import java.nio.file.Paths; import com.tagtraum.perf.gcviewer.UnittestHelper.FOLDER; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestHttpUrlConnectionHelper { +class TestHttpUrlConnectionHelper { private static final String SAMPLE_GCLOG_SUN1_6_0 = "SampleSun1_6_0PrintHeapAtGC.txt"; private static final String SAMPLE_GCLOG_SUN1_6_0_GZ = SAMPLE_GCLOG_SUN1_6_0 + ".gz"; @@ -49,9 +49,9 @@ private ByteArrayInputStream create404InputStream() { return new ByteArrayInputStream(sb.toString().getBytes()); } - + @Test - public void openInputStream404GzipEncoding() throws Exception { + void openInputStream404GzipEncoding() throws Exception { String filename = SAMPLE_GCLOG_SUN1_6_0 + "xx"; File file = new File(PARENT_PATH, filename); String contentType = null; @@ -61,7 +61,7 @@ public void openInputStream404GzipEncoding() throws Exception { } @Test - public void openInputStream404NoEncoding() throws Exception { + void openInputStream404NoEncoding() throws Exception { String filename = SAMPLE_GCLOG_SUN1_6_0 + "xx"; File file = new File(PARENT_PATH, filename); String contentEncoding = null; @@ -71,7 +71,7 @@ public void openInputStream404NoEncoding() throws Exception { } @Test - public void openInputStreamGZipOk() throws Exception { + void openInputStreamGZipOk() throws Exception { String filename = SAMPLE_GCLOG_SUN1_6_0_GZ; File file = new File(PARENT_PATH, filename); String contentEncoding = HttpUrlConnectionHelper.GZIP; @@ -80,7 +80,7 @@ public void openInputStreamGZipOk() throws Exception { } @Test - public void openInputStreamOk() throws Exception { + void openInputStreamOk() throws Exception { String filename = SAMPLE_GCLOG_SUN1_6_0; File file = new File(PARENT_PATH, filename); String contentEncoding = null; @@ -149,7 +149,7 @@ private void testOpenInputStreamOk(File file, verify(conn, atLeastOnce()).connect(); if (acceptEncoding == null) { - assertEquals("openInputStream(conn, null) returns non-encoded stream", fis, in); + assertEquals(fis, in, "openInputStream(conn, null) returns non-encoded stream"); } else { assertInputStreamEqualToFile("openInputStream(conn," + acceptEncoding + ")", expectedFile, in); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/util/TestLocalisationHelper.java b/src/test/java/com/tagtraum/perf/gcviewer/util/TestLocalisationHelper.java index ca40bf71..b04f174c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/util/TestLocalisationHelper.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/util/TestLocalisationHelper.java @@ -1,11 +1,11 @@ package com.tagtraum.perf.gcviewer.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; import java.util.Locale; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for class {@link LocalisationHelper}. @@ -13,21 +13,21 @@ * @author Joerg Wuethrich *

created on: 13.09.2013

*/ -public class TestLocalisationHelper { +class TestLocalisationHelper { @Test - public void getStringWithoutParams() { + void getStringWithoutParams() { String stringWithPlaceholders = LocalisationHelper.getString("datareader_parseerror_dialog_message"); - assertTrue("{0} is not present in string", stringWithPlaceholders.indexOf("{0}") >= 0); + assertTrue(stringWithPlaceholders.indexOf("{0}") >= 0, "{0} is not present in string"); } @Test - public void getStringWithParams() { + void getStringWithParams() { Locale.setDefault(Locale.FRENCH); String stringWithoutPlaceholders = LocalisationHelper.getString("datareader_parseerror_dialog_message", "#1", "#2"); - assertFalse("{0} should not be present in string", stringWithoutPlaceholders.indexOf("{0}") >= 0); - assertTrue("#1 is not present in string", stringWithoutPlaceholders.indexOf("#1") >= 0); + assertFalse(stringWithoutPlaceholders.indexOf("{0}") >= 0, "{0} should not be present in string"); + assertTrue(stringWithoutPlaceholders.indexOf("#1") >= 0, "#1 is not present in string"); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/util/TestNumberParser.java b/src/test/java/com/tagtraum/perf/gcviewer/util/TestNumberParser.java index 14320c5e..47871c06 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/util/TestNumberParser.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/util/TestNumberParser.java @@ -1,66 +1,67 @@ package com.tagtraum.perf.gcviewer.util; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Test methods of {@link NumberParser}. */ -public class TestNumberParser { +class TestNumberParser { @Test - public void testParseIntString() throws Exception { + void testParseIntString() { int result = NumberParser.parseInt("1442450944"); - Assert.assertThat("string int", result, Matchers.is(1442450944)); + assertThat("string int", result, Matchers.is(1442450944)); } @Test - public void testParseIntStringNegative() throws Exception { + void testParseIntStringNegative() { int result = NumberParser.parseInt("-1442450944"); - Assert.assertThat("string negative int", result, Matchers.is(-1442450944)); + assertThat("string negative int", result, Matchers.is(-1442450944)); } @Test - public void testParseIntChar() throws Exception { + void testParseIntChar() { int result = NumberParser.parseInt(new char[] {'1', '4', '4', '2', '4', '5', '0', '9', '4', '4'}, 0, 10); - Assert.assertThat("char int", result, Matchers.is(1442450944)); + assertThat("char int", result, Matchers.is(1442450944)); } @Test - public void testParseIntCharNegative() throws Exception { + void testParseIntCharNegative() { int result = NumberParser.parseInt(new char[] {'-', '1', '4', '4', '2', '4', '5', '0', '9', '4', '4'}, 0, 11); - Assert.assertThat("char negative int", result, Matchers.is(-1442450944)); + assertThat("char negative int", result, Matchers.is(-1442450944)); } - @Test(expected = NumberFormatException.class) - public void testParseIntTooLarge() throws Exception { - NumberParser.parseInt("6442450944"); + @Test + void testParseIntTooLarge() { + assertThrows(NumberFormatException.class, () -> NumberParser.parseInt("6442450944")); } @Test - public void testParseLongString() throws Exception { + void testParseLongString() { long result = NumberParser.parseLong("6442450944"); - Assert.assertThat("string long", result, Matchers.is(6442450944L)); + assertThat("string long", result, Matchers.is(6442450944L)); } @Test - public void testParseLongStringNegative() throws Exception { + void testParseLongStringNegative() { long result = NumberParser.parseLong("-6442450944"); - Assert.assertThat("string negative long", result, Matchers.is(-6442450944L)); - + assertThat("string negative long", result, Matchers.is(-6442450944L)); } @Test - public void testParseLongChar() throws Exception { + void testParseLongChar() { long result = NumberParser.parseLong(new char[] {'6', '4', '4', '2', '4', '5', '0', '9', '4', '4'}, 0, 10); - Assert.assertThat("char long", result, Matchers.is(6442450944L)); + assertThat("char long", result, Matchers.is(6442450944L)); } @Test - public void testParseLongCharNegative() throws Exception { + void testParseLongCharNegative() throws Exception { long result = NumberParser.parseLong(new char[] {'-', '6', '4', '4', '2', '4', '5', '0', '9', '4', '4'}, 0, 11); - Assert.assertThat("char negative long", result, Matchers.is(-6442450944L)); + assertThat("char negative long", result, Matchers.is(-6442450944L)); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/view/ModelChartImplTest.java b/src/test/java/com/tagtraum/perf/gcviewer/view/ModelChartImplTest.java index 85c42c91..b09b6251 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/view/ModelChartImplTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/view/ModelChartImplTest.java @@ -1,20 +1,18 @@ package com.tagtraum.perf.gcviewer.view; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import java.time.ZonedDateTime; -import java.util.Date; +import java.util.stream.Stream; -import org.junit.experimental.theories.DataPoint; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; -import org.junit.runner.RunWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; import com.tagtraum.perf.gcviewer.math.DoubleData; import com.tagtraum.perf.gcviewer.model.GCModel; -import com.tagtraum.perf.gcviewer.view.ModelChartImpl; import com.tagtraum.perf.gcviewer.view.model.GCPreferences; /** @@ -23,28 +21,20 @@ * @author xylu *

created on: 21.02.2014

*/ -@RunWith(Theories.class) -public class ModelChartImplTest { - - @DataPoint - public static TestCase HAS_DATE_STAMP_DATE_STAMP_TURNED_ON_IN_PREF - = new TestCase().withDateStamp(true).withShowDateStamp(true).withExpectedShowDateStamp(true); - - @DataPoint - public static TestCase HAS_DATE_STAMP_DATE_STAMP_TURNED_OFF_IN_PREF - = new TestCase().withDateStamp(true).withShowDateStamp(false).withExpectedShowDateStamp(false); - - @DataPoint - public static TestCase NO_DATE_STAMP_DATE_STAMP_TURNED_ON_IN_PREF - = new TestCase().withDateStamp(false).withShowDateStamp(true).withExpectedShowDateStamp(true); - - @DataPoint - public static TestCase NO_DATE_STAMP_DATE_STAMP_TURNED_OFF_IN_PREF - = new TestCase().withDateStamp(false).withShowDateStamp(false).withExpectedShowDateStamp(false); - - - @Theory - public void shouldShowOrNotDateStampAccordingToModelAndSettings(TestCase testCase) throws Exception { +class ModelChartImplTest { + + private static Stream getTestCases() { + return Stream.of( + Arguments.arguments(new TestCase().withDateStamp(true).withShowDateStamp(true).withExpectedShowDateStamp(true)), + Arguments.arguments(new TestCase().withDateStamp(true).withShowDateStamp(true).withExpectedShowDateStamp(true)), + Arguments.arguments(new TestCase().withDateStamp(false).withShowDateStamp(true).withExpectedShowDateStamp(true)), + Arguments.arguments(new TestCase().withDateStamp(false).withShowDateStamp(false).withExpectedShowDateStamp(false)) + ); + } + + @ParameterizedTest + @MethodSource("getTestCases") + public void shouldShowOrNotDateStampAccordingToModelAndSettings(TestCase testCase) { //given ModelChartImpl modelChart = new ModelChartImpl(); GCPreferences preferences = new GCPreferences(); @@ -59,7 +49,6 @@ public void shouldShowOrNotDateStampAccordingToModelAndSettings(TestCase testCas //then assertThat(modelChart.isShowDateStamp(), equalTo(testCase.isExpectedShowDateStamp())); - } private static class TestCase { diff --git a/src/test/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanelTest.java b/src/test/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanelTest.java index 4d08afab..435dbb3c 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanelTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/view/ModelMetricsPanelTest.java @@ -1,11 +1,10 @@ package com.tagtraum.perf.gcviewer.view; -import org.junit.Test; - import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Type; import com.tagtraum.perf.gcviewer.model.GCEvent; import com.tagtraum.perf.gcviewer.model.GCModel; import com.tagtraum.perf.gcviewer.model.VmOperationEvent; +import org.junit.jupiter.api.Test; /** * Test {@link ModelMetricsPanel}. The tests all just check that no Exception occurs. @@ -13,17 +12,17 @@ * @author Joerg Wuethrich *

created on: 25.01.2012

*/ -public class ModelMetricsPanelTest { +class ModelMetricsPanelTest { @Test - public void testEmptyModel() { + void testEmptyModel() { GCModel model = new GCModel(); ModelMetricsPanel panel = new ModelMetricsPanel(); panel.setModel(model); } @Test - public void testOneElementModel() { + void testOneElementModel() { GCEvent event = new GCEvent(); event.setTimestamp(0.5); event.setType(Type.G1_YOUNG_INITIAL_MARK); @@ -43,7 +42,7 @@ public void testOneElementModel() { } @Test - public void testVmOpModel() { + void testVmOpModel() { GCEvent event = new GCEvent(); event.setTimestamp(0.5); event.setType(Type.G1_YOUNG_INITIAL_MARK); @@ -69,7 +68,7 @@ public void testVmOpModel() { } @Test - public void testTwoElementsModel() { + void testTwoElementsModel() { GCModel model = new GCModel(); GCEvent event = new GCEvent(); diff --git a/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestGCResourceGroup.java b/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestGCResourceGroup.java index 0b7ce0f8..d1e6f353 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestGCResourceGroup.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestGCResourceGroup.java @@ -5,31 +5,29 @@ import com.tagtraum.perf.gcviewer.model.GCResource; import com.tagtraum.perf.gcviewer.model.GcResourceFile; import com.tagtraum.perf.gcviewer.model.GcResourceSeries; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test for {@link GCResourceGroup} class. */ -public class TestGCResourceGroup { - - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); +class TestGCResourceGroup { private List gcResourceList; - @Before - public void setup() { + @BeforeEach + void setup() { GCResource gcResource1 = new GcResourceFile("gcResource1"); gcResource1.getModel().add(new GCEvent(1.1, 100, 50, 200, 0.003, Type.GC)); @@ -42,7 +40,7 @@ public void setup() { } @Test - public void testGCResourceGroup_List() { + void testGCResourceGroup_List() { assertThat("has event before", gcResourceList.get(0).getModel().size(), is(1)); GCResourceGroup group = new GCResourceGroup(gcResourceList); assertThat("has still the event from before", gcResourceList.get(0).getModel().size(), is(1)); @@ -50,27 +48,34 @@ public void testGCResourceGroup_List() { } @Test - public void testGetGCResourceList_SingleFile() throws Exception { - File file = temporaryFolder.newFile(); + void testGetGCResourceList_SingleFile(@TempDir Path temporaryFolder) throws Exception { + File file = temporaryFolder.resolve("tempfile").toFile(); + assertTrue(file.createNewFile()); GCResourceGroup group = new GCResourceGroup(file.toURI().toURL().toString()); assertThat(group.getGCResourceList(), contains(new GcResourceFile(file))); } @Test - public void testGetGCResourceList_SeveralFiles() throws Exception { - File file1 = temporaryFolder.newFile(); - File file2 = temporaryFolder.newFile(); - File file3 = temporaryFolder.newFile(); + void testGetGCResourceList_SeveralFiles(@TempDir Path temporaryFolder) throws Exception { + File file1 = temporaryFolder.resolve("tempfile1").toFile(); + assertTrue(file1.createNewFile()); + File file2 = temporaryFolder.resolve("tempfile2").toFile(); + assertTrue(file2.createNewFile()); + File file3 = temporaryFolder.resolve("tempfile3").toFile(); + assertTrue(file3.createNewFile()); GCResourceGroup group = new GCResourceGroup(file1.toURI().toURL().toString() + ";" + file2.toURI().toURL().toString() + ";" + file3.toURI().toURL().toString()); assertThat(group.getGCResourceList(), contains(new GcResourceFile(file1), new GcResourceFile(file2), new GcResourceFile(file3))); } @Test - public void testGetGCResourceList_SingleSeries() throws Exception { - File file1 = temporaryFolder.newFile(); - File file2 = temporaryFolder.newFile(); - File file3 = temporaryFolder.newFile(); + void testGetGCResourceList_SingleSeries(@TempDir Path temporaryFolder) throws Exception { + File file1 = temporaryFolder.resolve("tempfile1").toFile(); + assertTrue(file1.createNewFile()); + File file2 = temporaryFolder.resolve("tempfile2").toFile(); + assertTrue(file2.createNewFile()); + File file3 = temporaryFolder.resolve("tempfile3").toFile(); + assertTrue(file3.createNewFile()); List resources = Arrays.asList(new GcResourceFile(file1), new GcResourceFile(file2), new GcResourceFile(file3)); GCResourceGroup group = new GCResourceGroup(file1.toURI().toURL().toString() + ">" + file2.toURI().toURL().toString() + ">" + file3.toURI().toURL().toString()); @@ -78,15 +83,21 @@ public void testGetGCResourceList_SingleSeries() throws Exception { } @Test - public void testGetGCResourceList_SeveralSeries() throws Exception { - File file1 = temporaryFolder.newFile(); - File file2 = temporaryFolder.newFile(); - File file3 = temporaryFolder.newFile(); + void testGetGCResourceList_SeveralSeries(@TempDir Path temporaryFolder) throws Exception { + File file1 = temporaryFolder.resolve("tempfile1").toFile(); + assertTrue(file1.createNewFile()); + File file2 = temporaryFolder.resolve("tempfile2").toFile(); + assertTrue(file2.createNewFile()); + File file3 = temporaryFolder.resolve("tempfile3").toFile(); + assertTrue(file3.createNewFile()); List resourcesForSeries1 = Arrays.asList(new GcResourceFile(file1), new GcResourceFile(file2), new GcResourceFile(file3)); - File file4 = temporaryFolder.newFile(); - File file5 = temporaryFolder.newFile(); - File file6 = temporaryFolder.newFile(); + File file4 = temporaryFolder.resolve("tempfile4").toFile(); + assertTrue(file4.createNewFile()); + File file5 = temporaryFolder.resolve("tempfile5").toFile(); + assertTrue(file5.createNewFile()); + File file6 = temporaryFolder.resolve("tempfile6").toFile(); + assertTrue(file6.createNewFile()); String resourceNameGroup1 = file1.toURI().toURL().toString() + ">" + file2.toURI().toURL().toString() + ">" + file3.toURI().toURL().toString(); String resourceNameGroup2 = file4.toURI().toURL().toString() + ">" + file5.toURI().toURL().toString() + ">" + file6.toURI().toURL().toString(); GCResourceGroup group = new GCResourceGroup(resourceNameGroup1 + ";" + resourceNameGroup2); @@ -95,7 +106,7 @@ public void testGetGCResourceList_SeveralSeries() throws Exception { } @Test - public void getUrlGroupString() { + void getUrlGroupString() { GCResourceGroup gcResourceGroup = new GCResourceGroup(gcResourceList); assertThat("starts with", gcResourceGroup.getUrlGroupString(), startsWith("file")); assertThat("contains resource 1", gcResourceGroup.getUrlGroupString(), containsString("gcResource1")); @@ -103,26 +114,26 @@ public void getUrlGroupString() { } @Test - public void getGroupStringShort2Elements() { + void getGroupStringShort2Elements() { GCResourceGroup gcResourceGroup = new GCResourceGroup(gcResourceList); assertThat(gcResourceGroup.getGroupStringShort(), equalTo("gcResource1;gcResource2;")); } @Test - public void getGroupStringShort1Element() { + void getGroupStringShort1Element() { GCResourceGroup gcResourceGroup = new GCResourceGroup("c:/temp/test/gc-log-file.log"); assertThat("should start with", gcResourceGroup.getGroupStringShort(), startsWith("file:/")); assertThat("should end with", gcResourceGroup.getGroupStringShort(), endsWith("/temp/test/gc-log-file.log")); } @Test - public void getGroupStringShort_Series() { + void getGroupStringShort_Series() { GCResourceGroup gcResourceGroup = new GCResourceGroup("file:/log1>file:/log2>file:/log3>file:/log4"); assertThat(gcResourceGroup.getGroupStringShort(), is("file:/log1 (series, 3 more files)")); } @Test - public void getGroupStringShort_SeveralSeries() { + void getGroupStringShort_SeveralSeries() { GCResourceGroup gcResourceGroup = new GCResourceGroup("file:/log1>file:/log2>file:/log3>file:/log4;file:/log5>file:/log6>file:/log7"); assertThat(gcResourceGroup.getGroupStringShort(), is("log1 (series, 3 more files);log5 (series, 2 more files);")); } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestRecentGCResourcesModel.java b/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestRecentGCResourcesModel.java index 8337e1ad..cc945c61 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestRecentGCResourcesModel.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/view/model/TestRecentGCResourcesModel.java @@ -1,18 +1,17 @@ package com.tagtraum.perf.gcviewer.view.model; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import java.net.MalformedURLException; import java.util.Arrays; import com.tagtraum.perf.gcviewer.model.GcResourceFile; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test class {@link RecentGCResourcesModel}. */ -public class TestRecentGCResourcesModel { +class TestRecentGCResourcesModel { /** * Return the missing part of a relative path compared to its absolute path. */ @@ -22,29 +21,29 @@ private String getPathExpansion() { } @Test - public void addString() throws MalformedURLException { + void addString() { RecentGCResourcesModel model = new RecentGCResourcesModel(); model.add("temp/test.log"); - Assert.assertThat("add first entry", model.getResourceNameGroups().size(), is(1)); + assertThat("add first entry", model.getResourceNameGroups().size(), is(1)); model.add("temp/test.log"); - Assert.assertThat("add identical entry", model.getResourceNameGroups().size(), is(1)); + assertThat("add identical entry", model.getResourceNameGroups().size(), is(1)); model.add("file:/" + getPathExpansion() + "temp/test.log"); - Assert.assertThat("add url entry of same file", model.getResourceNameGroups().size(), is(1)); + assertThat("add url entry of same file", model.getResourceNameGroups().size(), is(1)); } @Test - public void addList() { + void addList() { RecentGCResourcesModel model = new RecentGCResourcesModel(); model.add(Arrays.asList(new GcResourceFile("temp/test.log"))); - Assert.assertThat("add first entry", model.getResourceNameGroups().size(), is(1)); + assertThat("add first entry", model.getResourceNameGroups().size(), is(1)); model.add(Arrays.asList(new GcResourceFile("temp/test.log"))); - Assert.assertThat("add identical entry", model.getResourceNameGroups().size(), is(1)); + assertThat("add identical entry", model.getResourceNameGroups().size(), is(1)); model.add(Arrays.asList(new GcResourceFile("file:/" + getPathExpansion() + "temp/test.log"))); - Assert.assertThat("add url entry of same file", model.getResourceNameGroups().size(), is(1)); + assertThat("add url entry of same file", model.getResourceNameGroups().size(), is(1)); } } diff --git a/src/test/java/com/tagtraum/perf/gcviewer/view/util/ExtensionFileFilterTest.java b/src/test/java/com/tagtraum/perf/gcviewer/view/util/ExtensionFileFilterTest.java index 8b017e59..70675e63 100644 --- a/src/test/java/com/tagtraum/perf/gcviewer/view/util/ExtensionFileFilterTest.java +++ b/src/test/java/com/tagtraum/perf/gcviewer/view/util/ExtensionFileFilterTest.java @@ -1,48 +1,48 @@ package com.tagtraum.perf.gcviewer.view.util; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.io.File; -import org.junit.Before; -import org.junit.Test; - /** * @author Joerg Wuethrich *

created on: 01.08.2018

*/ -public class ExtensionFileFilterTest { +class ExtensionFileFilterTest { private ExtensionFileFilter extensionFileFilter; - @Before - public void setup() { + @BeforeEach + void setup() { extensionFileFilter = new ExtensionFileFilter("txt"); } @Test - public void description() { + void description() { assertThat("extension", extensionFileFilter.getDescription(), equalTo("*.txt")); } @Test - public void acceptFalse() { + void acceptFalse() { boolean doesAccept = extensionFileFilter.accept(new File("dummy-file-name")); assertThat("accepts", doesAccept, is(false)); } @Test - public void acceptTrue() { + void acceptTrue() { boolean doesAccept = extensionFileFilter.accept(new File("dummy-file-name.txt")); assertThat("accepts", doesAccept, is(true)); } @Test - public void acceptNull() { + void acceptNull() { assertThat("null parameter", extensionFileFilter.accept(null), is(false)); } }