[jboss-cvs] JBossAS SVN: r91026 - in projects/mc-tools/grapher/trunk/src: test/java/org/jboss/test/mctools/grapher/render/support and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 9 16:41:41 EDT 2009
Author: alesj
Date: 2009-07-09 16:41:40 -0400 (Thu, 09 Jul 2009)
New Revision: 91026
Added:
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java
Modified:
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/RendererTestCase.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/Write2FileTestCase.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/swing/ManualSwingExample.java
Log:
Run all render test through swing view.
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -118,7 +118,7 @@
*/
protected DefaultGraphCell createCell(Object label)
{
- DefaultGraphCell cell = new ColorableGraphCell(label, Color.YELLOW);
+ DefaultGraphCell cell = new ColorableGraphCell(label, Color.BLUE);
/*
GraphConstants.setBounds(cell.getAttributes(), new Rectangle2D.Double(20,20,30,15));
GraphConstants.setGradientColor(cell.getAttributes(), Color.orange);
Copied: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java (from rev 91008, projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/JGraphView.java)
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java (rev 0)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/support/SwingExampleDelegateTest.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.mctools.grapher.render.support;
+
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
+import org.jboss.test.mctools.grapher.render.test.AbstractRendererTest;
+import org.jgraph.JGraph;
+
+/**
+ * Expose Microcontainer test as swing view.
+ *
+ * A bunch of reflectio nhacks to get what we want.
+ * Not to mention static setter.
+ * :-)
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class SwingExampleDelegateTest extends MicrocontainerTest
+{
+ private static AbstractRendererTest delegate;
+
+ public SwingExampleDelegateTest()
+ {
+ super("testSwingView");
+ }
+
+ public static void setDelegate(AbstractRendererTest delegate)
+ {
+ SwingExampleDelegateTest.delegate = delegate;
+ }
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ SwingExampleDelegate testDelegate = new SwingExampleDelegate(clazz);
+ testDelegate.enableSecurity = false;
+ return testDelegate;
+ }
+
+ public void testSwingView() throws Throwable
+ {
+ JGraph graph = delegate.createGraph();
+ JGraphView view = new JGraphView(graph);
+ view.view();
+ }
+
+ private static class SwingExampleDelegate extends MicrocontainerTestDelegate
+ {
+ private SwingExampleDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ @Override
+ protected String getTestName()
+ {
+ Class<?> delegateClass = delegate.getClass();
+ String testName = delegateClass.getName();
+ return testName.replace('.', '/') + ".xml";
+ }
+ }
+}
\ No newline at end of file
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -68,7 +68,7 @@
protected abstract void testOutputStream(T out, String suffix);
- protected abstract JGraph createGraph();
+ public abstract JGraph createGraph();
protected void cleanupOutputStream(T out)
{
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -54,7 +54,7 @@
}
@SuppressWarnings("unchecked")
- protected JGraph createGraph()
+ public JGraph createGraph()
{
DefaultGraphCell[] cells = new DefaultGraphCell[3];
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/RendererTestCase.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/RendererTestCase.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/RendererTestCase.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -61,7 +61,7 @@
assertTrue(bytes.length > 0);
}
- protected JGraph createGraph()
+ public JGraph createGraph()
{
GraphCreator creator = GraphCreatorMapper.ALL;
return creator.createGraph(getKernelController());
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/Write2FileTestCase.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/Write2FileTestCase.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/Write2FileTestCase.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -79,7 +79,7 @@
assertTrue(tempFile.delete());
}
- protected JGraph createGraph()
+ public JGraph createGraph()
{
GraphCreator creator = GraphCreatorMapper.ALL;
return creator.createGraph(getKernelController());
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/swing/ManualSwingExample.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/swing/ManualSwingExample.java 2009-07-09 20:31:27 UTC (rev 91025)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/swing/ManualSwingExample.java 2009-07-09 20:41:40 UTC (rev 91026)
@@ -21,27 +21,55 @@
*/
package org.jboss.test.mctools.grapher.render.test.swing;
+import java.lang.reflect.Method;
+
+import junit.textui.TestRunner;
+import org.jboss.test.mctools.grapher.render.support.SwingExampleDelegateTest;
+import org.jboss.test.mctools.grapher.render.test.AbstractRendererTest;
import org.jboss.test.mctools.grapher.render.test.ManualGraphWrite2FileTestCase;
-import org.jboss.test.mctools.grapher.render.support.JGraphView;
-import org.jgraph.JGraph;
+import org.jboss.test.mctools.grapher.render.test.RendererTestCase;
+import org.jboss.test.mctools.grapher.render.test.Write2FileTestCase;
/**
* Run tests via swing example.
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class ManualSwingExample extends ManualGraphWrite2FileTestCase
+public class ManualSwingExample
{
- public ManualSwingExample(String name)
+ public static void main(String[] args)
{
- super(name);
+ runTest(ManualGraphWrite2FileTestCase.class);
+ runTest(Write2FileTestCase.class);
+ runTest(RendererTestCase.class);
}
- public static void main(String[] args)
+ protected static void runTest(Class<? extends AbstractRendererTest> clazz)
{
- ManualSwingExample example = new ManualSwingExample("Manual Swing Example");
- JGraph graph = example.createGraph();
- JGraphView view = new JGraphView(graph);
- view.view();
+ Method[] methods = clazz.getMethods();
+ for (Method m : methods)
+ {
+ String name = m.getName();
+ if (name.startsWith("test") && m.getParameterTypes().length == 0)
+ {
+ runMethod(clazz, name);
+ break; // we need only one of svg, gif jpg or png
+ }
+ }
}
+
+ protected static void runMethod(Class<? extends AbstractRendererTest> clazz, String method)
+ {
+ try
+ {
+ AbstractRendererTest delegate = clazz.getConstructor(String.class).newInstance(method);
+ SwingExampleDelegateTest.setDelegate(delegate);
+ SwingExampleDelegateTest test = new SwingExampleDelegateTest();
+ TestRunner.run(test);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ }
}
More information about the jboss-cvs-commits
mailing list