From: John Ahlroos <john@vaadin.com>
Date: Tue, 14 Jan 2014 12:17:33 +0000 (+0200)
Subject: Renamed test according to conventions and fixed assertion text.
X-Git-Tag: 7.1.10~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=857de0f2f3964f4459b665d1928641c1689ccd37;p=vaadin-framework.git

Renamed test according to conventions and fixed assertion text.

Change-Id: I7ede421f7e0c5ae726167b4ee7b2d8651a70c77c
---

diff --git a/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.java b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.java
deleted file mode 100644
index c2222c4608..0000000000
--- a/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.java
+++ /dev/null
@@ -1,49 +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.applicationservlet;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-public class NoApplicationClass extends MultiBrowserTest {
-
-    @Test
-    public void testInvalidApplicationClass() {
-        openTestURL();
-        String exceptionMessage = getDriver().findElement(By.xpath("//pre[2]"))
-                .getText();
-        Assert.assertTrue(exceptionMessage
-                .contains("ServletException: ClassThatIsNotPresent"));
-    }
-
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return Collections.singletonList(Browser.CHROME
-                .getDesiredCapabilities());
-    }
-
-    @Override
-    protected String getDeploymentPath() {
-        return "/run/ClassThatIsNotPresent";
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
new file mode 100644
index 0000000000..9d1b052182
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.applicationservlet;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class NoApplicationClassTest extends MultiBrowserTest {
+
+    @Test
+    public void testInvalidApplicationClass() {
+        openTestURL();
+        String exceptionMessage = getDriver().findElement(By.xpath("//pre[2]"))
+                .getText();
+        Assert.assertTrue(exceptionMessage
+                .contains("ServletException: java.lang.ClassNotFoundException: ClassThatIsNotPresent"));
+    }
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Collections.singletonList(Browser.CHROME
+                .getDesiredCapabilities());
+    }
+
+    @Override
+    protected String getDeploymentPath() {
+        return "/run/ClassThatIsNotPresent";
+    }
+}