From 8d0c230dab1a38eb6ec8d8f41c775909dd45ca5a Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 13 Mar 2013 12:56:24 +0100
Subject: [PATCH] fixed typing of crew; added test for it

---
 .../sailing/odf/resultimport/test/ParserTest.java   | 13 +++++++++++++
 .../odf/resultimport/impl/CumulativeResultImpl.java |  2 +-
 .../impl/ScoreCorrectionProviderImpl.java           |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.odf.resultimport.test/src/com/sap/sailing/odf/resultimport/test/ParserTest.java b/java/com.sap.sailing.odf.resultimport.test/src/com/sap/sailing/odf/resultimport/test/ParserTest.java
index 426d2f2c56f..deeac5b973e 100755
--- a/java/com.sap.sailing.odf.resultimport.test/src/com/sap/sailing/odf/resultimport/test/ParserTest.java
+++ b/java/com.sap.sailing.odf.resultimport.test/src/com/sap/sailing/odf/resultimport/test/ParserTest.java
@@ -1,5 +1,6 @@
 package com.sap.sailing.odf.resultimport.test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -22,13 +23,16 @@ import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 import com.sap.sailing.domain.common.TimePoint;
+import com.sap.sailing.domain.common.impl.Util;
 import com.sap.sailing.domain.common.impl.Util.Pair;
+import com.sap.sailing.odf.resultimport.Athlete.Gender;
 import com.sap.sailing.odf.resultimport.Competition;
 import com.sap.sailing.odf.resultimport.CumulativeResult;
 import com.sap.sailing.odf.resultimport.CumulativeResultDocumentProvider;
 import com.sap.sailing.odf.resultimport.OdfBody;
 import com.sap.sailing.odf.resultimport.OdfBodyParser;
 import com.sap.sailing.odf.resultimport.ParserFactory;
+import com.sap.sailing.odf.resultimport.Skipper;
 import com.sap.sailing.odf.resultimport.impl.ScoreCorrectionProviderImpl;
 
 public class ParserTest {
@@ -84,7 +88,16 @@ public class ParserTest {
             }
         }
         assertTrue(results.containsKey("1094919"));
+        CumulativeResult resultsFor1094919 = results.get("1094919");
+        assertEquals(1, Util.size(resultsFor1094919.getAthletes()));
+        assertEquals("SLINGSBY Tom", resultsFor1094919.getAthletes().iterator().next().getName());
+        assertEquals(Gender.M, resultsFor1094919.getAthletes().iterator().next().getGender());
+        assertTrue(resultsFor1094919.getAthletes().iterator().next() instanceof Skipper);
         assertTrue(results.containsKey("262797"));
+        CumulativeResult resultsFor262797 = results.get("262797");
+        assertEquals(1, Util.size(resultsFor262797.getAthletes()));
+        assertEquals("IGNATEV Ilia", resultsFor262797.getAthletes().iterator().next().getName());
+        assertEquals(Gender.M, resultsFor262797.getAthletes().iterator().next().getGender());
     }
     
     @Test
diff --git a/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/CumulativeResultImpl.java b/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/CumulativeResultImpl.java
index 0c0051bf497..a02acbbafc9 100755
--- a/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/CumulativeResultImpl.java
+++ b/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/CumulativeResultImpl.java
@@ -76,7 +76,7 @@ public class CumulativeResultImpl extends AbstractNodeWrapper implements Cumulat
         for (int i=0; i<athletes.getLength(); i++) {
             final Node athleteNode = athletes.item(i);
             AthleteImpl athlete = new AthleteImpl(athleteNode);
-            if ("Skipper".equals(athlete.getExtendedResults("ER_SA").get("SA_POSITION"))) {
+            if ("Skipper".equals(athlete.getExtendedResults("ER_SA").get("SA_POSITION").firstEntry().getValue())) {
                 result.add(new SkipperImpl(athleteNode));
             } else {
                 result.add(new CrewmemberImpl(athleteNode));
diff --git a/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/ScoreCorrectionProviderImpl.java b/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/ScoreCorrectionProviderImpl.java
index d8fc3834526..ad2f498d945 100755
--- a/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/ScoreCorrectionProviderImpl.java
+++ b/java/com.sap.sailing.odf.resultimport/src/com/sap/sailing/odf/resultimport/impl/ScoreCorrectionProviderImpl.java
@@ -64,7 +64,6 @@ public class ScoreCorrectionProviderImpl implements ScoreCorrectionProvider {
     @Override
     public RegattaScoreCorrections getScoreCorrections(String eventName, String boatClassName,
             TimePoint timePointPublished) throws IOException, SAXException, ParserConfigurationException {
-        // TODO find out 
         for (OdfBody body : getAllOdfBodies()) {
             if (body.getEventName().equals(eventName) && body.getBoatClassName().equals(boatClassName) &&
                     body.getTimePoint().equals(timePointPublished)) {