Bug 299340 [CommonNavigator] Enable new CNF tests
Enable the contributed CNF tests, make minor test improvements.
tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/M12Tests.java
assertTrue(
				"[bug 285529] M1 intercept update or refresh should have been called",
				M1ContentProvider.getInterceptRefreshCount()
						+ M1ContentProvider.getInterceptUpdateCount() >= 1);
		assertTrue(
				"[bug 285529] M2 intercept update or refresh should have been called",
				M2ContentProvider.getInterceptRefreshCount()
						+ M2ContentProvider.getInterceptUpdateCount() >= 1);
	}
	/**
	 * Returns the TreeItem whose data is a ResourceWrapper with the specified
	 * name.
	 */
	private TreeItem _findChild(String name, TreeItem[] items) {
		for (int i = 0; i < items.length; i++) {
			assertTrue("Child " + items[i] + " should be an M1 or M2 resource",
					items[i].getData() instanceof ResourceWrapper);
			ResourceWrapper rw = (ResourceWrapper) items[i].getData();
			if (name.equals(rw.getResource().getName())) {
				return items[i];
			}
		}
		return null;
	}
	private void _expand(TreeItem[] items) {
		for (int i = 0; i < items.length; i++) {
			_viewer.setExpandedState(items[i].getData(), true);
		}
	}
}