Merge changes from origin/7.1

4f7fc2d Fix invalid copyright header
43b8ca5 Remove unnecessary Webkit scrollbar test

Change-Id: I6153a89f689818fa9f612d4b22303f7d4030fa6d

2 files changed, 13 insertions, 40 deletions

diff --git a/uitest/src/com/vaadin/tests/browserfeatures/WebkitPositionAbsoluteScrollbarsTest.java b/uitest/src/com/vaadin/tests/browserfeatures/WebkitPositionAbsoluteScrollbarsTest.java
deleted file mode 100644
index 54fb7212ca..0000000000
--- a/uitest/src/com/vaadin/tests/browserfeatures/WebkitPositionAbsoluteScrollbarsTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2013 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.browserfeatures;
-
-import org.junit.Test;
-import org.openqa.selenium.By;
-
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-public class WebkitPositionAbsoluteScrollbarsTest extends MultiBrowserTest {
-
-    @Override
-    protected String getDeploymentPath() {
-        return "/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html";
-    }
-
-    @Test
-    public void testWebkitScrollbarProblem() throws Exception {
-        openTestURL();
-        getDriver().findElement(By.id("step1")).click();
-        getDriver().findElement(By.id("step2")).click();
-        getDriver().findElement(By.id("step3")).click();
-        getDriver().findElement(By.id("step4")).click();
-        compareScreen("no-scrollbars");
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
index 8aa2032935..dc88865621 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
@@ -1,5 +1,17 @@
 /*
-@ITMillApache2LicenseForJavaFiles@
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package com.vaadin.tests.components.ui;