X-Git-Url: https://git.hedgecode.org/?p=chesshog.git;a=blobdiff_plain;f=chesshog-format%2Fsrc%2Ftest%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fascii%2FASCIIBuilderTest.java;fp=src%2Ftest%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fascii%2FASCIIBuilderTest.java;h=2c5e177639ec83403f5efa4ef7127df6dd728fb5;hp=7c96f14df9ebb39a03e423896b863824bb243064;hb=3819e21945f32159d441ee441f2cd156fcd8389f;hpb=f1421939d7793592403888e95360eca9c6b4d77f diff --git a/src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java b/chesshog-format/src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java similarity index 86% rename from src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java rename to chesshog-format/src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java index 7c96f14..2c5e177 100644 --- a/src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java +++ b/chesshog-format/src/test/java/org/hedgecode/chess/ascii/ASCIIBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018. Developed by Hedgecode. + * Copyright (c) 2018-2019. Developed by Hedgecode. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import java.util.List; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -43,15 +44,15 @@ public class ASCIIBuilderTest extends AbstractPositionTest implements ASCIIPosit @Test public void testBuild() throws Exception { Builder asciiBuilder = ASCIIBuilder.getInstance(); - for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(TESTS)) { + for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(AbstractXMLConfigTest.TESTS)) { setPositionName( String.format( - MSG_ASCII_POSITION, testConfig.getString(NAME) + MSG_ASCII_POSITION, testConfig.getString(AbstractPositionTest.NAME) ) ); String ascii = testConfig.getString(ASCII_TAG); Position position = assignPosition( - testConfig.configurationAt(POSITION) + testConfig.configurationAt(AbstractPositionTest.POSITION) ); if (testConfig.containsKey(ASCII_TYPE)) { ASCII.setType( @@ -74,11 +75,11 @@ public class ASCIIBuilderTest extends AbstractPositionTest implements ASCIIPosit @Override protected void assertStringEquals(String expected, String actual) { - assertNotNull(expected); - assertNotNull(actual); + Assert.assertNotNull(expected); + Assert.assertNotNull(actual); String[] expectedLines = expected.split(LINE_REGEX); String[] actualLines = actual.split(LINE_REGEX); - assertEquals( + Assert.assertEquals( expectedLines.length, actualLines.length ); @@ -93,10 +94,10 @@ public class ASCIIBuilderTest extends AbstractPositionTest implements ASCIIPosit @Override public List getXMLPositions() throws Exception { List xmlPositions = new LinkedList<>(); - for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(TESTS)) { + for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(AbstractXMLConfigTest.TESTS)) { xmlPositions.add( new XMLConfiguration( - testConfig.configurationAt(POSITION) + testConfig.configurationAt(AbstractPositionTest.POSITION) ) ); }