NEW - bug 278315: add relevance value to listings

https://bugs.eclipse.org/bugs/show_bug.cgi?id=278315

2 files changed, 166 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java
new file mode 100644
index 00000000..f5afcc3a
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryCategoryComparatorTest.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.discovery.tests.core.util;
+
+import junit.framework.TestCase;
+
+import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
+import org.eclipse.mylyn.internal.discovery.core.util.DiscoveryCategoryComparator;
+
+@SuppressWarnings("restriction")
+public class DiscoveryCategoryComparatorTest extends TestCase {
+
+	private DiscoveryCategoryComparator comparator;
+
+	private DiscoveryCategory category1;
+
+	private DiscoveryCategory category2;
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		comparator = new DiscoveryCategoryComparator();
+		category1 = new DiscoveryCategory();
+		category2 = new DiscoveryCategory();
+	}
+
+	public void testSortByRelevanceInequal() {
+		category1.setRelevance("100");
+		category2.setRelevance("50");
+		assertEquals(-1, comparator.compare(category1, category2));
+		assertEquals(1, comparator.compare(category2, category1));
+	}
+
+	public void testSortByRelevanceOneNotSpecified() {
+		category1.setRelevance("10");
+		assertEquals(-1, comparator.compare(category1, category2));
+		assertEquals(1, comparator.compare(category2, category1));
+	}
+
+	public void testSortByRelevanceSame() {
+		category1.setRelevance("10");
+		category1.setName("test");
+		category1.setId("1");
+		category2.setRelevance("10");
+		category2.setName("test");
+		category2.setId("1");
+		assertEquals(0, comparator.compare(category1, category2));
+		assertEquals(0, comparator.compare(category2, category1));
+	}
+
+	public void testSortByRelevanceSameIdsDiffer() {
+		category1.setRelevance("10");
+		category1.setName("test");
+		category1.setId("a");
+		category2.setRelevance("10");
+		category2.setName("test");
+		category2.setId("b");
+		assertEquals(-1, comparator.compare(category1, category2));
+		assertEquals(1, comparator.compare(category2, category1));
+	}
+
+	public void testSortByRelevanceSameNamesDiffer() {
+		category1.setRelevance("10");
+		category1.setName("a");
+		category1.setId("a");
+		category2.setRelevance("10");
+		category2.setName("b");
+		category2.setId("a");
+		assertEquals(-1, comparator.compare(category1, category2));
+		assertEquals(1, comparator.compare(category2, category1));
+	}
+}
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java
new file mode 100644
index 00000000..b450fe17
--- /dev/null
+++ b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/core/util/DiscoveryConnectorComparatorTest.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.discovery.tests.core.util;
+
+import junit.framework.TestCase;
+
+import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCategory;
+import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector;
+import org.eclipse.mylyn.internal.discovery.core.model.Group;
+import org.eclipse.mylyn.internal.discovery.core.util.DiscoveryConnectorComparator;
+
+@SuppressWarnings("restriction")
+public class DiscoveryConnectorComparatorTest extends TestCase {
+
+	private DiscoveryCategory category;
+
+	private DiscoveryConnectorComparator comparator;
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		category = new DiscoveryCategory();
+		comparator = new DiscoveryConnectorComparator(category);
+	}
+
+	private Group addGroup(String id) {
+		Group group = new Group();
+		group.setId(id);
+		category.getGroup().add(group);
+		return group;
+	}
+
+	private DiscoveryConnector addConnectorDescriptor(String id, String name, String groupId) {
+		DiscoveryConnector connector = new DiscoveryConnector();
+		connector.setId(id);
+		connector.setName(name);
+		connector.setGroupId(groupId);
+		connector.setCategory(category);
+		category.getConnectors().add(connector);
+		return connector;
+	}
+
+	public void testOrderByGroup() {
+		addGroup("1");
+		addGroup("2");
+		DiscoveryConnector t1 = addConnectorDescriptor("b", "btest", "2");
+		DiscoveryConnector t2 = addConnectorDescriptor("a", "atest", "2");
+		DiscoveryConnector t3 = addConnectorDescriptor("c", "ctest", "1");
+		DiscoveryConnector t4 = addConnectorDescriptor("d", "dtest", "1");
+		DiscoveryConnector t5 = addConnectorDescriptor("0", "0test", null);
+
+		assertEquals(-1, comparator.compare(t2, t1));
+		assertEquals(1, comparator.compare(t1, t2));
+		assertEquals(-1, comparator.compare(t3, t4));
+		assertEquals(1, comparator.compare(t4, t3));
+
+		assertEquals(-1, comparator.compare(t1, t5));
+		assertEquals(1, comparator.compare(t5, t1));
+		assertEquals(-1, comparator.compare(t2, t5));
+		assertEquals(1, comparator.compare(t5, t2));
+		assertEquals(-1, comparator.compare(t3, t5));
+		assertEquals(1, comparator.compare(t5, t3));
+		assertEquals(-1, comparator.compare(t4, t5));
+		assertEquals(1, comparator.compare(t5, t4));
+
+		assertEquals(-1, comparator.compare(t3, t1));
+		assertEquals(1, comparator.compare(t1, t3));
+		assertEquals(-1, comparator.compare(t3, t2));
+		assertEquals(1, comparator.compare(t2, t3));
+
+		assertEquals(-1, comparator.compare(t4, t1));
+		assertEquals(1, comparator.compare(t1, t4));
+		assertEquals(-1, comparator.compare(t4, t2));
+		assertEquals(1, comparator.compare(t2, t4));
+	}
+}