diff --git a/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF index 9582d515f7d..d3ec5ef6809 100755 --- a/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF @@ -6,4 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit4;bundle-version="4.8.2", - com.sap.sailing.kiworesultimport + com.sap.sailing.kiworesultimport, + com.sap.sailing.domain.common diff --git a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java index 184346dd686..b12e68ed5bb 100755 --- a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java +++ b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java @@ -1,6 +1,7 @@ package com.sap.sailing.kiworesultimport.test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.io.File; @@ -17,9 +18,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; +import com.sap.sailing.domain.common.impl.Util; +import com.sap.sailing.kiworesultimport.Boat; import com.sap.sailing.kiworesultimport.ResultList; import com.sap.sailing.kiworesultimport.ResultListParser; import com.sap.sailing.kiworesultimport.ResultListParserFactory; +import com.sap.sailing.kiworesultimport.Verteilung; public class ParserTest { private static final String RESOURCES = "resources/"; @@ -52,5 +56,10 @@ public class ParserTest { assertNotNull(resultList); assertEquals("D:\\Programme\\KWSailing\\eventlogos\\KielerWoche_Ergebnislistenkopf_2011.jpg", resultList.getImagePfad()); assertEquals(new String(new byte[] { (byte) 160 /* non-breaking space */}), resultList.getLegende()); + final Verteilung verteilung = resultList.getVerteilung(); + assertNotNull(verteilung); + Iterable boats = verteilung.getBoats(); + assertFalse(Util.isEmpty(boats)); + assertEquals(48, Util.size(boats)); } } diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java index 7c48813242e..5acb4dc64a1 100755 --- a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java @@ -3,5 +3,5 @@ package com.sap.sailing.kiworesultimport; public interface Race { Double getPoints(); - Double getNumber(); + Integer getNumber(); } diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/BoatImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/BoatImpl.java index 77a7b768539..a9d40135fdf 100755 --- a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/BoatImpl.java +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/BoatImpl.java @@ -1,6 +1,8 @@ package com.sap.sailing.kiworesultimport.impl; +import org.w3c.dom.Element; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import com.sap.sailing.kiworesultimport.Boat; import com.sap.sailing.kiworesultimport.Crew; @@ -14,32 +16,29 @@ public class BoatImpl extends NamedImpl implements Boat { @Override public String getSailingNumber() { - // TODO Auto-generated method stub - return null; + return getNode().getAttributes().getNamedItem("sailingnumber").getNodeValue(); } @Override public Integer getPosition() { - // TODO Auto-generated method stub - return null; + return Integer.valueOf(getNode().getAttributes().getNamedItem("position").getNodeValue()); } @Override public String getPreis() { - // TODO Auto-generated method stub - return null; + return getNode().getAttributes().getNamedItem("preis").getNodeValue(); } @Override public Crew getCrew() { - // TODO Auto-generated method stub - return null; + final NodeList crew = ((Element) getNode()).getElementsByTagName("Crew"); + return new CrewImpl(crew.item(0)); } @Override public Races getRaces() { - // TODO Auto-generated method stub - return null; + final NodeList races = ((Element) getNode()).getElementsByTagName("Races"); + return new RacesImpl(races.item(0)); } } diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RaceImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RaceImpl.java index be4607064ce..7f7671bfa27 100755 --- a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RaceImpl.java +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RaceImpl.java @@ -2,10 +2,22 @@ package com.sap.sailing.kiworesultimport.impl; import org.w3c.dom.Node; -public class RaceImpl extends AbstractNodeWrapper { +import com.sap.sailing.kiworesultimport.Race; + +public class RaceImpl extends AbstractNodeWrapper implements Race { public RaceImpl(Node node) { super(node); } + @Override + public Double getPoints() { + return Double.valueOf(getNode().getAttributes().getNamedItem("points").getNodeValue()); + } + + @Override + public Integer getNumber() { + return Integer.valueOf(getNode().getAttributes().getNamedItem("number").getNodeValue()); + } + } diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RacesImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RacesImpl.java new file mode 100755 index 00000000000..9f7e6b02c44 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RacesImpl.java @@ -0,0 +1,34 @@ +package com.sap.sailing.kiworesultimport.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import com.sap.sailing.kiworesultimport.Race; +import com.sap.sailing.kiworesultimport.Races; + +public class RacesImpl extends AbstractNodeWrapper implements Races { + + public RacesImpl(Node node) { + super(node); + } + + @Override + public Double getTotalPoints() { + return Double.valueOf(getNode().getAttributes().getNamedItem("totalpoints").getNodeValue()); + } + + @Override + public Iterable getRaces() { + List result = new ArrayList(); + final NodeList races = ((Element) getNode()).getElementsByTagName("Race"); + for (int i=0; i getBoats() { - // TODO Auto-generated method stub - return null; + List result = new ArrayList(); + final NodeList boats = ((Element) getNode()).getElementsByTagName("Boat"); + for (int i=0; i