diff --git a/build.gradle b/build.gradle index f7e2b42e8c..f17ed305c0 100644 --- a/build.gradle +++ b/build.gradle @@ -210,7 +210,7 @@ def bundled = [ "dita12": "https://github.com/dita-ot/org.oasis-open.dita.v1_2/archive/1.2.1.zip", "dita20": "https://github.com/dita-ot/dita/releases/download/2.0.0-20240115/org.oasis-open.dita.v2_0.zip", "dita20-techcomm": "https://github.com/dita-ot/dita-techcomm/releases/download/2.0.0-20240122/org.oasis-open.dita.techcomm.v2_0.zip", - "xdita": "https://github.com/oasis-tcs/dita-lwdita/releases/download/v0.3.0.1/org.oasis-open.xdita.v0_3_0.zip", + "xdita": "https://github.com/oasis-tcs/dita-lwdita/releases/download/v0.3.0.2/org.oasis-open.xdita.v0_3_2.zip", "index": "https://github.com/dita-ot/org.dita.index/releases/download/1.0.0/org.dita.index-1.0.0.zip", "axf": "https://github.com/dita-ot/org.dita.pdf2.axf/releases/download/3.6.1/org.dita.pdf2.axf-3.6.1.zip", "xep": "https://github.com/dita-ot/org.dita.pdf2.xep/releases/download/3.6.3/org.dita.pdf2.xep-3.6.3.zip", diff --git a/src/test/java/org/dita/dost/IntegrationTest.java b/src/test/java/org/dita/dost/IntegrationTest.java index 62e16a1b0b..e040084be6 100644 --- a/src/test/java/org/dita/dost/IntegrationTest.java +++ b/src/test/java/org/dita/dost/IntegrationTest.java @@ -131,33 +131,6 @@ public void testconrefend() throws Throwable { builder().name(Paths.get("conref", "conrefend")).transtype(PREPROCESS).input(Paths.get("range.ditamap")).test(); } - @Test - public void testmapref_topicrefID() throws Throwable { - builder() - .name(Paths.get("mapref", "mapref_topicrefID")) - .transtype(PREPROCESS) - .input(Paths.get("bookmap.ditamap")) - .test(); - } - - @Test - public void testmapref_to_conref() throws Throwable { - builder() - .name(Paths.get("mapref", "mapref_to_conref")) - .transtype(PREPROCESS) - .input(Paths.get("root.ditamap")) - .test(); - } - - @Test - public void testmapref_reltables() throws Throwable { - builder() - .name(Paths.get("mapref", "mapref_reltables")) - .transtype(PREPROCESS) - .input(Paths.get("main.ditamap")) - .test(); - } - @Test public void testcoderef_source() throws Throwable { builder() @@ -305,17 +278,6 @@ public void testkeyrefKeywordConref() throws Throwable { builder().name(Paths.get("keyref", "keyword_conref")).transtype(PREPROCESS).input(Paths.get("test.ditamap")).test(); } - @Test - public void testmapref() throws Throwable { - builder() - .name(Paths.get("mapref", "basic")) - .transtype(PREPROCESS) - .input(Paths.get("test.ditamap")) - .put("generate-debug-attributes", "false") - .errorCount(0) - .test(); - } - @Test public void testuplevelslink() throws Throwable { builder() diff --git a/src/test/java/org/dita/dost/IntegrationTestPreprocess2.java b/src/test/java/org/dita/dost/IntegrationTestPreprocess2.java index d62473d9ab..e075fc41f6 100644 --- a/src/test/java/org/dita/dost/IntegrationTestPreprocess2.java +++ b/src/test/java/org/dita/dost/IntegrationTestPreprocess2.java @@ -50,18 +50,6 @@ public void testconrefmissingfile() throws Throwable { .test(); } - @Test - public void testmapref() throws Throwable { - builder() - .name(Paths.get("mapref", "basic")) - .transtype(PREPROCESS) - .input(Paths.get("test.ditamap")) - .put("generate-debug-attributes", "false") - .errorCount(3) - .warnCount(1) - .test(); - } - @Disabled @Test public void testcopyto_linktarget() throws Throwable { diff --git a/src/test/java/org/dita/dost/IntegrationTestXhtml.java b/src/test/java/org/dita/dost/IntegrationTestXhtml.java index 88d133028c..3ecc7413c6 100644 --- a/src/test/java/org/dita/dost/IntegrationTestXhtml.java +++ b/src/test/java/org/dita/dost/IntegrationTestXhtml.java @@ -330,17 +330,6 @@ public void testlang() throws Throwable { .test(); } - @Test - public void testmapref() throws Throwable { - builder() - .name(Paths.get("mapref", "basic")) - .transtype(PREPROCESS) - .input(Paths.get("test.ditamap")) - .put("generate-debug-attributes", "false") - .errorCount(0) - .test(); - } - @Test public void testsubjectschema_case() throws Throwable { builder() diff --git a/src/test/java/org/dita/dost/TestUtils.java b/src/test/java/org/dita/dost/TestUtils.java index c79162ef83..3ffbb9d1f0 100644 --- a/src/test/java/org/dita/dost/TestUtils.java +++ b/src/test/java/org/dita/dost/TestUtils.java @@ -282,9 +282,13 @@ public static void assertXMLEqual(Document exp, Document act) { .build(); if (d.hasDifferences()) { try { - TransformerFactory.newInstance().newTransformer().transform(new DOMSource(act), new StreamResult(System.out)); - } catch (TransformerException e) { - throw new RuntimeException(e); + var transformerFactory = TransformerFactory.newInstance(); + transformerFactory.newTransformer().transform(new DOMSource(exp), new StreamResult(System.out)); + System.out.println(); + transformerFactory.newTransformer().transform(new DOMSource(act), new StreamResult(System.out)); + System.out.println(); + } catch (TransformerException ex) { + // } throw new AssertionError(d.toString()); } diff --git a/src/test/java/org/dita/dost/module/AbstractModuleTest.java b/src/test/java/org/dita/dost/module/AbstractModuleTest.java index 2e041c2e58..927f2ba54d 100644 --- a/src/test/java/org/dita/dost/module/AbstractModuleTest.java +++ b/src/test/java/org/dita/dost/module/AbstractModuleTest.java @@ -50,7 +50,7 @@ public abstract class AbstractModuleTest { @TempDir protected File tempBaseDir; - private final DocumentBuilder builder; + protected final DocumentBuilder builder; protected String testCase; protected Map params = Collections.emptyMap(); protected boolean parallel; @@ -226,15 +226,7 @@ private void compare(File actDir, File expDir, Store store) throws SAXException, } else { final Document expDoc = getDocument(exp); final Document actDoc = store.getDocument(act.toURI()); - // assertXMLEqual("Comparing " + exp + " to " + act + ":", - // expDoc, actDoc); - try { - assertXMLEqual(expDoc, actDoc); - } catch (AssertionError e) { - System.out.println(exp); - Files.copy(act.toPath(), System.out); - throw e; - } + assertXMLEqual(expDoc, actDoc); } } if (new File(expDir, ".job.xml").exists()) { diff --git a/src/test/java/org/dita/dost/module/MaprefModuleTest.java b/src/test/java/org/dita/dost/module/MaprefModuleTest.java new file mode 100644 index 0000000000..6a449ba559 --- /dev/null +++ b/src/test/java/org/dita/dost/module/MaprefModuleTest.java @@ -0,0 +1,79 @@ +/* + * This file is part of the DITA Open Toolkit project. + * + * Copyright 2024 Jarno Elovirta + * + * See the accompanying LICENSE file for applicable license. + */ + +package org.dita.dost.module; + +import static org.dita.dost.util.Constants.ANT_INVOKER_EXT_PARAM_STYLE; +import static org.dita.dost.util.Constants.ANT_INVOKER_EXT_PARAM_TRANSTYPE; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import org.dita.dost.pipeline.AbstractPipelineInput; +import org.dita.dost.pipeline.PipelineHashIO; +import org.dita.dost.store.CacheStore; +import org.dita.dost.store.Store; +import org.dita.dost.util.Configuration; +import org.dita.dost.util.Job; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.xml.sax.SAXException; + +class MaprefModuleTest extends AbstractModuleTest { + + @Override + protected AbstractPipelineInput getAbstractPipelineInput() { + final AbstractPipelineInput input = new PipelineHashIO(); + input.setAttribute(ANT_INVOKER_EXT_PARAM_TRANSTYPE, "html5"); + input.setAttribute( + ANT_INVOKER_EXT_PARAM_STYLE, + new File("src/main/plugins/org.dita.base/xsl/preprocess/mapref.xsl").getAbsolutePath() + ); + return input; + } + + @Override + protected AbstractPipelineModule getModule() { + return new MaprefModule(); + } + + @ParameterizedTest + @ValueSource(strings = { "basic", "mapref_reltables", "mapref_to_conref", "mapref_topicrefID" }) + public void process(String testCase) throws IOException { + this.testCase = testCase; + tempDir = new File(tempBaseDir, testCase); + job = new Job(tempDir, createStore()); + mode = Configuration.Mode.LAX; + chunkModule.setProcessingMode(mode); + test(); + } + + private Store createStore() throws IOException { + final CacheStore store = new CacheStore(tempDir, xmlUtils); + var srcDir = Paths.get(resourceDir.getAbsolutePath(), "src", testCase); + Files + .walk(srcDir) + .filter(Files::isRegularFile) + .filter(file -> !file.getFileName().toString().equals(".job.xml")) + .forEach(src -> { + try { + var dst = tempDir.toPath().resolve(srcDir.relativize(src)).toUri(); + var doc = builder.parse(src.toFile()); + doc.insertBefore( + doc.createProcessingInstruction("workdir-uri", dst.resolve(".").toString()), + doc.getDocumentElement() + ); + store.writeDocument(doc, dst); + } catch (IOException | SAXException e) { + throw new RuntimeException(e); + } + }); + return store; + } +} diff --git a/src/test/resources/MaprefModuleTest/exp/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap b/src/test/resources/MaprefModuleTest/exp/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap new file mode 100644 index 0000000000..f76e95920d --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap @@ -0,0 +1,70 @@ + + + + + + DITA Topic + Map + + + + + + + + DITA Topic + Map + + + + + + + + + DITA Topic + Map + + + + + + + DITA Topic + Map + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap b/src/test/resources/MaprefModuleTest/exp/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap new file mode 100644 index 0000000000..60a37d7099 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap @@ -0,0 +1,8 @@ + + + DITA Topic Map + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap b/src/test/resources/MaprefModuleTest/exp/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap new file mode 100644 index 0000000000..e5eb092d50 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap @@ -0,0 +1,8 @@ + + + DITA Topic Map + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap new file mode 100644 index 0000000000..0d0308de79 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap new file mode 100644 index 0000000000..f43b984805 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap new file mode 100644 index 0000000000..0f096fd64c --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap new file mode 100644 index 0000000000..73c86ec0e3 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap new file mode 100644 index 0000000000..fc6e057d84 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap @@ -0,0 +1,10 @@ + + + Target map + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap new file mode 100644 index 0000000000..4daaec9487 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap @@ -0,0 +1,11 @@ + + + Indirect Map + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap new file mode 100644 index 0000000000..809df63cf3 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap @@ -0,0 +1,23 @@ + + + Try the conref stuff + + + Indirect Map + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap new file mode 100644 index 0000000000..5b31726883 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap b/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap new file mode 100644 index 0000000000..b36e8950b3 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/exp/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/basic/.job.xml b/src/test/resources/MaprefModuleTest/src/basic/.job.xml new file mode 100644 index 0000000000..cac7369754 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/basic/.job.xml @@ -0,0 +1,174 @@ + + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/basic/src + + + plugins/org.dita.odt + + + plugins/org.dita.eclipsecontent + + + pdf;pdf2;tocjs;xhtml;eclipsehelp;html5;htmlhelp;javahelp;troff + + + plugins/org.dita.specialization.dita11 + + + topic + + + plugins/org.dita.wordrtf + + + org.dita.dost.reader.CustomXMLReader + + + plugins/org.dita.specialization.eclipsemap + + + plugins/org.dita.pdf + + + false + + + 58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap + + + plugins/org.dita.pdf2 + + + plugins/org.dita.specialization.dita132 + + + pdf2;pdf;legacypdf;odt + + + false + + + .pdf;.swf + + + plugins/org.dita.xhtml + + + plugins/org.dita.docbook + + + counter + + + false + + + plugins/org.dita.javahelp + + + + + + .htm;.html + + + 1.2 + + + .bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps + + + legacy + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/basic/src/test.ditamap + + + plugins/com.sophos.tocjs + + + plugins/org.dita.troff + + + true + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/basic/src/ + + + NOT_GENERATEOUTTER + + + nomerge + + + plugins/org.dita.eclipsehelp + + + /Users/jelovirt/Work/dita-ot/build/tmp/integrationTest/basic/out/preprocess2 + + + plugins/org.dita.htmlhelp + + + org.dita.dost.module.reader.HashTempFileScheme + + + plugins/org.dita.base + + + plugins;demo + + + usr.input.file.list + + + + + + WARN + + + relflagimage.list + + + 58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/basic/src/test.ditamap + + + plugins/org.dita.np + + + + + + plugins/org.dita-ot.html + + + 1.2.3 + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap b/src/test/resources/MaprefModuleTest/src/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap new file mode 100644 index 0000000000..b38361d5b7 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/basic/58807f59213f621bdceb4ea06ea7c2fc86ffc349.ditamap @@ -0,0 +1,18 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap b/src/test/resources/MaprefModuleTest/src/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap new file mode 100644 index 0000000000..60a37d7099 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/basic/907876965ae3c4f4a6a10fd90639d07d5b82d618.ditamap @@ -0,0 +1,8 @@ + + + DITA Topic Map + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap b/src/test/resources/MaprefModuleTest/src/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap new file mode 100644 index 0000000000..e5eb092d50 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/basic/f1de8cb986a52d8ed0133cb2cc44d4823f150e93.ditamap @@ -0,0 +1,8 @@ + + + DITA Topic Map + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_reltables/.job.xml b/src/test/resources/MaprefModuleTest/src/mapref_reltables/.job.xml new file mode 100644 index 0000000000..34daffc394 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_reltables/.job.xml @@ -0,0 +1,235 @@ + + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_reltables/src + + + plugins/org.dita.odt + + + plugins/org.dita.eclipsecontent + + + pdf;pdf2;tocjs;xhtml;eclipsehelp;html5;htmlhelp;javahelp;troff + + + plugins/org.dita.specialization.dita11 + + + topic + + + plugins/org.dita.wordrtf + + + org.dita.dost.reader.CustomXMLReader + + + plugins/org.dita.specialization.eclipsemap + + + plugins/org.dita.pdf + + + false + + + 2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap + + + plugins/org.dita.pdf2 + + + plugins/org.dita.specialization.dita132 + + + pdf2;pdf;legacypdf;odt + + + false + + + .pdf;.swf + + + plugins/org.dita.xhtml + + + plugins/org.dita.docbook + + + counter + + + false + + + plugins/org.dita.javahelp + + + + + + .htm;.html + + + 1.2 + + + .bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps + + + legacy + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_reltables/src/main.ditamap + + + plugins/com.sophos.tocjs + + + plugins/org.dita.troff + + + true + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_reltables/src/ + + + NOT_GENERATEOUTTER + + + nomerge + + + plugins/org.dita.eclipsehelp + + + /Users/jelovirt/Work/dita-ot/build/tmp/integrationTest/mapref_reltables/out/preprocess2 + + + plugins/org.dita.htmlhelp + + + org.dita.dost.module.reader.HashTempFileScheme + + + plugins/org.dita.base + + + plugins;demo + + + usr.input.file.list + + + + + + WARN + + + relflagimage.list + + + 2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_reltables/src/main.ditamap + + + plugins/org.dita.np + + + + + + plugins/org.dita-ot.html + + + 1.2.3 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap new file mode 100644 index 0000000000..ca88c2ee20 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_reltables/2579fca32778507faf1d0300d6b7b2fa2205cc76.ditamap @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap new file mode 100644 index 0000000000..f43b984805 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_reltables/50d2534ac23af573e9a8841cca99e8012596dd28.ditamap @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap new file mode 100644 index 0000000000..9bd002d656 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_reltables/903279a9031fdfa6dfe10756351109359cf43a66.ditamap @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap new file mode 100644 index 0000000000..73c86ec0e3 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_reltables/a45819c16ffeb82641204202dd90cde2717e4102.ditamap @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_to_conref/.job.xml b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/.job.xml new file mode 100644 index 0000000000..482dd31fb9 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/.job.xml @@ -0,0 +1,175 @@ + + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_to_conref/src + + + plugins/org.dita.odt + + + plugins/org.dita.eclipsecontent + + + pdf;pdf2;tocjs;xhtml;eclipsehelp;html5;htmlhelp;javahelp;troff + + + plugins/org.dita.specialization.dita11 + + + topic + + + plugins/org.dita.wordrtf + + + org.dita.dost.reader.CustomXMLReader + + + plugins/org.dita.specialization.eclipsemap + + + plugins/org.dita.pdf + + + false + + + 5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap + + + plugins/org.dita.pdf2 + + + plugins/org.dita.specialization.dita132 + + + pdf2;pdf;legacypdf;odt + + + false + + + .pdf;.swf + + + plugins/org.dita.xhtml + + + plugins/org.dita.docbook + + + counter + + + false + + + plugins/org.dita.javahelp + + + + + + .htm;.html + + + 1.2 + + + .bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps + + + legacy + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_to_conref/src/root.ditamap + + + plugins/com.sophos.tocjs + + + plugins/org.dita.troff + + + true + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_to_conref/src/ + + + NOT_GENERATEOUTTER + + + nomerge + + + plugins/org.dita.eclipsehelp + + + /Users/jelovirt/Work/dita-ot/build/tmp/integrationTest/mapref_to_conref/out/preprocess2 + + + plugins/org.dita.htmlhelp + + + org.dita.dost.module.reader.HashTempFileScheme + + + plugins/org.dita.base + + + plugins;demo + + + usr.input.file.list + + + + + + WARN + + + relflagimage.list + + + 5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_to_conref/src/root.ditamap + + + plugins/org.dita.np + + + + + + plugins/org.dita-ot.html + + + 1.2.3 + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap new file mode 100644 index 0000000000..fc6e057d84 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/33c3d6029eab40107aabdda4b76a4806cc73a3ab.ditamap @@ -0,0 +1,10 @@ + + + Target map + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap new file mode 100644 index 0000000000..4daaec9487 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/343b6f79877e237d9e99d7ccb7c2c297c7f731e2.ditamap @@ -0,0 +1,11 @@ + + + Indirect Map + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap new file mode 100644 index 0000000000..1e46c04445 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_to_conref/5c71ca762c07f0a2d7ff244e0d3dff1f99ad65f4.ditamap @@ -0,0 +1,9 @@ + + + Try the conref stuff + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/.job.xml b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/.job.xml new file mode 100644 index 0000000000..9b3b4de884 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/.job.xml @@ -0,0 +1,163 @@ + + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_topicrefID/src + + + plugins/org.dita.odt + + + plugins/org.dita.eclipsecontent + + + pdf;pdf2;tocjs;xhtml;eclipsehelp;html5;htmlhelp;javahelp;troff + + + plugins/org.dita.specialization.dita11 + + + topic + + + plugins/org.dita.wordrtf + + + org.dita.dost.reader.CustomXMLReader + + + plugins/org.dita.specialization.eclipsemap + + + plugins/org.dita.pdf + + + false + + + ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap + + + plugins/org.dita.pdf2 + + + plugins/org.dita.specialization.dita132 + + + pdf2;pdf;legacypdf;odt + + + false + + + .pdf;.swf + + + plugins/org.dita.xhtml + + + plugins/org.dita.docbook + + + counter + + + false + + + plugins/org.dita.javahelp + + + + + + .htm;.html + + + 1.2 + + + .bmp;.svg;.png;.tif;.jpg;.gif;.jpeg;.tiff;.eps + + + legacy + + + /Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_topicrefID/src/bookmap.ditamap + + + plugins/com.sophos.tocjs + + + plugins/org.dita.troff + + + true + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_topicrefID/src/ + + + NOT_GENERATEOUTTER + + + nomerge + + + plugins/org.dita.eclipsehelp + + + /Users/jelovirt/Work/dita-ot/build/tmp/integrationTest/mapref_topicrefID/out/preprocess2 + + + plugins/org.dita.htmlhelp + + + org.dita.dost.module.reader.HashTempFileScheme + + + plugins/org.dita.base + + + plugins;demo + + + usr.input.file.list + + + + + + WARN + + + relflagimage.list + + + ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap + + + file:/Users/jelovirt/Work/dita-ot/src/test/resources/mapref/mapref_topicrefID/src/bookmap.ditamap + + + plugins/org.dita.np + + + + + + plugins/org.dita-ot.html + + + 1.2.3 + + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap new file mode 100644 index 0000000000..5b31726883 --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/c4ccbe11b58d24a18ce41f7c9d44000cf9b7c282.ditamap @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap new file mode 100644 index 0000000000..9a8c892beb --- /dev/null +++ b/src/test/resources/MaprefModuleTest/src/mapref_topicrefID/ff698d09fad412d8af8bfdb6e5da6c2bed4f356f.ditamap @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess/fallback.dita b/src/test/resources/mapref/basic/exp/preprocess/fallback.dita deleted file mode 100644 index 980af50041..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess/fallback.dita +++ /dev/null @@ -1,6 +0,0 @@ - - Fallback - -

- - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess/fallback.ditamap b/src/test/resources/mapref/basic/exp/preprocess/fallback.ditamap deleted file mode 100644 index 5769677068..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess/fallback.ditamap +++ /dev/null @@ -1,4 +0,0 @@ - - DITA Topic Map - - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess/submap.ditamap b/src/test/resources/mapref/basic/exp/preprocess/submap.ditamap deleted file mode 100644 index 8f36dac314..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess/submap.ditamap +++ /dev/null @@ -1,4 +0,0 @@ - - DITA Topic Map - - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess/test.dita b/src/test/resources/mapref/basic/exp/preprocess/test.dita deleted file mode 100644 index 9d49ec7b24..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess/test.dita +++ /dev/null @@ -1,6 +0,0 @@ - - title - -

- - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess/test.ditamap b/src/test/resources/mapref/basic/exp/preprocess/test.ditamap deleted file mode 100644 index 2dc57c81a5..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess/test.ditamap +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - title - - title - - - - - - title - - title - - - - - title - - title - - - - - - title - - title - - - - - title - - title - - - - - - - - - - - diff --git a/src/test/resources/mapref/basic/exp/preprocess2/fallback.ditamap b/src/test/resources/mapref/basic/exp/preprocess2/fallback.ditamap deleted file mode 100644 index a89ede4ea8..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess2/fallback.ditamap +++ /dev/null @@ -1,4 +0,0 @@ - - DITA Topic Map - - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess2/submap.ditamap b/src/test/resources/mapref/basic/exp/preprocess2/submap.ditamap deleted file mode 100644 index 1901b184a4..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess2/submap.ditamap +++ /dev/null @@ -1,4 +0,0 @@ - - DITA Topic Map - - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess2/test.dita b/src/test/resources/mapref/basic/exp/preprocess2/test.dita deleted file mode 100644 index f28ded6001..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess2/test.dita +++ /dev/null @@ -1,6 +0,0 @@ - - title - -

- - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/exp/preprocess2/test.ditamap b/src/test/resources/mapref/basic/exp/preprocess2/test.ditamap deleted file mode 100644 index 538511182e..0000000000 --- a/src/test/resources/mapref/basic/exp/preprocess2/test.ditamap +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - title - - title - - - - - title - - title - - - - - title - - title - - - - - title - - title - - - - - title - - title - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/basic/src/fallback.dita b/src/test/resources/mapref/basic/src/fallback.dita deleted file mode 100644 index bc64ff7c2b..0000000000 --- a/src/test/resources/mapref/basic/src/fallback.dita +++ /dev/null @@ -1,8 +0,0 @@ - - - - Fallback - -

- - diff --git a/src/test/resources/mapref/basic/src/fallback.ditamap b/src/test/resources/mapref/basic/src/fallback.ditamap deleted file mode 100644 index c54870db8f..0000000000 --- a/src/test/resources/mapref/basic/src/fallback.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - - - DITA Topic Map - - diff --git a/src/test/resources/mapref/basic/src/submap.ditamap b/src/test/resources/mapref/basic/src/submap.ditamap deleted file mode 100644 index d1fd14e7de..0000000000 --- a/src/test/resources/mapref/basic/src/submap.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - - - DITA Topic Map - - diff --git a/src/test/resources/mapref/basic/src/test.dita b/src/test/resources/mapref/basic/src/test.dita deleted file mode 100644 index 2349ee8166..0000000000 --- a/src/test/resources/mapref/basic/src/test.dita +++ /dev/null @@ -1,8 +0,0 @@ - - - - title - -

- - diff --git a/src/test/resources/mapref/basic/src/test.ditamap b/src/test/resources/mapref/basic/src/test.ditamap deleted file mode 100644 index ecff544975..0000000000 --- a/src/test/resources/mapref/basic/src/test.ditamap +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-1.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-1.dita deleted file mode 100644 index 94018b68ad..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-1.dita +++ /dev/null @@ -1,5 +0,0 @@ - -First topic referenced from the main map -This is referenced from the main map. That's it. - -ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-2.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-2.dita deleted file mode 100644 index 74148f18a1..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-2.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Second topic in the main map -This is a peer of the first topic. It has children. - -Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-3.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-3.dita deleted file mode 100644 index 7a3d713f37..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-3.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Third topic in the main map -This is a child of the second map. It has children, and a mapref -child. - -Second topic in the main mapThis is a peer of the first topic. It has children.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-4.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-4.dita deleted file mode 100644 index efe9483488..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-4.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Fourth in the main map. Deepest level of nesting. Peer of mapref. -This is a child of the third item in the main map. It comes before -a mapref. - - Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-5.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-5.dita deleted file mode 100644 index ef8d9fd1bb..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-5.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Fifth item in main map - after mapref -This item comes after the mapref. It is a child of the third item. -It is a peer of the fourth item. - -Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-6.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-6.dita deleted file mode 100644 index 65d38017f7..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main-6.dita +++ /dev/null @@ -1,5 +0,0 @@ - -End of the main map -Final concept in the main map - -ibm: From the main mapPull a task up deep in the hierarchy (1)First of the task map, pulled up down in the hierarchySecond in the task mapsecond task in the task mapref thingNested item in the referenced taskmapThis is nested in the taskmap, which is the second referenced mapDeep down in the task hierarchynested down inside the task mapEnd of the task maplast item in the second task mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main.ditamap b/src/test/resources/mapref/mapref_reltables/exp/preprocess/main.ditamap deleted file mode 100644 index bd74f3ab3c..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/main.ditamap +++ /dev/null @@ -1,370 +0,0 @@ - - - - - First topic referenced from the main map - - First topic referenced from the main map - - This is referenced from the main map. That's it. - - - - - First in mapref1 - - First in mapref1 - - first topic in the first map that gets pulled in - - - - - Second topic in first mapref - - Second topic in first mapref - - second topic in the first mapref that gets pulled in. Top-level in this map. - - - - Nested topic from first mapref - - Nested topic from first mapref - - third topic in the first mapref, nested under second - - - - Fourth in first mapref! Really deep! - - Fourth in first mapref! Really deep! - - nested inside 3, which is inside 2, inside the first referenced map - - - - - - - End of first mapref, 3rd top-level - - End of first mapref, 3rd top-level - - 5th topic from first mapref, comes at the end - - - - - Second topic in the main map - - Second topic in the main map - - This is a peer of the first topic. It has children. - - - - Third topic in the main map - - Third topic in the main map - - This is a child of the second map. It has children, and a mapref child. - - - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - This is a child of the third item in the main map. It comes before a mapref. - - - - - Pull a task up deep in the hierarchy (1) - - Pull a task up deep in the hierarchy (1) - - First of the task map, pulled up down in the hierarchy - - - - - Second in the task map - - Second in the task map - - second task in the task mapref thing - - - - Nested item in the referenced taskmap - - Nested item in the referenced taskmap - - This is nested in the taskmap, which is the second referenced map - - - - Deep down in the task hierarchy - - Deep down in the task hierarchy - - nested down inside the task map - - - - - - - End of the task map - - End of the task map - - last item in the second task map - - - - - Fifth item in main map - after mapref - - Fifth item in main map - after mapref - - This item comes after the mapref. It is a child of the third item. It is a peer of the fourth item. - - - - - - - End of the main map - - End of the main map - - Final concept in the main map - - - - - - - - First topic referenced from the main map - - First topic referenced from the main map - - This is referenced from the main map. That's it. - - - - - Second topic in the main map - - Second topic in the main map - - This is a peer of the first topic. It has children. - - - - - Third topic in the main map - - Third topic in the main map - - This is a child of the second map. It has children, and a mapref child. - - - - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - This is a child of the third item in the main map. It comes before a mapref. - - - - - Fifth item in main map - after mapref - - Fifth item in main map - after mapref - - This item comes after the mapref. It is a child of the third item. It is a peer of the fourth item. - - - - - End of the main map - - End of the main map - - Final concept in the main map - - - - - - - ibm: From the main map - - ibm: From the main map - - - - - - - - - - - First topic referenced from the main map - - First topic referenced from the main map - - This is referenced from the main map. That's it. - - - - - Second topic in the main map - - Second topic in the main map - - This is a peer of the first topic. It has children. - - - - - Third topic in the main map - - Third topic in the main map - - This is a child of the second map. It has children, and a mapref child. - - - - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - Fourth in the main map. Deepest level of nesting. Peer of mapref. - - This is a child of the third item in the main map. It comes before a mapref. - - - - - Fifth item in main map - after mapref - - Fifth item in main map - after mapref - - This item comes after the mapref. It is a child of the third item. It is a peer of the fourth item. - - - - - End of the main map - - End of the main map - - Final concept in the main map - - - - - - - Pull a task up deep in the hierarchy (1) - - Pull a task up deep in the hierarchy (1) - - First of the task map, pulled up down in the hierarchy - - - - - Second in the task map - - Second in the task map - - second task in the task mapref thing - - - - - Nested item in the referenced taskmap - - Nested item in the referenced taskmap - - This is nested in the taskmap, which is the second referenced map - - - - - Deep down in the task hierarchy - - Deep down in the task hierarchy - - nested down inside the task map - - - - - End of the task map - - End of the task map - - last item in the second task map - - - - - - - First in mapref1 - - First in mapref1 - - first topic in the first map that gets pulled in - - - - - Second topic in first mapref - - Second topic in first mapref - - second topic in the first mapref that gets pulled in. Top-level in this map. - - - - - Nested topic from first mapref - - Nested topic from first mapref - - third topic in the first mapref, nested under second - - - - - Fourth in first mapref! Really deep! - - Fourth in first mapref! Really deep! - - nested inside 3, which is inside 2, inside the first referenced map - - - - - End of first mapref, 3rd top-level - - End of first mapref, 3rd top-level - - 5th topic from first mapref, comes at the end - - - - - - diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-1.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-1.dita deleted file mode 100644 index ab1a992bf7..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-1.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Pull a task up deep in the hierarchy (1) -First of the task map, pulled up down in the hierarchy - -First topic referenced from the main mapThis is referenced from the main map. That's it.Second topic in the main mapThis is a peer of the first topic. It has children.Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.End of the main mapFinal concept in the main mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-2.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-2.dita deleted file mode 100644 index 43af39dea4..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-2.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Second in the task map -second task in the task mapref thing - -First topic referenced from the main mapThis is referenced from the main map. That's it.Second topic in the main mapThis is a peer of the first topic. It has children.Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.End of the main mapFinal concept in the main mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-3.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-3.dita deleted file mode 100644 index b7cc8acb0b..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-3.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Nested item in the referenced taskmap -This is nested in the taskmap, which is the second referenced map - -First topic referenced from the main mapThis is referenced from the main map. That's it.Second topic in the main mapThis is a peer of the first topic. It has children.Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.End of the main mapFinal concept in the main mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-4.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-4.dita deleted file mode 100644 index ac8d8bc4ed..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-4.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Deep down in the task hierarchy -nested down inside the task map - -First topic referenced from the main mapThis is referenced from the main map. That's it.Second topic in the main mapThis is a peer of the first topic. It has children.Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.End of the main mapFinal concept in the main mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-5.dita b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-5.dita deleted file mode 100644 index 4245035c19..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2-5.dita +++ /dev/null @@ -1,5 +0,0 @@ - -End of the task map -last item in the second task map - -First topic referenced from the main mapThis is referenced from the main map. That's it.Second topic in the main mapThis is a peer of the first topic. It has children.Third topic in the main mapThis is a child of the second map. It has children, and a mapref child.Fourth in the main map. Deepest level of nesting. Peer of mapref.This is a child of the third item in the main map. It comes before a mapref.Fifth item in main map - after maprefThis item comes after the mapref. It is a child of the third item. It is a peer of the fourth item.End of the main mapFinal concept in the main mapFirst in mapref1first topic in the first map that gets pulled inSecond topic in first maprefsecond topic in the first mapref that gets pulled in. Top-level in this map.Nested topic from first maprefthird topic in the first mapref, nested under secondFourth in first mapref! Really deep!nested inside 3, which is inside 2, inside the first referenced mapEnd of first mapref, 3rd top-level5th topic from first mapref, comes at the end \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2.ditamap b/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2.ditamap deleted file mode 100644 index 983158f53b..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/mapref2.ditamap +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/exp/preprocess/reltable.ditamap b/src/test/resources/mapref/mapref_reltables/exp/preprocess/reltable.ditamap deleted file mode 100644 index 702f70a72c..0000000000 --- a/src/test/resources/mapref/mapref_reltables/exp/preprocess/reltable.ditamap +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-1.dita b/src/test/resources/mapref/mapref_reltables/src/main-1.dita deleted file mode 100644 index 9e05f62888..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-1.dita +++ /dev/null @@ -1,5 +0,0 @@ - -First topic referenced from the main map -This is referenced from the main map. That's it. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-2.dita b/src/test/resources/mapref/mapref_reltables/src/main-2.dita deleted file mode 100644 index fc34d451a3..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-2.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Second topic in the main map -This is a peer of the first topic. It has children. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-3.dita b/src/test/resources/mapref/mapref_reltables/src/main-3.dita deleted file mode 100644 index 14c2065af2..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-3.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Third topic in the main map -This is a child of the second map. It has children, and a mapref -child. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-4.dita b/src/test/resources/mapref/mapref_reltables/src/main-4.dita deleted file mode 100644 index 4e0769dd18..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-4.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Fourth in the main map. Deepest level of nesting. Peer of mapref. -This is a child of the third item in the main map. It comes before -a mapref. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-5.dita b/src/test/resources/mapref/mapref_reltables/src/main-5.dita deleted file mode 100644 index 741c1c6a4e..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-5.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Fifth item in main map - after mapref -This item comes after the mapref. It is a child of the third item. -It is a peer of the fourth item. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main-6.dita b/src/test/resources/mapref/mapref_reltables/src/main-6.dita deleted file mode 100644 index 7d2664f2ec..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main-6.dita +++ /dev/null @@ -1,5 +0,0 @@ - -End of the main map -Final concept in the main map - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/main.ditamap b/src/test/resources/mapref/mapref_reltables/src/main.ditamap deleted file mode 100644 index 48a83ea513..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/main.ditamap +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2-1.dita b/src/test/resources/mapref/mapref_reltables/src/mapref2-1.dita deleted file mode 100644 index d2f7284d1b..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2-1.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Pull a task up deep in the hierarchy (1) -First of the task map, pulled up down in the hierarchy - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2-2.dita b/src/test/resources/mapref/mapref_reltables/src/mapref2-2.dita deleted file mode 100644 index 61326ae43f..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2-2.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Second in the task map -second task in the task mapref thing - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2-3.dita b/src/test/resources/mapref/mapref_reltables/src/mapref2-3.dita deleted file mode 100644 index c2be6a3845..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2-3.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Nested item in the referenced taskmap -This is nested in the taskmap, which is the second referenced map - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2-4.dita b/src/test/resources/mapref/mapref_reltables/src/mapref2-4.dita deleted file mode 100644 index 6daf1d2b5f..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2-4.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Deep down in the task hierarchy -nested down inside the task map - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2-5.dita b/src/test/resources/mapref/mapref_reltables/src/mapref2-5.dita deleted file mode 100644 index 9b92a0ec10..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2-5.dita +++ /dev/null @@ -1,5 +0,0 @@ - -End of the task map -last item in the second task map - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/mapref2.ditamap b/src/test/resources/mapref/mapref_reltables/src/mapref2.ditamap deleted file mode 100644 index 1880ae588f..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/mapref2.ditamap +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/reltable.ditamap b/src/test/resources/mapref/mapref_reltables/src/reltable.ditamap deleted file mode 100644 index 86c84eb398..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/reltable.ditamap +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-1.dita b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-1.dita deleted file mode 100644 index 148621654b..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-1.dita +++ /dev/null @@ -1,5 +0,0 @@ - -First in mapref1 -first topic in the first map that gets pulled in - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-2.dita b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-2.dita deleted file mode 100644 index 30cbb4c0ea..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-2.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Second topic in first mapref -second topic in the first mapref that gets pulled in. Top-level -in this map. - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-3.dita b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-3.dita deleted file mode 100644 index 7caf0e62e7..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-3.dita +++ /dev/null @@ -1,5 +0,0 @@ - -Nested topic from first mapref -third topic in the first mapref, nested under second - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-4.dita b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-4.dita deleted file mode 100644 index 2a2893d61a..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-4.dita +++ /dev/null @@ -1,6 +0,0 @@ - -Fourth in first mapref! Really deep! -nested inside 3, which is inside 2, inside the first referenced -map - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-5.dita b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-5.dita deleted file mode 100644 index f3b35102f5..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1-5.dita +++ /dev/null @@ -1,5 +0,0 @@ - -End of first mapref, 3rd top-level -5th topic from first mapref, comes at the end - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1.ditamap b/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1.ditamap deleted file mode 100644 index 8adc1820d2..0000000000 --- a/src/test/resources/mapref/mapref_reltables/src/subdir/mapref1.ditamap +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/alsorealcontent.dita b/src/test/resources/mapref/mapref_to_conref/exp/preprocess/alsorealcontent.dita deleted file mode 100644 index 921132c627..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/alsorealcontent.dita +++ /dev/null @@ -1,7 +0,0 @@ - - INDIRECT REAL CONTENT HERE - -

Do I show up too? I'm only in the indirect map that's conref'ed into another map that's -pulled into the root map

- -Indirect container topic \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirect.ditamap b/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirect.ditamap deleted file mode 100644 index 8404e5ac75..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirect.ditamap +++ /dev/null @@ -1,8 +0,0 @@ - - Indirect Map - - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirectcontainer.dita b/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirectcontainer.dita deleted file mode 100644 index eef0a1c417..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/indirectcontainer.dita +++ /dev/null @@ -1,6 +0,0 @@ - - Indirect container topic - -

See if stuff appears in here

- -INDIRECT REAL CONTENT HERE \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/root.ditamap b/src/test/resources/mapref/mapref_to_conref/exp/preprocess/root.ditamap deleted file mode 100644 index 7e8478ce53..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/root.ditamap +++ /dev/null @@ -1,3 +0,0 @@ -Try the conref stuff -Indirect container topicIndirect container topicINDIRECT REAL CONTENT HEREINDIRECT REAL CONTENT HERE - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/targetmap.ditamap b/src/test/resources/mapref/mapref_to_conref/exp/preprocess/targetmap.ditamap deleted file mode 100644 index dcecccb7e3..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/exp/preprocess/targetmap.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - Target map - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_to_conref/src/alsorealcontent.dita b/src/test/resources/mapref/mapref_to_conref/src/alsorealcontent.dita deleted file mode 100644 index 97bf62ba66..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/src/alsorealcontent.dita +++ /dev/null @@ -1,9 +0,0 @@ - - - - INDIRECT REAL CONTENT HERE - -

Do I show up too? I'm only in the indirect map that's conref'ed into another map that's -pulled into the root map

- - diff --git a/src/test/resources/mapref/mapref_to_conref/src/indirect.ditamap b/src/test/resources/mapref/mapref_to_conref/src/indirect.ditamap deleted file mode 100644 index 1f3b8bc745..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/src/indirect.ditamap +++ /dev/null @@ -1,8 +0,0 @@ - - - - Indirect Map - - - - diff --git a/src/test/resources/mapref/mapref_to_conref/src/indirectcontainer.dita b/src/test/resources/mapref/mapref_to_conref/src/indirectcontainer.dita deleted file mode 100644 index 536ce401a2..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/src/indirectcontainer.dita +++ /dev/null @@ -1,8 +0,0 @@ - - - - Indirect container topic - -

See if stuff appears in here

- - diff --git a/src/test/resources/mapref/mapref_to_conref/src/root.ditamap b/src/test/resources/mapref/mapref_to_conref/src/root.ditamap deleted file mode 100644 index b5f7f55cc8..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/src/root.ditamap +++ /dev/null @@ -1,5 +0,0 @@ - - -Try the conref stuff - - diff --git a/src/test/resources/mapref/mapref_to_conref/src/targetmap.ditamap b/src/test/resources/mapref/mapref_to_conref/src/targetmap.ditamap deleted file mode 100644 index 80cbf58eae..0000000000 --- a/src/test/resources/mapref/mapref_to_conref/src/targetmap.ditamap +++ /dev/null @@ -1,8 +0,0 @@ - - - - Target map - - - - diff --git a/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/bookmap.ditamap b/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/bookmap.ditamap deleted file mode 100644 index 3733ee09ba..0000000000 --- a/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/bookmap.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/map.ditamap b/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/map.ditamap deleted file mode 100644 index 6bb55a47b0..0000000000 --- a/src/test/resources/mapref/mapref_topicrefID/exp/preprocess/map.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/test/resources/mapref/mapref_topicrefID/src/bookmap.ditamap b/src/test/resources/mapref/mapref_topicrefID/src/bookmap.ditamap deleted file mode 100644 index 5d9a375944..0000000000 --- a/src/test/resources/mapref/mapref_topicrefID/src/bookmap.ditamap +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/test/resources/mapref/mapref_topicrefID/src/map.ditamap b/src/test/resources/mapref/mapref_topicrefID/src/map.ditamap deleted file mode 100644 index 4a9dc60dcb..0000000000 --- a/src/test/resources/mapref/mapref_topicrefID/src/map.ditamap +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -