diff options
Diffstat (limited to 'server/tests')
5 files changed, 32 insertions, 62 deletions
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java index 438c40823d..7b3d8a4cf2 100644 --- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java @@ -1468,7 +1468,12 @@ public class SQLContainerTableQueryTest { container.getContainerProperty(container.getIdByIndex(3), "NAME").getValue()); - Assert.assertNull(container.getIdByIndex(4)); + try { + container.getIdByIndex(4); + Assert.fail("SQLContainer.getIdByIndex() returned a value for an index beyond the end of the container"); + } catch (IndexOutOfBoundsException e) { + // should throw exception - item is filtered out + } Assert.assertNull(container.nextItemId(container.getIdByIndex(3))); Assert.assertFalse(container.containsId(id2)); diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java index 6649bc16e8..0856b3c08c 100644 --- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java @@ -2322,8 +2322,13 @@ public class SQLContainerTest { container.getContainerProperty(container.getIdByIndex(3), "NAME").getValue()); - Assert.assertNull(container.getIdByIndex(4)); - Assert.assertNull(container.nextItemId(container.getIdByIndex(3))); + try { + container.getIdByIndex(4); + Assert.fail("SQLContainer.getIdByIndex() returned a value for an index beyond the end of the container"); + } catch (IndexOutOfBoundsException e) { + // should throw exception - item is filtered out + } + container.nextItemId(container.getIdByIndex(3)); Assert.assertFalse(container.containsId(id2)); Assert.assertFalse(container.getItemIds().contains(id2)); diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java index 3ae41610fa..b936cae1a5 100644 --- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java +++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java @@ -5,23 +5,21 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; -import java.util.Enumeration; import java.util.Properties; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import junit.framework.TestCase; +import com.vaadin.server.VaadinServlet.ServletDeploymentConfiguration; + public class TestAbstractApplicationServletStaticFilesLocation extends TestCase { VaadinServlet servlet; - private Method getStaticFilesLocationMethod; + // private Method getStaticFilesLocationMethod; @Override protected void setUp() throws Exception { @@ -30,53 +28,11 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase servlet = new VaadinServlet(); // Workaround to avoid calling init and creating servlet config - Field f = VaadinServlet.class.getDeclaredField("applicationProperties"); + Field f = VaadinServlet.class + .getDeclaredField("deploymentConfiguration"); f.setAccessible(true); - f.set(servlet, new Properties()); - - getStaticFilesLocationMethod = VaadinServlet.class.getDeclaredMethod( - "getStaticFilesLocation", - new Class[] { javax.servlet.http.HttpServletRequest.class }); - getStaticFilesLocationMethod.setAccessible(true); - - } - - public class DummyServletConfig implements ServletConfig { - - // public DummyServletConfig(Map<String,String> initParameters, ) - @Override - public String getInitParameter(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<Object> getInitParameterNames() { - return new Enumeration<Object>() { - - @Override - public boolean hasMoreElements() { - return false; - } - - @Override - public Object nextElement() { - return null; - } - }; - } - - @Override - public ServletContext getServletContext() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServletName() { - // TODO Auto-generated method stub - return null; - } + f.set(servlet, new ServletDeploymentConfiguration(servlet, + new Properties())); } @@ -122,8 +78,8 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase // Set request into replay mode replay(request); - String location = (String) getStaticFilesLocationMethod.invoke(servlet, - request); + String location = servlet.getDeploymentConfiguration() + .getStaticFileLocation(servlet.createWrappedRequest(request)); return location; } @@ -135,8 +91,8 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase // Set request into replay mode replay(request); - String location = (String) getStaticFilesLocationMethod.invoke(servlet, - request); + String location = servlet.getDeploymentConfiguration() + .getStaticFileLocation(servlet.createWrappedRequest(request)); return location; } diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index 5dbab8467e..18567b62f0 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -18,6 +18,9 @@ public class RemoveListenersOnDetach { int numReadOnlyChanges = 0; AbstractField field = new AbstractField() { + final private Application application = new Application() { + + }; private UI uI = new UI() { @Override @@ -25,8 +28,10 @@ public class RemoveListenersOnDetach { } - }; - private Application application = new Application() { + @Override + public Application getApplication() { + return application; + } }; diff --git a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java index d58ff28b00..905ddb529b 100644 --- a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java +++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java @@ -56,8 +56,7 @@ public class UriFragmentManagerTest extends TestCase { navigator.navigateTo("test"); control.replay(); - FragmentChangedEvent event = page.new FragmentChangedEvent(page, - "oldtest"); + FragmentChangedEvent event = new FragmentChangedEvent(page, "oldtest"); manager.fragmentChanged(event); } } |