From 70ae27f96d7c13efe97250ac8d0add8c190d0d22 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Wed, 12 Apr 2017 11:11:56 +0000
Subject: [PATCH] #60973 XDGF Support for "PolylineTo" as well as existing
 alternate spelling "PolyLineTo"

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1791108 13f79535-47bb-0310-9956-ffa450edef68
---
 .../usermodel/section/geometry/GeometryRowFactory.java    | 2 ++
 .../apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
index 50e85e878..003169f5f 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
+++ b/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java
@@ -37,6 +37,8 @@ public class GeometryRowFactory {
             _rowTypes.put("LineTo", LineTo.class, RowType.class);
             _rowTypes.put("MoveTo", MoveTo.class, RowType.class);
             _rowTypes.put("NURBSTo", NURBSTo.class, RowType.class);
+            // Note - two different spellings depending on version used...!
+            _rowTypes.put("PolylineTo", PolyLineTo.class, RowType.class);
             _rowTypes.put("PolyLineTo", PolyLineTo.class, RowType.class);
             _rowTypes.put("RelCubBezTo", RelCubBezTo.class, RowType.class);
             _rowTypes.put("RelEllipticalArcTo", RelEllipticalArcTo.class,
diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
index c441a5617..3d72302ff 100644
--- a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
@@ -16,9 +16,8 @@
 ==================================================================== */
 package org.apache.poi.xdgf.extractor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.apache.poi.POITestCase.assertContains;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,7 +27,6 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.xdgf.usermodel.XmlVisioDocument;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TestXDGFVisioExtractor {
@@ -79,13 +77,13 @@ public class TestXDGFVisioExtractor {
     }
     
     /**
-     * Currently failing with:
+     * Some confusion on PolylineTo vs PolyLineTo, both should be handled.
+     * Previously failed with:
      * org.apache.poi.POIXMLException: Invalid 'Row_Type' name 'PolylineTo'
      *  at org.apache.poi.xdgf.util.ObjectFactory.load
      *  at org.apache.poi.xdgf.usermodel.section.geometry.GeometryRowFactory.load
      */
     @Test
-    @Ignore("TODO Fix bug #60973")
     public void testPolylineTo() throws IOException {
         InputStream is = SAMPLES.openResourceAsStream("60973.vsdx");
         XmlVisioDocument document = new XmlVisioDocument(is);