[LIB-9] Separate chesshog-format module

[chesshog.git] / chesshog-format / src / test / java / org / hedgecode / chess / wiki / WikiBuilderTest.java

diff --git a/src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.java b/chesshog-format/src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.java
similarity index 85%
rename from src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.java
rename to chesshog-format/src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.java
index cbb2f2c..3db948a 100644 (file)
--- a/src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.java
+++ b/chesshog-format/src/test/java/org/hedgecode/chess/wiki/WikiBuilderTest.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 WikiBuilderTest extends AbstractPositionTest implements WikiPositio
     @Test
     public void testBuild() throws Exception {
         Builder wikiBuilder = WikiBuilder.getInstance();
-        for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(TESTS)) {
+        for (HierarchicalConfiguration testConfig : getXMLConfig().configurationsAt(AbstractXMLConfigTest.TESTS)) {
             setPositionName(
                     String.format(
-                            MSG_WIKI_POSITION, testConfig.getString(NAME)
+                            MSG_WIKI_POSITION, testConfig.getString(AbstractPositionTest.NAME)
                     )
             );
             String wiki = testConfig.getString(WIKI_TAG);
             Position position = assignPosition(
-                    testConfig.configurationAt(POSITION)
+                    testConfig.configurationAt(AbstractPositionTest.POSITION)
             );
             boolean withTemplate = false;
             if (testConfig.containsKey(WIKI_TEMPLATE)) {
@@ -67,11 +68,11 @@ public class WikiBuilderTest extends AbstractPositionTest implements WikiPositio
 
     @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
         );
@@ -86,10 +87,10 @@ public class WikiBuilderTest extends AbstractPositionTest implements WikiPositio
     @Override
     public List<XMLConfiguration> getXMLPositions() throws Exception {
         List<XMLConfiguration> 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)
                     )
             );
         }