573155: Accessibility improvements for HTML reports

HTML page checking requires everything so add charts plugins to the testing. Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=573155 Change-Id: Ic4ef0de78233666c3bc1b1c264be6fc942e9adaf
eclipse-mat · May 5, 2021 · 6fd08c6 · 6fd08c6
1 parent f1d62ca
commit 6fd08c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/plugins/org.eclipse.mat.tests/pom.xml b/plugins/org.eclipse.mat.tests/pom.xml
@@ -54,6 +54,11 @@
 								<id>org.eclipse.mat.ibmdumps</id>
 								<versionRange>0.0.0</versionRange>
 							</requirement>
+							<requirement>
+								<type>eclipse-plugin</type>
+								<id>org.eclipse.mat.chart</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
 							<requirement>
 								<type>p2-installable-unit</type>
 								<id>com.ibm.dtfj.feature.feature.group</id>

diff --git a/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/snapshot/GeneralSnapshotTests.java b/plugins/org.eclipse.mat.tests/src/org/eclipse/mat/tests/snapshot/GeneralSnapshotTests.java
@@ -704,6 +704,8 @@ public void checkHTMLFile(File f) throws IOException, SnapshotException
     {
         Map<File, String> seen = new HashMap<File, String>();
         checkHTMLFile(f, seen);
+        seen.clear();
+        seen = null;
     }
 
     /**
@@ -1014,7 +1016,11 @@ else if (link.getType() == QueryObjectLink.Type.QUERY)
                         try
                         {
                             r = q.execute(new CheckedProgressListener(collector));
-                            if ((cmdname.equals("system_properties") || cmdname.equals("thread_overview")|| cmdname.equals("finalizer_thread"))
+                            if ((cmdname.equals("system_properties") 
+                                            || cmdname.equals("thread_overview")
+                                            || cmdname.equals("finalizer_thread")
+                                            || cmdname.equals("path2gc_reg_test")
+                                            )
                                             && (snapshot.getSnapshotInfo().getProperty("$heapFormat").equals("DTFJ-PHD")
                                                             || snapshot.getSnapshotInfo().getProperty("$heapFormat")
                                                             .equals("DTFJ-Javacore")))
@@ -1042,13 +1048,16 @@ else if (link.getType() == QueryObjectLink.Type.QUERY)
                         }
                         catch (SnapshotException e)
                         {
-                            if (cmdname.equals("unreachable_objects") && snapshot.getSnapshotAddons(UnreachableObjectsHistogram.class) == null)
+                            if (cmdname.equals("unreachable_objects")
+                                            && snapshot.getSnapshotAddons(UnreachableObjectsHistogram.class) == null
+                                            || snapshot.getSnapshotInfo().getProperty("$heapFormat")
+                                                            .equals("DTFJ-Javacore"))
                             {
                                 // This is an acceptable exception
                             }
                             else
                             {
-                                throw e;
+                                throw new SnapshotException(t, e);
                             }
                         }
                     }