no effective change - tidy test order by parse

This commit is contained in:
rob bygrave
2019-01-23 21:48:49 +13:00
parent eb1bca805e
commit d89a58482c
@@ -7,6 +7,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
/**
@@ -18,28 +19,28 @@ public class TestOrderByParse extends BaseTestCase {
public void testParsingOne() {
OrderBy<Object> o1 = new OrderBy<>("id");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id"));
assertEquals("id", o1.toStringFormat());
o1 = new OrderBy<>("id asc");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id"));
assertEquals("id", o1.toStringFormat());
o1 = new OrderBy<>("id desc");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id desc"));
assertEquals("id desc", o1.toStringFormat());
o1 = new OrderBy<>(" id asc ");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id"));
assertEquals("id", o1.toStringFormat());
assertTrue(o1.containsProperty("id"));
assertFalse(o1.containsProperty("junk"));
@@ -49,10 +50,10 @@ public class TestOrderByParse extends BaseTestCase {
public void parseNullsHigh() {
OrderBy<Object> o1 = new OrderBy<>("id desc nulls high");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id desc nulls high"));
assertEquals("id desc nulls high", o1.toStringFormat());
}
@Test
@@ -60,21 +61,21 @@ public class TestOrderByParse extends BaseTestCase {
OrderBy<Object> o1 = new OrderBy<>();
o1.add("id desc nulls high");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id desc nulls high"));
assertEquals("id desc nulls high", o1.toStringFormat());
}
@Test
public void parseNullsHigh_with_second() {
OrderBy<Object> o1 = new OrderBy<>("id desc nulls high, name");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.toStringFormat().equals("id desc nulls high, name"));
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("id desc nulls high, name", o1.toStringFormat());
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
}
@@ -82,34 +83,34 @@ public class TestOrderByParse extends BaseTestCase {
public void testParsingTwo() {
OrderBy<?> o1 = new OrderBy<>("id,name");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id, name", o1.toStringFormat());
o1 = new OrderBy<>(" id , name ");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id, name", o1.toStringFormat());
o1 = new OrderBy<>(" id desc , name desc ");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(!o1.getProperties().get(1).isAscending());
assertEquals("id desc, name desc", o1.toStringFormat());
o1 = new OrderBy<>(" id ascending, name asc");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id, name", o1.toStringFormat());
@@ -121,37 +122,37 @@ public class TestOrderByParse extends BaseTestCase {
OrderBy<?> o1 = new OrderBy<>();
o1.asc("id");
o1.asc("name");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id, name", o1.toStringFormat());
o1 = new OrderBy<>();
o1.desc("id");
o1.desc("name");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(!o1.getProperties().get(1).isAscending());
assertEquals("id desc, name desc", o1.toStringFormat());
o1.reverse();
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id, name", o1.toStringFormat());
OrderBy<?> copy = o1.copy();
assertTrue(copy != o1);
assertTrue(copy.getProperties().size() == 2);
assertTrue(copy.getProperties().get(0).getProperty().equals("id"));
assertNotSame(copy, o1);
assertEquals(2, copy.getProperties().size());
assertEquals("id", copy.getProperties().get(0).getProperty());
assertTrue(copy.getProperties().get(0).isAscending());
assertTrue(copy.getProperties().get(1).getProperty().equals("name"));
assertEquals("name", copy.getProperties().get(1).getProperty());
assertTrue(copy.getProperties().get(1).isAscending());
assertEquals("id, name", copy.toStringFormat());
@@ -162,24 +163,24 @@ public class TestOrderByParse extends BaseTestCase {
OrderBy<Object> o1 = new OrderBy<>();
o1.asc("id", "latin_1");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(o1.getProperties().get(0).isAscending());
assertEquals("id collate latin_1", o1.toStringFormat());
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertEquals("id collate latin_1 desc", o1.toStringFormat());
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
o1.asc("date");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertTrue(o1.getProperties().get(1).getProperty().equals("date"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertEquals("date", o1.getProperties().get(1).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
@@ -187,9 +188,9 @@ public class TestOrderByParse extends BaseTestCase {
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
o1.asc("name", "latin_2");
assertTrue(o1.getProperties().size() == 2);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertTrue(o1.getProperties().get(1).getProperty().equals("name"));
assertEquals(2, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertEquals("name", o1.getProperties().get(1).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
@@ -197,8 +198,8 @@ public class TestOrderByParse extends BaseTestCase {
// functional (DB2) syntax
o1 = new OrderBy<>();
o1.desc("id", "COLLATION_KEY(${}, 'latin_1')");
assertTrue(o1.getProperties().size() == 1);
assertTrue(o1.getProperties().get(0).getProperty().equals("id"));
assertEquals(1, o1.getProperties().size());
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());