Fix typos (#10124)

19 files changed, 67 insertions, 63 deletions

diff --git a/uitest/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index e0f93bfc7c..355fe6b501 100644
--- a/uitest/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
@@ -56,7 +56,7 @@ com.vaadin.testbench.screenshot.cursor=true
 ; Uncomment to limit to certain browsers or override in launch configuration
 ; browsers=winxp-opera10
 
-; Claim that the server has started succesfully. Needed for TB2 tests to be executed
+; Claim that the server has started successfully. Needed for TB2 tests to be executed
 server.start.succeeded=1
 
 ; Directory where temporary Java classes are created
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 2cf1154943..ff0bbf7acb 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -153,7 +153,7 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication
      */
     @Override
     public void componentEvent(Event event) {
-        // Check if event occured at fsTree component
+        // Check if event occurred at fsTree component
         if (event.getSource() == menu) {
             // Check if event is about changing value
             if (event.getClass() == Field.ValueChangeEvent.class) {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java
index 56c5dc986a..c29e46e9d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
@@ -175,7 +175,7 @@ public class TestBench extends com.vaadin.server.LegacyApplication
                                 }
                             }
 
-                            // just partly mach lowercase
+                            // just partly match lowercase
                             for (Object next : menu.getItemIds()) {
                                 if (next instanceof Class) {
                                     Class<?> c = (Class<?>) next;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index 6cde5ad294..9a63d7a823 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -55,7 +55,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
 
     final String eventListenerString = "Component.Listener feedback: ";
     Label eventListenerFeedback = new Label(
-            eventListenerString + " <no events occured>");
+            eventListenerString + " <no events occurred>");
     int count = 0;
 
     public TestCaptionWrapper() {
@@ -120,7 +120,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         test(layout, button);
         button.addListener(this);
 
-        final AbstractDateField<?, ?> df = new TestDateField("DateField " + count++);
+        final AbstractDateField<?, ?> df = new TestDateField(
+                "DateField " + count++);
         test(layout, df);
 
         final CheckBox cb = new CheckBox("Checkbox " + count++);
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 1ce2f389e2..3f281a14c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -104,7 +104,7 @@ public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication
      */
     @Override
     public void componentEvent(Event event) {
-        // Check if event occured at fsTree component
+        // Check if event occurred at fsTree component
         if (event.getSource() == filesystem) {
             // Check if event is about changing value
             if (event.getClass() == Field.ValueChangeEvent.class) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
index 667c0e80ce..9e4701f40b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
@@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout;
 
 public class ButtonClick extends AbstractReindeerTestUI {
 
-    public static final String SUCCESS_TEXT = "Click received succesfully!";
+    public static final String SUCCESS_TEXT = "Click received successfully!";
     public static final String WRONG_BUTTON_TEXT = "Wrong button clicked.";
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
index cd4b180d63..bf315cecff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
@@ -59,7 +59,7 @@ public class SingleUseDragAndDropUpload extends AbstractTestUIWithLog {
             @Override
             public void drop(DragAndDropEvent event) {
                 Transferable transferable = event.getTransferable();
-                log("Drop occured");
+                log("Drop occurred");
                 if (transferable instanceof WrapperTransferable) {
                     WrapperTransferable wTransferable = (WrapperTransferable) transferable;
                     Html5File[] files = wTransferable.getFiles();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index 21eb8b502a..56d970308d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -256,7 +256,8 @@ public class GridBasics extends AbstractTestUIWithLog {
     private void onSingleSelect(SingleSelectionEvent<DataObject> event) {
         log("SingleSelectionEvent: Selected: "
                 + (event.getSelectedItem().isPresent()
-                        ? event.getSelectedItem().get().toString() : "none"));
+                        ? event.getSelectedItem().get().toString()
+                        : "none"));
     }
 
     private void onMultiSelect(MultiSelectionEvent<DataObject> event) {
@@ -267,13 +268,14 @@ public class GridBasics extends AbstractTestUIWithLog {
         String addedRow = firstAdded.isPresent() ? firstAdded.get().toString()
                 : "none";
         String removedRow = firstRemoved.isPresent()
-                ? firstRemoved.get().toString() : "none";
+                ? firstRemoved.get().toString()
+                : "none";
         log("SelectionEvent: Added " + addedRow + ", Removed " + removedRow);
     }
 
     private Component createMenu() {
         MenuBar menu = new MenuBar();
-        menu.setErrorHandler(error -> log("Exception occured, "
+        menu.setErrorHandler(error -> log("Exception occurred, "
                 + error.getThrowable().getClass().getName() + ": "
                 + error.getThrowable().getMessage()));
         MenuItem componentMenu = menu.addItem("Component", null);
@@ -361,9 +363,11 @@ public class GridBasics extends AbstractTestUIWithLog {
         }
         columnsMenu.addItem("Clear sort", item -> grid.clearSortOrder());
 
-        columnsMenu.addItem("Simple resize mode",
-                item -> grid.setColumnResizeMode(item.isChecked()
-                        ? ColumnResizeMode.SIMPLE : ColumnResizeMode.ANIMATED))
+        columnsMenu
+                .addItem("Simple resize mode",
+                        item -> grid.setColumnResizeMode(
+                                item.isChecked() ? ColumnResizeMode.SIMPLE
+                                        : ColumnResizeMode.ANIMATED))
                 .setCheckable(true);
     }
 
@@ -406,13 +410,12 @@ public class GridBasics extends AbstractTestUIWithLog {
                         ? t -> "Row tooltip for row " + t.getRowNumber()
                         : null))
                 .setCheckable(true);
-        stateMenu
-                .addItem("Cell description generator", item -> grid.getColumns()
-                        .stream().findFirst()
-                        .ifPresent(c -> c.setDescriptionGenerator(
-                                item.isChecked() ? t -> "Cell tooltip for row "
+        stateMenu.addItem("Cell description generator",
+                item -> grid.getColumns().stream().findFirst().ifPresent(
+                        c -> c.setDescriptionGenerator(item.isChecked()
+                                ? t -> "Cell tooltip for row "
                                         + t.getRowNumber() + ", Column 0"
-                                        : null)))
+                                : null)))
                 .setCheckable(true);
         stateMenu.addItem("Item click listener", new Command() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 8ffe3abadd..2599ed55ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -172,7 +172,7 @@ public class VaadinTunesLayout extends AbstractReindeerTestUI {
         rootLayout.addComponent(bottom);
 
         // The splitpanel is by default 100% x 100%, but we'll need to adjust
-        // our main window layout to accomodate the height
+        // our main window layout to accommodate the height
         rootLayout.setExpandRatio(bottom, 1.0F);
 
         // Give the sidebar less space than the listing
@@ -245,27 +245,26 @@ public class VaadinTunesLayout extends AbstractReindeerTestUI {
                 new NativeSelect());
 
         // Lets populate the table with random data
-        String[] tracks = { "Red Flag", "Millstone", "Not The Sun",
-                "Breath", "Here We Are", "Deep Heaven", "Her Voice Resides",
+        String[] tracks = { "Red Flag", "Millstone", "Not The Sun", "Breath",
+                "Here We Are", "Deep Heaven", "Her Voice Resides",
                 "Natural Tan", "End It All", "Kings", "Daylight Slaving",
                 "Mad Man", "Resolve", "Teargas", "African Air",
                 "Passing Bird" };
-        String[] times = { "4:12", "6:03", "5:43", "4:32", "3:42",
-                "4:45", "2:56", "9:34", "2:10", "3:44", "5:49", "6:30", "5:18",
-                "7:42", "3:13", "2:52" };
-        String[] artists = { "Billy Talent", "Brand New",
-                "Breaking Benjamin", "Becoming The Archetype",
-                "Bullet For My Valentine", "Chasing Victory", "Chimaira",
-                "Danko Jones", "Deadlock", "Deftones", "From Autumn To Ashes",
-                "Haste The Day", "Four Year Strong", "In Flames", "Kemopetrol",
-                "John Legend" };
+        String[] times = { "4:12", "6:03", "5:43", "4:32", "3:42", "4:45",
+                "2:56", "9:34", "2:10", "3:44", "5:49", "6:30", "5:18", "7:42",
+                "3:13", "2:52" };
+        String[] artists = { "Billy Talent", "Brand New", "Breaking Benjamin",
+                "Becoming The Archetype", "Bullet For My Valentine",
+                "Chasing Victory", "Chimaira", "Danko Jones", "Deadlock",
+                "Deftones", "From Autumn To Ashes", "Haste The Day",
+                "Four Year Strong", "In Flames", "Kemopetrol", "John Legend" };
         String[] albums = { "Once Again", "The Caitiff Choir",
                 "The Devil And God", "Light Grenades", "Dicthonomy",
                 "Back In Black", "Dreamer", "Come Clarity", "Year Zero",
                 "Frames", "Fortress", "Phobia", "The Poison", "Manifesto",
                 "White Pony", "The Big Dirty" };
-        String[] genres = { "Rock", "Metal", "Hardcore", "Indie",
-                "Pop", "Alternative", "Blues", "Jazz", "Hip Hop", "Electronica",
+        String[] genres = { "Rock", "Metal", "Hardcore", "Indie", "Pop",
+                "Alternative", "Blues", "Jazz", "Hip Hop", "Electronica",
                 "Punk", "Hard Rock", "Dance", "R'n'B", "Gospel", "Country" };
         for (int i = 0; i < 1000; i++) {
             NativeSelect s = new NativeSelect();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java
index 8796e724be..fd1528f8d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeBasicFeatures.java
@@ -67,7 +67,7 @@ public class TreeBasicFeatures extends AbstractTestUIWithLog {
 
     private Component createMenu() {
         MenuBar menu = new MenuBar();
-        menu.setErrorHandler(error -> log("Exception occured, "
+        menu.setErrorHandler(error -> log("Exception occurred, "
                 + error.getThrowable().getClass().getName() + ": "
                 + error.getThrowable().getMessage()));
         MenuItem componentMenu = menu.addItem("Component", null);
@@ -111,7 +111,8 @@ public class TreeBasicFeatures extends AbstractTestUIWithLog {
         componentMenu
                 .addItem("Style Generator",
                         menuItem -> tree.setStyleGenerator(menuItem.isChecked()
-                                ? t -> "level" + t.getDepth() : t -> null))
+                                ? t -> "level" + t.getDepth()
+                                : t -> null))
                 .setCheckable(true);
 
         return menu;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java
index f58e0db6b4..1900ea2447 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java
@@ -45,8 +45,8 @@ public class GridSelectAllTest extends GridBasicsTest {
         selectionBox.click();
         selectionBox.click();
 
-        assertFalse("Exception occured on row reselection.", logContainsText(
-                "Exception occured, java.lang.IllegalStateException: No item id for key 101 found."));
+        assertFalse("Exception occurred on row reselection.", logContainsText(
+                "Exception occurred, java.lang.IllegalStateException: No item id for key 101 found."));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java
index 93575e26ac..7a11b3375e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java
@@ -267,7 +267,7 @@ public class GridSelectionTest extends GridBasicsTest {
         assertFalse(
                 "Unexpected NullPointerException when removing selected rows",
                 logContainsText(
-                        "Exception occured, java.lang.NullPointerException: null"));
+                        "Exception occurred, java.lang.NullPointerException: null"));
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorBufferedTest.java
index 288000ff22..9722f0e80e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorBufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorBufferedTest.java
@@ -177,7 +177,7 @@ public class GridEditorBufferedTest extends GridEditorTest {
     private void makeInvalidEdition() {
         editRow(5);
         assertFalse(logContainsText(
-                "Exception occured, java.lang.IllegalStateException"));
+                "Exception occurred, java.lang.IllegalStateException"));
 
         GridEditorElement editor = getGridElement().getEditor();
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java
index 9eacb3832e..9a751a70b5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java
@@ -32,10 +32,10 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 
 public class GridEditorUnbufferedTest extends GridEditorTest {
 
-    private static final String[] TOGGLE_EDITOR_BUFFERED = {
-            "Component", "Editor", "Buffered mode" };
-    private static final String[] CANCEL_EDIT = { "Component",
-            "Editor", "Cancel edit" };
+    private static final String[] TOGGLE_EDITOR_BUFFERED = { "Component",
+            "Editor", "Buffered mode" };
+    private static final String[] CANCEL_EDIT = { "Component", "Editor",
+            "Cancel edit" };
 
     @Override
     @Before
@@ -63,7 +63,7 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
         assertEditorOpen();
         selectMenuPath(TOGGLE_EDITOR_BUFFERED);
         boolean thrown = logContainsText(
-                "Exception occured, java.lang.IllegalStateException");
+                "Exception occurred, java.lang.IllegalStateException");
         assertTrue("IllegalStateException was not thrown", thrown);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index 7db4ec1370..9cb5dd0037 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -54,7 +54,7 @@ public class MemoryLeakTableTest extends MultiBrowserTest {
     @Test
     @Ignore
     public void memoryTest() throws IOException {
-        // Set breakoint and look memory consuption in Profiler
+        // Set breakpoint and look memory consumption in Profiler
         // Mozilla Firefox doesn't provide memory usage profiler, use chrome.
 
         openTestURL();
@@ -75,7 +75,7 @@ public class MemoryLeakTableTest extends MultiBrowserTest {
             }
             btnDel.click();
         }
-        // Set breakoint and look memory consuption in Profiler
+        // Set breakpoint and look memory consumption in Profiler
         btnAdd = $(ButtonElement.class).get(0);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
index b408308f7b..0e73d68926 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
@@ -174,7 +174,7 @@ public class GridEditorBufferedTest extends GridEditorTest {
     private void makeInvalidEdition() {
         selectMenuPath(EDIT_ITEM_5);
         assertFalse(logContainsText(
-                "Exception occured, java.lang.IllegalStateException"));
+                "Exception occurred, java.lang.IllegalStateException"));
 
         GridEditorElement editor = getGridElement().getEditor();
 
@@ -316,7 +316,7 @@ public class GridEditorBufferedTest extends GridEditorTest {
 
         selectMenuPath(EDIT_ITEM_100);
         boolean thrown = logContainsText(
-                "Exception occured, java.lang.IllegalStateException");
+                "Exception occurred, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
 
         assertEditorOpen();
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorTest.java
index f751e60c2c..7c982dabdb 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorTest.java
@@ -42,12 +42,12 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
             .className("v-grid-editor-cancel");
     protected static final By BY_EDITOR_SAVE = By
             .className("v-grid-editor-save");
-    protected static final String[] EDIT_ITEM_5 = { "Component",
-            "Editor", "Edit item 5" };
-    protected static final String[] EDIT_ITEM_100 = { "Component",
-            "Editor", "Edit item 100" };
-    protected static final String[] TOGGLE_EDIT_ENABLED = {
-            "Component", "Editor", "Enabled" };
+    protected static final String[] EDIT_ITEM_5 = { "Component", "Editor",
+            "Edit item 5" };
+    protected static final String[] EDIT_ITEM_100 = { "Component", "Editor",
+            "Edit item 100" };
+    protected static final String[] TOGGLE_EDIT_ENABLED = { "Component",
+            "Editor", "Enabled" };
 
     @Before
     public void setUp() {
@@ -71,7 +71,7 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
         selectMenuPath(EDIT_ITEM_5);
         assertEditorClosed();
         boolean thrown = logContainsText(
-                "Exception occured, java.lang.IllegalStateException");
+                "Exception occurred, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
@@ -81,7 +81,7 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
         selectMenuPath(TOGGLE_EDIT_ENABLED);
         assertEditorOpen();
         boolean thrown = logContainsText(
-                "Exception occured, java.lang.IllegalStateException");
+                "Exception occurred, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
index 74cf478291..a4a715d998 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
@@ -31,10 +31,10 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 
 public class GridEditorUnbufferedTest extends GridEditorTest {
 
-    private static final String[] TOGGLE_EDITOR_BUFFERED = {
-            "Component", "Editor", "Buffered mode" };
-    private static final String[] CANCEL_EDIT = { "Component",
-            "Editor", "Cancel edit" };
+    private static final String[] TOGGLE_EDITOR_BUFFERED = { "Component",
+            "Editor", "Buffered mode" };
+    private static final String[] CANCEL_EDIT = { "Component", "Editor",
+            "Cancel edit" };
 
     @Override
     @Before
@@ -62,7 +62,7 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
         assertEditorOpen();
         selectMenuPath(TOGGLE_EDITOR_BUFFERED);
         boolean thrown = logContainsText(
-                "Exception occured, java.lang.IllegalStateException");
+                "Exception occurred, java.lang.IllegalStateException");
         assertTrue("IllegalStateException thrown", thrown);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
index c23ec16232..53a229a4c0 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -512,7 +512,7 @@ public class GridStructureTest extends GridBasicFeaturesTest {
     public void testAddThirdRowToGrid() {
         openTestURL();
         selectMenuPath("Component", "Body rows", "Add third row");
-        assertFalse(logContainsText("Exception occured"));
+        assertFalse(logContainsText("Exception occurred"));
     }
 
     @Test