Ignored methods.
diff --git a/src/main/java/org/testng/reporters/jq/IgnoredMethodsPanel.java b/src/main/java/org/testng/reporters/jq/IgnoredMethodsPanel.java
new file mode 100644
index 0000000..d92c77f
--- /dev/null
+++ b/src/main/java/org/testng/reporters/jq/IgnoredMethodsPanel.java
@@ -0,0 +1,52 @@
+package org.testng.reporters.jq;
+
+import org.testng.ISuite;
+import org.testng.ITestNGMethod;
+import org.testng.collections.Maps;
+import org.testng.collections.SetMultiMap;
+import org.testng.reporters.XMLStringBuffer;
+
+public class IgnoredMethodsPanel extends BaseMultiSuitePanel {
+
+ public IgnoredMethodsPanel(Model model) {
+ super(model);
+ }
+
+ private static String getTag(ISuite suite) {
+ return "ignored-methods-" + suiteToTag(suite);
+ }
+
+ @Override
+ public String getHeader(ISuite suite) {
+ return pluralize(suite.getExcludedMethods().size(), "ignored method");
+ }
+
+ @Override
+ public String getPanelName(ISuite suite) {
+ return getTag(suite);
+ }
+
+ @Override
+ public String getContent(ISuite suite, XMLStringBuffer main) {
+ XMLStringBuffer xsb = new XMLStringBuffer(main.getCurrentIndent());
+ SetMultiMap<Class<?>, ITestNGMethod> map = Maps.newSetMultiMap();
+
+ for (ITestNGMethod method : suite.getExcludedMethods()) {
+ map.put(method.getTestClass().getRealClass(), method);
+ }
+
+ for (Class<?> c : map.getKeys()) {
+ xsb.push(D, C, "ignored-class-div");
+ xsb.addRequired(S, c.getName(), C, "ignored-class-name");
+ xsb.push(D, C, "ignored-methods-div");
+ for (ITestNGMethod m : map.get(c)) {
+ xsb.addRequired(S, m.getMethodName(), C, "ignored-method-name");
+ xsb.addEmptyElement("br");
+ }
+ xsb.pop(D);
+ xsb.pop(D);
+ }
+ return xsb.toXML();
+ }
+
+}
diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java
index 8b302d4..203c0f6 100644
--- a/src/main/java/org/testng/reporters/jq/Main.java
+++ b/src/main/java/org/testng/reporters/jq/Main.java
@@ -42,7 +42,9 @@
GroupPanel groupPanel = new GroupPanel(m_model);
TimesPanel timePanel = new TimesPanel(m_model);
ReporterPanel reporterPanel = new ReporterPanel(m_model);
- new NavigatorPanel(m_model, testNgPanel, testPanel, groupPanel, timePanel, reporterPanel)
+ IgnoredMethodsPanel ignoredMethodsPanel = new IgnoredMethodsPanel(m_model);
+ new NavigatorPanel(m_model, testNgPanel, testPanel, groupPanel, timePanel, reporterPanel,
+ ignoredMethodsPanel)
.generate(xsb);
xsb.push(D, C, "wrapper");
@@ -52,31 +54,12 @@
// Suite panels
//
new SuitePanel(m_model).generate(xsb);
-
- //
- // Group panel
- //
groupPanel.generate(xsb);
-
- //
- // Reporter panel
- //
reporterPanel.generate(xsb);
-
- //
- // Times panel
- //
timePanel.generate(xsb);
-
- //
- // Panel that displays the list of test names
- //
testPanel.generate(xsb);
-
- //
- // Panel that displays the content of testng.xml
- //
testNgPanel.generate(xsb);
+ ignoredMethodsPanel.generate(xsb);
xsb.pop(D); // main-panel-root
xsb.pop(D); // wrapper
diff --git a/src/main/java/org/testng/reporters/jq/NavigatorPanel.java b/src/main/java/org/testng/reporters/jq/NavigatorPanel.java
index 075b96d..03ab252 100644
--- a/src/main/java/org/testng/reporters/jq/NavigatorPanel.java
+++ b/src/main/java/org/testng/reporters/jq/NavigatorPanel.java
@@ -18,15 +18,18 @@
private GroupPanel m_groupPanel;
private TimesPanel m_timePanel;
private ReporterPanel m_reporterPanel;
+ private IgnoredMethodsPanel m_ignoredMethodsPanel;
public NavigatorPanel(Model model, TestNgXmlPanel testNgPanel, TestPanel testPanel,
- GroupPanel groupPanel, TimesPanel timePanel, ReporterPanel reporterPanel) {
+ GroupPanel groupPanel, TimesPanel timePanel, ReporterPanel reporterPanel,
+ IgnoredMethodsPanel ignoredMethodsPanel) {
super(model);
m_testNgPanel = testNgPanel;
m_testPanel = testPanel;
m_groupPanel = groupPanel;
m_timePanel = timePanel;
m_reporterPanel = reporterPanel;
+ m_ignoredMethodsPanel = ignoredMethodsPanel;
}
@Override
@@ -154,6 +157,9 @@
// Reporter
addLinkTo(header, m_reporterPanel, suite, "Reporter output", null);
+ // Ignored methods
+ addLinkTo(header, m_ignoredMethodsPanel, suite, "Ignored methods", null);
+
// "testng.xml"
String fqName = suite.getXmlSuite().getFileName();
if (fqName == null) fqName = "/[unset file name]";
@@ -207,6 +213,7 @@
m_suite = suite;
m_type = type;
}
+
@Override
public String getType() {
return m_type;
diff --git a/src/main/resources/testng-reports.css b/src/main/resources/testng-reports.css
index 3594574..689c912 100644
--- a/src/main/resources/testng-reports.css
+++ b/src/main/resources/testng-reports.css
@@ -201,3 +201,17 @@
border-width: 0px 0px 0px 1px;
border-style: solid;
}
+
+.ignored-class-div {
+ font-size: 14px;
+ font-family: monospace;
+}
+
+.ignored-methods-div {
+ padding: 5px;
+ margin: 0px 0px 5px 20px;
+ font-size: 12px;
+ font-family: monospace;
+ border-width: 0px 0px 0px 1px;
+ border-style: solid;
+}
