Specobject bugfixes

src/main/java/org/itsallcode/openfasttrace/core/SpecificationItem.java

@@ -46,7 +46,6 @@ public class SpecificationItem
 
     private SpecificationItem(final Builder builder)
     {
-        super();
         this.id = builder.id;
         this.title = builder.title;
         this.description = builder.description;

src/main/java/org/itsallcode/openfasttrace/core/SpecificationItemId.java

@@ -1,5 +1,7 @@
 package org.itsallcode.openfasttrace.core;
 
+import java.util.logging.Logger;
+
 /*-
  * #%L
  \* OpenFastTrace
@@ -35,6 +37,8 @@
 // [impl->dsn~specification-item-id~1]
 public class SpecificationItemId implements Comparable<SpecificationItemId>
 {
+    private static final Logger LOG = Logger.getLogger(SpecificationItemId.class.getName());
+
     public static final String UNKONWN_ARTIFACT_TYPE = "unkonwn";
     public static final String ITEM_REVISION_PATTERN = "(\\d+)";
     public static final String ITEM_NAME_PATTERN = "(\\p{Alpha}[\\w-]*(?:\\.\\p{Alpha}[\\w-]*)*)";
@@ -350,6 +354,9 @@ private void inferArtifactType()
             }
             else
             {
+                LOG.warning(() -> "Name '" + this.name + "' does not match legacy name pattern '"
+                        + LEGACY_NAME_PATTERN + "': using artifact type '" + UNKONWN_ARTIFACT_TYPE
+                        + "'.");
                 this.artifactType = UNKONWN_ARTIFACT_TYPE;
             }
         }

src/main/java/org/itsallcode/openfasttrace/exporter/specobject/SpecobjectExporter.java

@@ -199,7 +199,7 @@ private void writeCoveredIds(final List<SpecificationItemId> coveredIds)
         for (final SpecificationItemId coveredId : coveredIds)
         {
             this.writer.writeStartElement("provcov");
-            writeElement("linksto", coveredId.getName());
+            writeElement("linksto", coveredId.getArtifactType() + ":" + coveredId.getName());
             writeElement("dstversion", coveredId.getRevision());
             this.writer.writeEndElement();
         }

src/main/java/org/itsallcode/openfasttrace/importer/SpecificationListBuilder.java

@@ -168,7 +168,7 @@ public void setTitle(final String title)
     @Override
     public void setLocation(final String path, final int line)
     {
-        this.location = Location.create(path, line);
+        this.setLocation(Location.create(path, line));
     }
 
     @Override

src/main/java/org/itsallcode/openfasttrace/importer/specobject/handler/SingleSpecObjectsHandlerBuilder.java

@@ -104,17 +104,17 @@ private void rememberSourceFile(final String fileName)
         setContainedLocationIfComplete();
     }
 
+    private void rememberSourceLine(final int line)
+    {
+        this.containedLine = line;
+        setContainedLocationIfComplete();
+    }
+
     private void setContainedLocationIfComplete()
     {
         if (this.containedFileName != null && this.containedLine >= 1)
         {
             this.locationBuilder.path(this.containedFileName).line(this.containedLine);
         }
     }
-
-    private void rememberSourceLine(final int line)
-    {
-        this.containedLine = line;
-        setContainedLocationIfComplete();
-    }
 }

src/main/java/org/itsallcode/openfasttrace/importer/specobject/handler/SpecObjectsHandlerBuilder.java

@@ -71,8 +71,8 @@ private void handleStartElement(final TreeElement elem)
     private void handleEndElement()
     {
         this.listener.setId(this.idBuilder.build());
-        this.listener.endSpecificationItem();
         this.listener.setLocation(this.locationBuilder.build());
+        this.listener.endSpecificationItem();
         this.idBuilder = null;
         this.locationBuilder = null;
     }

src/test/java/org/itsallcode/openfasttrace/exporter/specobject/TestSpecobjectExporter.java

@@ -100,7 +100,7 @@ public void testExportSpecObjectWithOptionalElements() throws IOException, XMLSt
                 + "   </needscoverage>\n" //
                 + "   <providescoverage>\n" //
                 + "    <provcov>\n" //
-                + "     <linksto>covered</linksto>\n" //
+                + "     <linksto>feat:covered</linksto>\n" //
                 + "     <dstversion>1</dstversion>\n" //
                 + "    </provcov>\n" //
                 + "   </providescoverage>\n" //

src/test/java/org/itsallcode/openfasttrace/importer/input/StreamInput.java

@@ -23,6 +23,7 @@
  */
 
 import java.io.BufferedReader;
+import java.io.StringReader;
 import java.nio.file.Path;
 
 public class StreamInput implements InputFile
@@ -36,6 +37,21 @@ private StreamInput(final Path path, final BufferedReader reader)
         this.reader = reader;
     }
 
