Skip to content

Commit

Permalink
fix for all conversion tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Guilherme Silveira committed May 2, 2009
1 parent 12e6f43 commit 367e479
Show file tree
Hide file tree
Showing 6 changed files with 159 additions and 125 deletions.
2 changes: 1 addition & 1 deletion vraptor-core/src/test/java/br/com/caelum/vraptor/converter/BigDecimalConverterTest.java
View file
Expand Up @@ -64,7 +64,7 @@ public void shouldComplainAboutInvalidNumber() {
try {
converter.convert("---", BigDecimal.class, bundle);
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("--- is not a valid integer.")));
assertThat(e.getMessage(), is(equalTo("--- is not a valid number.")));
}
}

Expand Down
2 changes: 1 addition & 1 deletion vraptor-core/src/test/java/br/com/caelum/vraptor/converter/CharacterConverterTest.java
View file
Expand Up @@ -58,7 +58,7 @@ public void shouldComplainAboutStringTooBig() {
try {
converter.convert("---", Character.class, bundle);
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("--- is not a validcharacter.")));
assertThat(e.getMessage(), is(equalTo("--- is not a valid character.")));
}
}

Expand Down
2 changes: 1 addition & 1 deletion vraptor-core/src/test/java/br/com/caelum/vraptor/converter/FloatConverterTest.java
View file
Expand Up @@ -58,7 +58,7 @@ public void shouldComplainAboutInvalidNumber() {
try {
converter.convert("---", Float.class, bundle);
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("--- is not a valid integer.")));
assertThat(e.getMessage(), is(equalTo("--- is not a valid number.")));
}
}

Expand Down
138 changes: 77 additions & 61 deletions ...-core/src/test/java/br/com/caelum/vraptor/converter/LocaleBasedCalendarConverterTest.java
View file
Expand Up @@ -52,78 +52,94 @@

import br.com.caelum.vraptor.core.RequestInfo;
import br.com.caelum.vraptor.http.MutableRequest;
import br.com.caelum.vraptor.interceptor.VRaptorMatchers;
import br.com.caelum.vraptor.validator.ValidationMessage;

public class LocaleBasedCalendarConverterTest {

private LocaleBasedCalendarConverter converter;
private Mockery mockery;
private MutableRequest request;
private HttpSession session;
private ServletContext context;
private LocaleBasedCalendarConverter converter;
private Mockery mockery;
private MutableRequest request;
private HttpSession session;
private ServletContext context;
private ArrayList<ValidationMessage> errors;
private ResourceBundle bundle;

@Before
public void setup() {
this.mockery =new Mockery();
this.request = mockery.mock(MutableRequest.class);
this.session = mockery.mock(HttpSession.class);
this.context= mockery.mock(ServletContext.class);
final RequestInfo webRequest = new RequestInfo(context, request, null);
this.converter = new LocaleBasedCalendarConverter(webRequest);
this.errors = new ArrayList<ValidationMessage>();
this.bundle = ResourceBundle.getBundle("messages");
}
@Before
public void setup() {
this.mockery = new Mockery();
this.request = mockery.mock(MutableRequest.class);
this.session = mockery.mock(HttpSession.class);
this.context = mockery.mock(ServletContext.class);
final RequestInfo webRequest = new RequestInfo(context, request, null);
this.converter = new LocaleBasedCalendarConverter(webRequest);
this.errors = new ArrayList<ValidationMessage>();
this.bundle = ResourceBundle.getBundle("messages");
}

@Test
public void shouldBeAbleToConvert() {
mockery.checking(new Expectations() {{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue("pt_br"));
}});
assertThat(converter.convert("10/06/2008", Calendar.class, bundle), is(equalTo((Calendar) new GregorianCalendar(2008,5,10))));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvert() {
mockery.checking(new Expectations() {
{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue("pt_br"));
}
});
assertThat(converter.convert("10/06/2008", Calendar.class, bundle),
is(equalTo((Calendar) new GregorianCalendar(2008, 5, 10))));
mockery.assertIsSatisfied();
}

