diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-04 13:37:39 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-04 13:37:39 +0200 |
| commit | bc80f838198c005300a0faf706f5a72ba8ad18fe (patch) | |
| tree | ba498312ac5749c2dca2f4a0678370140b5aa506 | |
| parent | db7943857bbf56812d606a5a204067cd1df40889 (diff) | |
| download | vaadin-framework-bc80f838198c005300a0faf706f5a72ba8ad18fe.tar.gz vaadin-framework-bc80f838198c005300a0faf706f5a72ba8ad18fe.zip | |
Refactored VerifyJreVersion test to TB3.
Change-Id: I7283685ee61a0a68563aeb39633090b376c57380
| -rw-r--r-- | uitest/src/com/vaadin/tests/VerifyJreVersion.html | 26 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/VerifyJreVersion.java | 5 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/VerifyJreVersionTest.java | 38 |
3 files changed, 42 insertions, 27 deletions
diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersion.html b/uitest/src/com/vaadin/tests/VerifyJreVersion.html deleted file mode 100644 index abf53883c1..0000000000 --- a/uitest/src/com/vaadin/tests/VerifyJreVersion.html +++ /dev/null @@ -1,26 +0,0 @@ -<?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.VerifyJreVersion?restartApplication</td> - <td></td> -</tr> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsVerifyJreVersion::/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td> - <td>Using Java 1.6.0_32 by Sun Microsystems Inc.</td> -</tr> -</tbody></table> -</body> -</html> diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersion.java b/uitest/src/com/vaadin/tests/VerifyJreVersion.java index fe3e4bd870..a41955f826 100644 --- a/uitest/src/com/vaadin/tests/VerifyJreVersion.java +++ b/uitest/src/com/vaadin/tests/VerifyJreVersion.java @@ -29,7 +29,10 @@ public class VerifyJreVersion extends AbstractTestUI { protected void setup(VaadinRequest request) { String jreVersion = "Using Java " + System.getProperty("java.version") + " by " + System.getProperty("java.vendor"); - addComponent(new Label(jreVersion)); + Label jreVersionLabel = new Label(jreVersion); + jreVersionLabel.setId("jreVersionLabel"); + + addComponent(jreVersionLabel); } @Override diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java b/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java new file mode 100644 index 0000000000..aba120ac0b --- /dev/null +++ b/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java @@ -0,0 +1,38 @@ +/* + * 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; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class VerifyJreVersionTest extends MultiBrowserTest { + + @Test + public void verifyJreVersion() { + openTestURL(); + + WebElement jreVersionLabel = vaadinElementById("jreVersionLabel"); + + assertThat(jreVersionLabel.getText(), + is("Using Java 1.6.0_45 by Sun Microsystems Inc.")); + } + +} |