From 3cf4646ae75c542177d51cffcc2f75a55ab59627 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Mon, 26 May 2014 11:38:07 +0200 Subject: [PATCH] SONAR-5007 Add (disabled) unit test for rule sort --- .../server/rule/ws/RulesWebServiceTest.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java index 9e01982c689..2077fd49d25 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RulesWebServiceTest.java @@ -20,10 +20,7 @@ package org.sonar.server.rule.ws; import com.google.common.collect.ImmutableSet; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; @@ -336,9 +333,11 @@ public class RulesWebServiceTest { } @Test + @Ignore public void sort_by_name() throws Exception { - ruleDao.insert(session, newRuleDto(RuleKey.of("java", "S001")).setName("a")); - ruleDao.insert(session, newRuleDto(RuleKey.of("java", "S002")).setName("b")); + ruleDao.insert(session, newRuleDto(RuleKey.of("java", "S002")).setName("Dodgy - Consider returning a zero length array rather than null ")); + ruleDao.insert(session, newRuleDto(RuleKey.of("java", "S001")).setName("Bad practice - Creates an empty zip file entry")); + ruleDao.insert(session, newRuleDto(RuleKey.of("java", "S003")).setName("XPath rule")); session.commit(); @@ -350,8 +349,7 @@ public class RulesWebServiceTest { request.setParam(SearchOptions.PARAM_ASCENDING, Boolean.TRUE.toString()); WsTester.Result result = request.execute(); - result.assertJson("{\"total\":2,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"java:S001\"},{\"key\":\"java:S002\"}]}"); - + result.assertJson("{\"total\":3,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"java:S001\"},{\"key\":\"java:S002\"},{\"key\":\"java:S003\"}]}"); // 2. Sort Name ASC request = wsTester.newGetRequest(API_ENDPOINT, API_SEARCH_METHOD); @@ -360,7 +358,7 @@ public class RulesWebServiceTest { request.setParam(SearchOptions.PARAM_ASCENDING, Boolean.FALSE.toString()); result = request.execute(); - result.assertJson("{\"total\":2,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"java:S002\"},{\"key\":\"java:S001\"}]}"); + result.assertJson("{\"total\":3,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"java:S003\"},{\"key\":\"java:S002\"},{\"key\":\"java:S001\"}]}"); } -- 2.39.5