@Test
public void shouldUseTheDefaultLocale() throws ParseException {
mockery.checking(new Expectations() {{
one(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue(null));
one(request).getSession(); will(returnValue(session));
one(session).getAttribute("javax.servlet.jsp.jstl.fmt.locale.session"); will(returnValue(null));
one(context).getAttribute("javax.servlet.jsp.jstl.fmt.locale.application"); will(returnValue(null));
one(context).getInitParameter("javax.servlet.jsp.jstl.fmt.locale"); will(returnValue(null));
one(request).getLocale(); will(returnValue(Locale.getDefault()));
}});
Date date = new SimpleDateFormat("dd/MM/yyyy").parse("10/05/2010");
Calendar cal = new GregorianCalendar();
cal.setTime(date);
String formattedToday = DateFormat.getDateInstance(DateFormat.SHORT).format(date);
assertThat(converter.convert(formattedToday, Calendar.class, bundle), is(equalTo(cal)));
mockery.assertIsSatisfied();
}
@Test
public void shouldUseTheDefaultLocale() throws ParseException {
mockery.checking(new Expectations() {
{
one(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue(null));
one(request).getSession();
will(returnValue(session));
one(session).getAttribute("javax.servlet.jsp.jstl.fmt.locale.session");
will(returnValue(null));
one(context).getAttribute("javax.servlet.jsp.jstl.fmt.locale.application");
will(returnValue(null));
one(context).getInitParameter("javax.servlet.jsp.jstl.fmt.locale");
will(returnValue(null));
one(request).getLocale();
will(returnValue(Locale.getDefault()));
}
});
Date date = new SimpleDateFormat("dd/MM/yyyy").parse("10/05/2010");
Calendar cal = new GregorianCalendar();
cal.setTime(date);
String formattedToday = DateFormat.getDateInstance(DateFormat.SHORT).format(date);
assertThat(converter.convert(formattedToday, Calendar.class, bundle), is(equalTo(cal)));
mockery.assertIsSatisfied();
}

