[jbehave-scm] [scm-ide][1] JBEHAVE-233: Fixed failing unit tests.

[Mauro Talevi]

commit 71341e52bafca6c717ab64a316936e6d1d2c90b9
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sun Jul 8 17:37:44 2012 +0200
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun Jul 8 17:37:44 2012 +0200

    JBEHAVE-233:  Fixed failing unit tests.

diff --git 
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/preferences/ProjectPreferences.java
 
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/preferences/ProjectPreferences.java
index 0f6e460..44d3091 100644
--- 
a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/preferences/ProjectPreferences.java
+++ 
b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/preferences/ProjectPreferences.java
@@ -100,6 +100,9 @@ public class ProjectPreferences {
     }
     
     public String getParameterPrefix() {
+       if ( parameterPrefix == null ){
+               return DEFAULT_PARAMETER_PREFIX;
+       }
         return parameterPrefix;
     }
     
diff --git 
a/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/scanner/StepScannerStyledTest.java
 
b/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/scanner/StepScannerStyledTest.java
index f39f6c6..0b32ba9 100644
--- 
a/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/scanner/StepScannerStyledTest.java
+++ 
b/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/scanner/StepScannerStyledTest.java
@@ -58,7 +58,7 @@ public class StepScannerStyledTest {
         jbehaveProject = mock(JBehaveProject.class);
         
when(jbehaveProject.getLocalizedStepSupport()).thenReturn(localizedStepSupport);
         when(jbehaveProject.getStepLocator()).thenReturn(new 
StepLocator(jbehaveProject));
-        
when(jbehaveProject.getProjectPreferences()).thenReturn(projectPreferences());
+        when(jbehaveProject.getProjectPreferences()).thenReturn(new 
ProjectPreferences());
         doAnswer(new Answer() {
             @SuppressWarnings("unchecked")
             @Override
@@ -81,16 +81,6 @@ public class StepScannerStyledTest {
         candidate = new StepCandidate(localizedStepSupport, "$", method, 
annotation, StepType.GIVEN, STEP1, 0);
     }
 
-       private ProjectPreferences projectPreferences() {
-               ProjectPreferences projectPreferences = new 
ProjectPreferences();
-        try {
-                       projectPreferences.load();
-               } catch (BackingStoreException e) {
-                       e.printStackTrace();
-               }
-               return projectPreferences;
-       }
-    
     @Test
     public void useCase_ex1() {
         when(stepLocator.findFirstStep(Mockito.anyString())).thenAnswer(new 
Answer<StepCandidate>() {
diff --git 
a/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/story/scanner/StepParserTest.java
 
b/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/story/scanner/StepParserTest.java
index 8067394..3ac2ae3 100644
--- 
a/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/story/scanner/StepParserTest.java
+++ 
b/jbehave-eclipse/org.jbehave.eclipse/test/org/jbehave/eclipse/editor/story/scanner/StepParserTest.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.text.rules.IToken;
 import org.jbehave.core.steps.StepType;
 import org.jbehave.eclipse.JBehaveProject;
 import org.jbehave.eclipse.jface.TextAttributeProvider;
+import org.jbehave.eclipse.preferences.ProjectPreferences;
 import org.jbehave.eclipse.step.LocalizedStepSupport;
 import org.jbehave.eclipse.step.StepCandidate;
 import org.jbehave.eclipse.step.StepLocator;
@@ -79,6 +80,7 @@ public class StepParserTest {
         jbehaveProject = mock(JBehaveProject.class);
         
when(jbehaveProject.getLocalizedStepSupport()).thenReturn(localizedSupport);
         when(jbehaveProject.getStepLocator()).thenReturn(locator);
+        when(jbehaveProject.getProjectPreferences()).thenReturn(new 
ProjectPreferences());
     }
 
     private static LocalizedStepSupport createLocalizedStepSupport() {