trying to make simulator tests run; got a few more green, but still many tests fail; will need to temporarily disable simulator tests in maven build

java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java

@@ -27,11 +27,11 @@ public class PolarDiagramCSVTest {
     private static double BEARING_STEP = 10.0;
     private static double VELOCITY_STEP = 1.0;
 
-    private static String POLAR_DIAGRAM_49_CSV_FILE_PATH = "resources/PolarDiagram49.csv";
-    private static String POLAR_DIAGRAM_49_BETHWAITE_CSV_FILE_PATH = "resources/PolarDiagram49Bethwaite.csv";
-    private static String POLAR_DIAGRAM_49_ORC_CSV_FILE_PATH = "resources/PolarDiagram49ORC.csv";
-    private static String POLAR_DIAGRAM_49_STG_CSV_FILE_PATH = "resources/PolarDiagram49STG.csv";
-    private static String POLAR_DIAGRAM_505_STG_CSV_FILE_PATH = "resources/PolarDiagram505STG.csv";
+    private static String POLAR_DIAGRAM_49_CSV_FILE_PATH = "PolarDiagram49.csv";
+    private static String POLAR_DIAGRAM_49_BETHWAITE_CSV_FILE_PATH = "PolarDiagram49Bethwaite.csv";
+    private static String POLAR_DIAGRAM_49_ORC_CSV_FILE_PATH = "PolarDiagram49ORC.csv";
+    private static String POLAR_DIAGRAM_49_STG_CSV_FILE_PATH = "PolarDiagram49STG.csv";
+    private static String POLAR_DIAGRAM_505_STG_CSV_FILE_PATH = "PolarDiagram505STG.csv";
 
     @Test
     public void test_PolarDiagram49_internals() throws IOException {

java/com.sap.sailing.simulator/.classpath

@@ -4,5 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/ssj.jar"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sailing.simulator/build.properties

@@ -1,5 +1,7 @@
-source.. = src/
+source.. = src/,\
+           resources/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/ssj.jar
+               lib/ssj.jar,\
+               resources/

java/com.sap.sailing.simulator/resources/STG_configuration.csv

@@ -0,0 +1,5 @@
+49er,4.995,PolarDiagram49.csv
+49er Bethwaite,4.876,PolarDiagram49Bethwaite.csv
+49er ORC,4.995,PolarDiagram49ORC.csv
+49er STG,4.876,PolarDiagram49STG.csv
+505 STG,5.05,PolarDiagram505STG.csv

java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/ConfigurationManager.java

@@ -19,8 +19,8 @@ public enum ConfigurationManager {
     private static final String ENVIRONMENT_VARIABLE_NAME = "STG_CONFIG";
     private static final String ENVIRONMENT_RACES_VARIABLE_NAME = "STG_CONFIG";
 
-    private static final String CONFIG_FILE_LOCATION = "resources/STG_configuration.csv";
-    private static final String RACES_FILE_LOCATION = "resources/races.csv";
+    private static final String CONFIG_FILE_LOCATION = "STG_configuration.csv";
+    private static final String RACES_FILE_LOCATION = "races.csv";
 
     private List<BoatClassProperties> _boatClassesInfo = new ArrayList<BoatClassProperties>();
     private List<RaceProperties> _racesInfo = new ArrayList<RaceProperties>();
@@ -29,9 +29,7 @@ public enum ConfigurationManager {
     private String errorMessage = "";
 
     private ConfigurationManager() {
-
         this.initFromResources(ConfigurationManager.ENVIRONMENT_VARIABLE_NAME, ConfigurationManager.CONFIG_FILE_LOCATION, true);
-
         this.initFromResources(ConfigurationManager.ENVIRONMENT_RACES_VARIABLE_NAME, ConfigurationManager.RACES_FILE_LOCATION, false);
     }
 

java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java

@@ -22,7 +22,6 @@ public class PolarDiagramCSV extends PolarDiagramBase {
     private static final long serialVersionUID = -9219705955440602679L;
 
     public PolarDiagramCSV(String inputFile) throws IOException {
-
         ClassLoader cl = this.getClass().getClassLoader();
         InputStream csvFile = cl.getResourceAsStream(inputFile);
         InputStreamReader isr = new InputStreamReader(csvFile);

java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/resources/STG_configuration.csv

@@ -1,5 +0,0 @@
-49er,4.995,resources/PolarDiagram49.csv
-49er Bethwaite,4.876,resources/PolarDiagram49Bethwaite.csv
-49er ORC,4.995,resources/PolarDiagram49ORC.csv
-49er STG,4.876,resources/PolarDiagram49STG.csv
-505 STG,5.05,resources/PolarDiagram505STG.csv