+    /**
+     * Create an {@link InputFile} for a given file content. This is useful for
+     * tests to avoid using real files.
+     * 
+     * @param path
+     *            a dummy path.
+     * @param content
+     *            the file content.
+     * @return an {@link InputFile}.
+     */
+    public static InputFile forContent(final Path path, final String content)
+    {
+        return forReader(path, new BufferedReader(new StringReader(content)));
+    }
+
     /**
      * Create an {@link InputFile} for a {@link BufferedReader}. This is useful
      * for tests to avoid using real files.

src/test/java/org/itsallcode/openfasttrace/importer/specobject/TestSpecobjectImportExport.java

@@ -0,0 +1,115 @@
+package org.itsallcode.openfasttrace.importer.specobject;
+
+/*-
+ * #%L
+ * OpenFastTrace
+ * %%
+ * Copyright (C) 2016 - 2018 itsallcode.org
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.itsallcode.openfasttrace.core.*;
+import org.itsallcode.openfasttrace.importer.Importer;
+import org.itsallcode.openfasttrace.importer.SpecificationListBuilder;
+import org.itsallcode.openfasttrace.importer.input.InputFile;
+import org.itsallcode.openfasttrace.importer.input.StreamInput;
+import org.junit.Test;
+
+import com.github.hamstercommunity.matcher.auto.AutoMatcher;
+
+public class TestSpecobjectImportExport
+{
+    @Test
+    public void testTraceContent()
+    {
+        final String content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //
+                + "<specdocument>\n" //
+                + "    <specobjects doctype=\"impl\">\n" //
+                + "        <specobject>\n" //
+                + "            <id>exampleB-3454416016</id>\n"
+                + "            <status>approved</status>\n" //
+                + "            <version>0</version>\n" //
+                + "            <sourcefile>source.java</sourcefile>\n" //
+                + "            <sourceline>1</sourceline>\n" //
+                + "            <providescoverage>\n" //
+                + "                <provcov>\n" //
+                + "                    <linksto>dsn:exampleB</linksto>\n"
+                + "                    <dstversion>1</dstversion>\n"
+                + "                </provcov>\n" //
+                + "            </providescoverage>\n" //
+                + "        </specobject>\n" //
+                + "    </specobjects>\n" //
+                + "    <specobjects doctype=\"dsn\">\n" //
+                + "        <specobject>\n" //
+                + "            <id>exampleB</id>\n" //
+                + "            <status>approved</status>\n" //
+                + "            <version>1</version>\n"
+                + "            <sourcefile>spec.md</sourcefile>\n"
+                + "            <sourceline>2</sourceline>\n"
+                + "            <description>Example requirement</description>\n"
+                + "            <needscoverage>\n" //
+                + "                <needsobj>utest</needsobj>\n"
+                + "                <needsobj>impl</needsobj>\n" //
+                + "            </needscoverage>\n" //
+                + "        </specobject>\n" //
+                + "    </specobjects>\n" //
+                + "</specdocument>";
+
+        final Trace trace = trace(content);
+        assertThat(trace.getItems(), hasSize(2));
+        assertThat(trace.getDefectItems(), hasSize(2));
+
+        final LinkedSpecificationItem tag = trace.getItems().get(0);
+        final LinkedSpecificationItem req = trace.getItems().get(1);
+
+        final SpecificationItem expectedTag = new SpecificationItem.Builder()
+                .id("impl", "exampleB-3454416016", 0).location("source.java", 1)
+                .status(ItemStatus.APPROVED).addCoveredId("dsn", "exampleB", 1).build();
+        final SpecificationItem expectedReq = new SpecificationItem.Builder()
+                .id("dsn", "exampleB", 1).location("spec.md", 2).description("Example requirement")
+                .addNeedsArtifactType("utest").addNeedsArtifactType("impl").build();
+
+        assertThat(tag.getItem(), AutoMatcher.equalTo(expectedTag));
+        assertThat(req.getItem(), AutoMatcher.equalTo(expectedReq));
+    }
+
+    private Trace trace(final String content)
+    {
+        return trace(parse(content));
+    }
+
+    private Trace trace(final List<SpecificationItem> items)
+    {
+        final List<LinkedSpecificationItem> linkedItems = new Linker(items).link();
+        return new Tracer().trace(linkedItems);
+    }
+
+    private List<SpecificationItem> parse(final String content)
+    {
+        final SpecificationListBuilder listener = SpecificationListBuilder.create();
+        final InputFile input = StreamInput.forContent(Paths.get("dummy.xml"), content);
+        final Importer importer = new SpecobjectImporterFactory().createImporter(input, listener);
+        importer.runImport();
+        return listener.build();
+    }
+}