summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchanghyun1.lee <changhyun1.lee@samsung.com>2014-04-16 20:26:50 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2014-04-16 20:26:50 -0700
commitd7c28a90dbec131ee633c198f1406fa5a84b7f64 (patch)
tree6fbec7309c9ea27caa0e6b407cc158b713c7e403
parent00c9a2c62c4d68da0c05fe431eb4b666f75ece57 (diff)
parentb3ba02121ead53bd240d0542866493b5d165f039 (diff)
downloadcommon-eplugin-d7c28a90dbec131ee633c198f1406fa5a84b7f64.tar.gz
common-eplugin-d7c28a90dbec131ee633c198f1406fa5a84b7f64.tar.bz2
common-eplugin-d7c28a90dbec131ee633c198f1406fa5a84b7f64.zip
Merge "UNITTEST: Fixed unittest fail" into tizen
-rwxr-xr-xorg.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/complex-template.jarbin0 -> 21581 bytes
-rwxr-xr-xorg.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/simple-template.jarbin0 -> 21909 bytes
-rwxr-xr-xorg.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java27
3 files changed, 0 insertions, 27 deletions
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/complex-template.jar b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/complex-template.jar
new file mode 100755
index 000000000..027ea8df2
--- /dev/null
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/complex-template.jar
Binary files differ
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/simple-template.jar b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/simple-template.jar
new file mode 100755
index 000000000..278b679a7
--- /dev/null
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/simple-template.jar
Binary files differ
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
index 82f0b653d..cd9b02bc1 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
@@ -542,33 +542,6 @@ public class FreemarkerTemplateEngineTest {
assertTrue(result.contains("<link rel=\"stylesheet\" type=\"text/css\" href=\"./css/style.css\"/>"));
assertTrue(result.contains("All I Want For Chritsmas Is You"));
}
- {
- // JQM - navigation - section2.html
- final ModelManager modelManager = new ModelManager();
- modelManager.addModel("HTMLDescription", "");
- modelManager.addModel("MetaViewport", "");
- modelManager.addModel("MetaDescriptionContent", "JQMNavigationSection2");
- modelManager.addModel("HtmlTitle", "JQMNavigationSection2");
- modelManager.addModel("JQMProject", "");
- modelManager.addModel("JQMCSS", "./css/jquery.mobile-1.1.0.css");
- modelManager.addModel("JQuery", "./js/jquery-1.7.1.js");
- modelManager.addModel("JQMJS", "./js/jquery.mobile-1.1.0.js");
- modelManager.addModel("HTMLJQMNavigationSection2", "");
-
- final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- engine.generate("HTMLBase", modelManager, byteOut );
- final String result = byteOut.toString();
- assertTrue(0 < result.length());
- assertTrue(result.contains("Copyright"));
- assertTrue(result.contains("meta name=\"viewport\""));
- assertTrue(result.contains("JQMNavigationSection2"));
- assertTrue(result.contains("./js/jquery-1.7.1.js"));
- assertFalse(result.contains("tizen-web-ui-fw-libs.js"));
- assertFalse(result.contains("tizen-web-ui-fw.js"));
- assertTrue(result.contains("<script type=\"text/javascript\" src=\"./js/main.js\"></script>"));
- assertTrue(result.contains("<link rel=\"stylesheet\" type=\"text/css\" href=\"./css/style.css\"/>"));
- assertTrue(result.contains("Adam Lambert"));
- }
}
}