summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorDenis Anisimov <denis@vaadin.com>2014-09-03 22:49:44 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-09-12 16:54:20 +0300
commit51b6c263cb2076bcc07f366bac966536448a5d3c (patch)
treee64e45ca9c5bb42e5d2544a6a96f14d334b2dd7a /uitest
parent219cd81c6d097b34419dadc68e307f48575b5cbb (diff)
downloadvaadin-framework-51b6c263cb2076bcc07f366bac966536448a5d3c.tar.gz
vaadin-framework-51b6c263cb2076bcc07f366bac966536448a5d3c.zip
Set title to empty string for Upload if tooltip is used (#14482).
Change-Id: Id9cc9d644772af923d3f5307ea4123df8666a489
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java47
-rw-r--r--uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java54
2 files changed, 101 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java b/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
new file mode 100644
index 0000000000..e2d47ab901
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2014 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.upload;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Upload;
+
+/**
+ * Test UI for browser-dependent tootlip for Upload component.
+ *
+ * @author Vaadin Ltd
+ */
+public class UploadTitleWithTooltip extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ Upload upload = new Upload();
+ upload.setDescription("tootlip");
+
+ addComponent(upload);
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Browser dependent title should not be visible for upload if Vaadin tooltip is used";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 14482;
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java b/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
new file mode 100644
index 0000000000..54ccf993ff
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2000-2014 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.upload;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.TooltipTest;
+
+/**
+ * Test for check visibility of browser-dependent tootlip for Upload component.
+ *
+ * @author Vaadin Ltd
+ */
+public class UploadTitleWithTooltipTest extends TooltipTest {
+
+ @Test
+ public void testDropdownTable() throws Exception {
+ openTestURL();
+
+ List<WebElement> elements = findElements(By.tagName("input"));
+ WebElement input = null;
+ for (WebElement element : elements) {
+ if ("file".equals(element.getAttribute("type"))) {
+ input = element;
+ }
+ }
+
+ Assert.assertNotNull("Input element with type 'file' is not found",
+ input);
+
+ checkTooltip(input, "tootlip");
+
+ compareScreen(getScreenshotBaseName());
+ }
+
+}
ass="p">; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.RawParseUtils; import org.junit.Test; /** * End-to-end tests for some attribute combinations. Writes files, commit them, * examines the index, deletes the files, performs a hard reset and checks file * contents again. */ public class AttributeFileTests extends RepositoryTestCase { @Test public void testTextAutoCoreEolCoreAutoCrLfInput() throws Exception { FileBasedConfig cfg = db.getConfig(); cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_AUTOCRLF, false); cfg.save(); final String content = "Line1\nLine2\n"; try (Git git = Git.wrap(db)) { writeTrashFile(".gitattributes", "* text=auto"); File dummy = writeTrashFile("dummy.txt", content); git.add().addFilepattern(".").call(); git.commit().setMessage("Commit with LF").call(); assertEquals("Unexpected index state", "[.gitattributes, mode:100644, content:* text=auto]" + "[dummy.txt, mode:100644, content:" + content + ']', indexState(CONTENT)); assertTrue("Should be able to delete " + dummy, dummy.delete()); cfg.setString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, "crlf"); cfg.setString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_AUTOCRLF, "input"); cfg.save(); git.reset().setMode(ResetType.HARD).call(); assertTrue("File " + dummy + "should exist", dummy.isFile()); String textFile = RawParseUtils.decode(IO.readFully(dummy, 512)); assertEquals("Unexpected text content", content, textFile); } } @Test public void testTextAutoEolLf() throws Exception { writeTrashFile(".gitattributes", "* text=auto eol=lf"); performTest("Test\r\nFile", "Test\nFile", "Test\nFile"); } @Test public void testTextAutoEolCrLf() throws Exception { writeTrashFile(".gitattributes", "* text=auto eol=crlf"); performTest("Test\r\nFile", "Test\nFile", "Test\r\nFile"); } private void performTest(String initial, String index, String finalText) throws Exception { File dummy = writeTrashFile("dummy.foo", initial); byte[] data = readTestResource("add.png"); assertTrue("Expected some binary data", data.length > 100); File binary = writeTrashFile("add.png", ""); Files.write(binary.toPath(), data); try (Git git = Git.wrap(db)) { git.add().addFilepattern(".").call(); git.commit().setMessage("test commit").call(); // binary should be unchanged, dummy should match "index" verifyIndexContent("dummy.foo", index.getBytes(StandardCharsets.UTF_8)); verifyIndexContent("add.png", data); assertTrue("Should be able to delete " + dummy, dummy.delete()); assertTrue("Should be able to delete " + binary, binary.delete()); git.reset().setMode(ResetType.HARD).call(); assertTrue("File " + dummy + " should exist", dummy.isFile()); assertTrue("File " + binary + " should exist", binary.isFile()); // binary should be unchanged, dummy should match "finalText" String textFile = RawParseUtils.decode(IO.readFully(dummy, 512)); assertEquals("Unexpected text content", finalText, textFile); byte[] binaryFile = IO.readFully(binary, 512); assertArrayEquals("Unexpected binary content", data, binaryFile); } } private byte[] readTestResource(String name) throws Exception { try (InputStream in = new BufferedInputStream( getClass().getResourceAsStream(name))) { byte[] data = new byte[512]; int read = in.read(data); if (read == data.length) { return data; } return Arrays.copyOf(data, read); } } private void verifyIndexContent(String path, byte[] expectedContent) throws Exception { DirCache dc = db.readDirCache(); for (int i = 0; i < dc.getEntryCount(); ++i) { DirCacheEntry entry = dc.getEntry(i); if (path.equals(entry.getPathString())) { byte[] data = db.open(entry.getObjectId(), Constants.OBJ_BLOB) .getCachedBytes(); assertArrayEquals("Unexpected index content for " + path, expectedContent, data); return; } } fail("Path not found in index: " + path); } }