@Test
public void shouldBeAbleToConvertEmpty() {
assertThat(converter.convert("", Calendar.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvertEmpty() {
assertThat(converter.convert("", Calendar.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}

@Test
public void shouldBeAbleToConvertNull() {
assertThat(converter.convert(null, Calendar.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvertNull() {
assertThat(converter.convert(null, Calendar.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}


@Test
public void shouldThrowExceptionWhenUnableToParse() {
mockery.checking(new Expectations() {{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue("pt_br"));
}});
converter.convert("a,10/06/2008/a/b/c", Calendar.class, bundle);
assertThat(errors.get(0), is(VRaptorMatchers.error("", "a,10/06/2008/a/b/c is not a valid date.")));
}
@Test
public void shouldThrowExceptionWhenUnableToParse() {
mockery.checking(new Expectations() {
{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue("pt_br"));
}
});
try {
converter.convert("a,10/06/2008/a/b/c", Calendar.class, bundle);
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("a,10/06/2008/a/b/c is not a valid date.")));
}
}

}
134 changes: 75 additions & 59 deletions vraptor-core/src/test/java/br/com/caelum/vraptor/converter/LocaleBasedDateConverterTest.java
View file
Expand Up @@ -50,76 +50,92 @@

import br.com.caelum.vraptor.core.RequestInfo;
import br.com.caelum.vraptor.http.MutableRequest;
import br.com.caelum.vraptor.interceptor.VRaptorMatchers;
import br.com.caelum.vraptor.validator.ValidationMessage;

public class LocaleBasedDateConverterTest {

private LocaleBasedDateConverter converter;
private Mockery mockery;
private MutableRequest request;
private HttpSession session;
private ServletContext context;
private LocaleBasedDateConverter converter;
private Mockery mockery;
private MutableRequest request;
private HttpSession session;
private ServletContext context;
private ArrayList<ValidationMessage> errors;
private ResourceBundle bundle;

@Before
public void setup() {
this.mockery =new Mockery();
this.request = mockery.mock(MutableRequest.class);
this.session = mockery.mock(HttpSession.class);
this.context= mockery.mock(ServletContext.class);
final RequestInfo webRequest = new RequestInfo(context, request, null);
this.converter = new LocaleBasedDateConverter(webRequest);
this.errors = new ArrayList<ValidationMessage>();
this.bundle = ResourceBundle.getBundle("messages");
}
@Before
public void setup() {
this.mockery = new Mockery();
this.request = mockery.mock(MutableRequest.class);
this.session = mockery.mock(HttpSession.class);
this.context = mockery.mock(ServletContext.class);
final RequestInfo webRequest = new RequestInfo(context, request, null);
this.converter = new LocaleBasedDateConverter(webRequest);
this.errors = new ArrayList<ValidationMessage>();
this.bundle = ResourceBundle.getBundle("messages");
}

@Test
public void shouldBeAbleToConvert() throws ParseException {
mockery.checking(new Expectations() {{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue("pt_br"));
}});
assertThat(converter.convert("10/06/2008", Date.class, bundle), is(equalTo(new SimpleDateFormat("dd/MM/yyyy").parse("10/06/2008"))));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvert() throws ParseException {
mockery.checking(new Expectations() {
{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue("pt_br"));
}
});
assertThat(converter.convert("10/06/2008", Date.class, bundle), is(equalTo(new SimpleDateFormat("dd/MM/yyyy")
.parse("10/06/2008"))));
mockery.assertIsSatisfied();
}

@Test
public void shouldUseTheDefaultLocale() throws ParseException {
mockery.checking(new Expectations() {{
one(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue(null));
one(request).getSession(); will(returnValue(session));
one(session).getAttribute("javax.servlet.jsp.jstl.fmt.locale.session"); will(returnValue(null));
one(context).getAttribute("javax.servlet.jsp.jstl.fmt.locale.application"); will(returnValue(null));
one(context).getInitParameter("javax.servlet.jsp.jstl.fmt.locale"); will(returnValue(null));
one(request).getLocale(); will(returnValue(Locale.getDefault()));
}});
Date date = new SimpleDateFormat("dd/MM/yyyy").parse("10/05/2010");
String formattedToday = DateFormat.getDateInstance(DateFormat.SHORT).format(date);
assertThat(converter.convert(formattedToday, Date.class, bundle), is(equalTo(date)));
mockery.assertIsSatisfied();
}
@Test
public void shouldUseTheDefaultLocale() throws ParseException {
mockery.checking(new Expectations() {
{
one(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue(null));
one(request).getSession();
will(returnValue(session));
one(session).getAttribute("javax.servlet.jsp.jstl.fmt.locale.session");
will(returnValue(null));
one(context).getAttribute("javax.servlet.jsp.jstl.fmt.locale.application");
will(returnValue(null));
one(context).getInitParameter("javax.servlet.jsp.jstl.fmt.locale");
will(returnValue(null));
one(request).getLocale();
will(returnValue(Locale.getDefault()));
}
});
Date date = new SimpleDateFormat("dd/MM/yyyy").parse("10/05/2010");
String formattedToday = DateFormat.getDateInstance(DateFormat.SHORT).format(date);
assertThat(converter.convert(formattedToday, Date.class, bundle), is(equalTo(date)));
mockery.assertIsSatisfied();
}

@Test
public void shouldBeAbleToConvertEmpty() {
assertThat(converter.convert("", Date.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvertEmpty() {
assertThat(converter.convert("", Date.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}

@Test
public void shouldBeAbleToConvertNull() {
assertThat(converter.convert(null, Date.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}
@Test
public void shouldBeAbleToConvertNull() {
assertThat(converter.convert(null, Date.class, bundle), is(nullValue()));
mockery.assertIsSatisfied();
}


@Test
public void shouldThrowExceptionWhenUnableToParse() {
mockery.checking(new Expectations() {{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request"); will(returnValue("pt_br"));
}});
converter.convert("a,10/06/2008/a/b/c", Date.class, bundle);
assertThat(errors.get(0), is(VRaptorMatchers.error("", "a,10/06/2008/a/b/c is not a valid date.")));
}
@Test
public void shouldThrowExceptionWhenUnableToParse() {
mockery.checking(new Expectations() {
{
exactly(2).of(request).getAttribute("javax.servlet.jsp.jstl.fmt.locale.request");
will(returnValue("pt_br"));
}
});
try {
converter.convert("a,10/06/2008/a/b/c", Date.class, bundle);
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("a,10/06/2008/a/b/c is not a valid date.")));
}
}

}
6 changes: 4 additions & 2 deletions vraptor-core/src/test/java/br/com/caelum/vraptor/converter/PrimitiveShortConverterTest.java
View file
Expand Up @@ -37,7 +37,6 @@
import org.junit.Before;
import org.junit.Test;

import br.com.caelum.vraptor.interceptor.VRaptorMatchers;
import br.com.caelum.vraptor.validator.ValidationMessage;

public class PrimitiveShortConverterTest {
Expand All @@ -60,8 +59,11 @@ public void shouldBeAbleToConvertNumbers(){

@Test
public void shouldComplainAboutInvalidNumber() {
try {
converter.convert("---", short.class, bundle);
assertThat(errors.get(0), is(VRaptorMatchers.error("", "--- is not a valid integer.")));
} catch (ConversionError e) {
assertThat(e.getMessage(), is(equalTo("--- is not a valid integer.")));
}
}

@Test
Expand Down

0 comments on commit 367e479

Please sign in to comment.