]> source.dussan.org Git - vaadin-framework.git/commitdiff
Run tests with assertions enabled (#9450)
authorLeif Åstrand <leif@vaadin.com>
Fri, 31 Aug 2012 11:27:45 +0000 (14:27 +0300)
committerLeif Åstrand <leif@vaadin.com>
Fri, 31 Aug 2012 11:28:06 +0000 (14:28 +0300)
server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java [new file with mode: 0644]
uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html [new file with mode: 0644]
uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java [new file with mode: 0644]
uitest/vaadin-server.xml

diff --git a/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java b/server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java
new file mode 100644 (file)
index 0000000..ee481c6
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 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.server;
+
+import junit.framework.TestCase;
+
+public class TestAssertionsEnabled extends TestCase {
+    public void testAssertionsEnabled() {
+        boolean assertFailed = false;
+        try {
+            assert false;
+        } catch (AssertionError e) {
+            assertFailed = true;
+        } finally {
+            assertTrue("Unit tests should be run with assertions enabled",
+                    assertFailed);
+        }
+    }
+}
index 6162820dac70097e9d0f2c178a5a5f7999930d60..f45aac817304814007eb81b09def6b03fde2e968 100644 (file)
@@ -54,6 +54,8 @@ public class DevelopmentServerLauncher {
     public static void main(String[] args) {
         System.setProperty("java.awt.headless", "true");
 
+        assertAssertionsEnabled();
+
         // Pass-through of arguments for Jetty
         final Map<String, String> serverArgs = parseArguments(args);
 
@@ -88,6 +90,18 @@ public class DevelopmentServerLauncher {
         }
     }
 
+    private static void assertAssertionsEnabled() {
+        try {
+            assert false;
+
+            throw new RuntimeException("You should run "
+                    + DevelopmentServerLauncher.class.getSimpleName()
+                    + " with assertions enabled. Add -ea as a VM argument.");
+        } catch (AssertionError e) {
+            // All is fine
+        }
+    }
+
     /**
      * Run the server with specified arguments.
      * 
diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.html
new file mode 100644 (file)
index 0000000..40ac075
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.VerifyAssertionsEnabled?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestsVerifyAssertionsEnabled::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td>
+       <td>Assertions are enabled</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java b/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java
new file mode 100644 (file)
index 0000000..d812ea6
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2011 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;
+
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+public class VerifyAssertionsEnabled extends AbstractTestUI {
+
+    @Override
+    protected void setup(WrappedRequest request) {
+        try {
+            assert false;
+            addComponent(new Label("Assertions are not enabled"));
+        } catch (AssertionError e) {
+            addComponent(new Label("Assertions are enabled"));
+        }
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tests whether the testing server is run with assertions enabled.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(9450);
+    }
+
+}
index d4d23581ec6da2584ce8b8a61670e5ec679e5c24..5f2aa063032d4967c7f78a3b13283b3f1f9d5dba 100644 (file)
@@ -41,6 +41,7 @@
             </classpath>
             <jvmarg value="-Demma.coverage.out.file=${testing.testarea}/${package.name}/war.ec"/>
             <jvmarg value="-Djava.awt.headless=true"/>
+               <jvmarg value="-ea" />
         </java>
     </target>