Author: dmaliarevich Date: 2010-08-02 04:36:34 -0400 (Mon, 02 Aug 2010) New Revision: 23859 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringFormComponentTest.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java Log: https://jira.jboss.org/browse/JBIDE-6711 , JUnit class for Spring templates was added. Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-08-02 07:48:37 UTC (rev 23858) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-08-02 08:36:34 UTC (rev 23859) @@ -24,10 +24,15 @@ public class SpringAllTests { + /* + * Import project name + */ + public static final String IMPORT_PROJECT_NAME = "SpringTest"; //$NON-NLS-1$ + public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Spring components"); //$NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(SpringFormComponentTest.class); + suite.addTestSuite(SpringComponentTest.class); //cleanUpTests(); // $JUnit-END$ return new VpeTestSetup(suite); Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-02 08:36:34 UTC (rev 23859) @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.spring.test; + +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * Tests for the context that was generated by Spring templates + * + * @author dmaliarevich + */ +public class SpringComponentContentTest extends ComponentContentTest { + + /** + * The Constructor + * + * @param name a test case name + */ + public SpringComponentContentTest(String name) { + super(name); + setCheckWarning(false); + } + + public void testCheckbox() throws Throwable { +// performContentTest("components/inplaceSelect/JBIDE4309.xhtml"); //$NON-NLS-1$ + } + + @Override + protected String getTestProjectName() { + return SpringAllTests.IMPORT_PROJECT_NAME; + } + +} Copied: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java (from rev 23836, trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringFormComponentTest.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java 2010-08-02 08:36:34 UTC (rev 23859) @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.spring.test; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; + +/** + * Class for testing form spring components + * + * @author Yahor Radtsevich (yradtsevich) + * + */ +public class SpringComponentTest extends VpeTest { + + public SpringComponentTest(String name) { + super(name); + } + + /* + * Spring Form test cases + */ + public void testCheckbox() throws Throwable { + performTestForVpeComponent((IFile)TestUtil.getResource( + "src/main/webapp/WEB-INF/jsp/checkbox.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + public void testCheckboxes() throws Throwable { + performTestForVpeComponent((IFile)TestUtil.getResource( + "src/main/webapp/WEB-INF/jsp/checkboxes.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + public void testRadiobutton() throws Throwable { + performTestForVpeComponent((IFile)TestUtil.getResource( + "src/main/webapp/WEB-INF/jsp/radiobutton.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + public void testForm() throws Throwable { + performTestForVpeComponent((IFile)TestUtil.getResource( + "src/main/webapp/WEB-INF/jsp/form.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } + + public void testErrors() throws Throwable { + performTestForVpeComponent((IFile)TestUtil.getResource( + "src/main/webapp/WEB-INF/jsp/errors.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } +} Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringFormComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringFormComponentTest.java 2010-08-02 07:48:37 UTC (rev 23858) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringFormComponentTest.java 2010-08-02 08:36:34 UTC (rev 23859) @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.spring.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; - -/** - * Class for testing form spring components - * - * @author Yahor Radtsevich (yradtsevich) - * - */ -public class SpringFormComponentTest extends VpeTest { - - // import project name - static final String IMPORT_PROJECT_NAME = "SpringTest"; //$NON-NLS-1$ - - public SpringFormComponentTest(String name) { - super(name); - } - - /* - * Spring Form test cases - */ - - public void testCheckbox() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/checkbox.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCheckboxes() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/checkboxes.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testRadiobutton() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/radiobutton.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testForm() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/form.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testErrors() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/errors.jsp", IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } -}