]> source.dussan.org Git - vaadin-framework.git/commitdiff
Renamed template so it is not run as a TestBench script
authorArtur Signell <artur@vaadin.com>
Thu, 5 Apr 2012 08:13:11 +0000 (11:13 +0300)
committerArtur Signell <artur@vaadin.com>
Thu, 5 Apr 2012 08:13:11 +0000 (11:13 +0300)
tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
tests/testbench/com/vaadin/tests/components/customcomponent/template.htm [new file with mode: 0644]
tests/testbench/com/vaadin/tests/components/customcomponent/template.html [deleted file]

index 44c35efff41f208166f283614a3a8eaf32065227..5bd2dc6c4f999b32ff04f7a9a234bd3e16fdd34c 100644 (file)
@@ -22,7 +22,7 @@ public class CustomLayoutUsingTemplate extends TestBase implements
                 '.', '/');
         thisPackage = thisPackage.replaceAll(
                 CustomLayoutUsingTemplate.class.getSimpleName() + "$", "");
-        String template = thisPackage + "template.html";
+        String template = thisPackage + "template.htm";
         InputStream is = getClassLoader().getResourceAsStream(template);
         try {
             layout = new CustomLayout(is);
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm b/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm
new file mode 100644 (file)
index 0000000..fa02305
--- /dev/null
@@ -0,0 +1,4 @@
+<b>Contents</b>
+<div location="location1">This is where the first component goes</div>
+<div style="width: 500px; border: 1 px solid blue; margin: 10px;" location="location2">This is where the second component goes</div>
+<b>End of template</b>
\ No newline at end of file
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/template.html b/tests/testbench/com/vaadin/tests/components/customcomponent/template.html
deleted file mode 100644 (file)
index fa02305..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<b>Contents</b>
-<div location="location1">This is where the first component goes</div>
-<div style="width: 500px; border: 1 px solid blue; margin: 10px;" location="location2">This is where the second component goes</div>
-<b>End of template</b>
\ No newline at end of file