Set up HW2 basic SQL tests

The existing SQL tests are now all assigned to the "sql" group, and a
subset are also now assigned to the "hw2" group if they should be
supported by the SimplePlanner.

The Maven pom.xml is also updated to include the "hw2" tests.

pom.xml

@@ -144,7 +144,7 @@
                         <suiteXmlFile>testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
                     -->
-                    <groups>framework,parser,hw1</groups>
+                    <groups>framework,parser,hw1,hw2</groups>
                 </configuration>
             </plugin>
 

src/test/java/edu/caltech/test/nanodb/functions/TestSimpleFunctions.java

@@ -10,7 +10,7 @@ import edu.caltech.test.nanodb.sql.SqlTestCase;
 /**
  * This class tests various functions to ensure that they work correctly.
  */
-@Test(groups={"sql"})
+@Test(groups={"sql", "hw2"})
 public class TestSimpleFunctions extends SqlTestCase {
 
     public void testAbs() throws Exception {

src/test/java/edu/caltech/test/nanodb/sql/TestAggregation.java

@@ -13,7 +13,7 @@ import edu.caltech.nanodb.server.CommandResult;
 * many different tables, to see if aggregate expressions work properly. We are
 * just testing aggregation without any grouping.
 **/
-@Test
+@Test(groups={"sql", "hw2"})
 public class TestAggregation extends SqlTestCase {
     public TestAggregation() {
         super("setup_testAggregation");

src/test/java/edu/caltech/test/nanodb/sql/TestExists.java

@@ -11,7 +11,7 @@ import edu.caltech.nanodb.server.CommandResult;
  * This class exercises the database with some simple EXISTS operations, to
  * verify that the most basic functionality works.
  **/
-@Test
+@Test(groups={"sql"})
 public class TestExists extends SqlTestCase {
     public TestExists() {
         super("setup_testExists");

src/test/java/edu/caltech/test/nanodb/sql/TestGroupBy.java

@@ -13,7 +13,7 @@ import edu.caltech.nanodb.server.NanoDBServer;
 * aggregation occurs, we just check to see if the correct columns are grouped
 * and generated.
 **/
-@Test
+@Test(groups={"sql", "hw2"})
 public class TestGroupBy extends SqlTestCase {
     public TestGroupBy() {
         super("setup_testGroupBy");

src/test/java/edu/caltech/test/nanodb/sql/TestGroupingAndAggregation.java

@@ -4,14 +4,13 @@ import org.testng.annotations.Test;
 
 import edu.caltech.nanodb.expressions.TupleLiteral;
 import edu.caltech.nanodb.server.CommandResult;
-import edu.caltech.nanodb.server.NanoDBServer;
 
 /**
 * This class exercises the database with both grouping and aggregation
 * statements, to see if both kinds of expressions can work properly with each
 * other.
 **/
-@Test
+@Test(groups={"sql", "hw2"})
 public class TestGroupingAndAggregation extends SqlTestCase {
     public TestGroupingAndAggregation() {
         super ("setup_testGroupingAndAggregation");

src/test/java/edu/caltech/test/nanodb/sql/TestHaving.java

@@ -4,14 +4,14 @@ import org.testng.annotations.Test;
 
 import edu.caltech.nanodb.expressions.TupleLiteral;
 import edu.caltech.nanodb.server.CommandResult;
-import edu.caltech.nanodb.server.NanoDBServer;
+
 
 /**
 * This class exercises the database with both grouping and aggregation
 * statements, to see if both kinds of expressions can work properly with each
 * other.
 **/
-@Test
+@Test(groups={"sql", "hw2"})
 public class TestHaving extends SqlTestCase {
     public TestHaving() {
         super ("setup_testHaving");
@@ -38,7 +38,6 @@ public class TestHaving extends SqlTestCase {
 
         result = server.doCommand(
             "SELECT a, MIN(b) FROM test_having GROUP BY a HAVING MIN(b) < 2000", true);
-System.err.println("HAVING RESULTS = " + result.getTuples());
         TupleLiteral[] expected1 = {
             new TupleLiteral( 7 , 990 ),
             new TupleLiteral( 11 , 980 ),

src/test/java/edu/caltech/test/nanodb/sql/TestInPredicates.java

@@ -11,7 +11,6 @@ import edu.caltech.nanodb.server.NanoDBServer;
 /**
  * This class exercises the database with various <tt>IN</tt> predicates.
  **/
-@Test
 public class TestInPredicates extends SqlTestCase {
     public TestInPredicates() {
         super("setup_testExists");
@@ -23,6 +22,7 @@ public class TestInPredicates extends SqlTestCase {
      *
      * @throws Exception if any query parsing or execution issues occur.
      */
+    @Test(groups={"sql", "hw2"})
     public void testInPredicatesTablesNotEmpty() throws Throwable {
         testTableNotEmpty("test_exists_1");
         testTableNotEmpty("test_exists_2");
@@ -34,6 +34,7 @@ public class TestInPredicates extends SqlTestCase {
      *
      * @throws Exception if any query parsing or execution issues occur.
      */
+    @Test(groups={"sql", "hw2"})
     public void testInValues() throws Throwable {
         CommandResult result;
         TupleLiteral[] expected1 = {
@@ -66,6 +67,7 @@ public class TestInPredicates extends SqlTestCase {
      *
      * @throws Exception if any query parsing or execution issues occur.
      */
+    @Test(groups={"sql"})
     public void testInSubquery() throws Throwable {
         CommandResult result;
         TupleLiteral[] expected1 = {

src/test/java/edu/caltech/test/nanodb/sql/TestNaturalUsingJoins.java

@@ -13,7 +13,7 @@ import org.testng.annotations.Test;
  * These tests aren't exhaustive; they serve as a smoke-test to verify the
  * basic behaviors.
  */
-@Test
+@Test(groups={"sql"})
 public class TestNaturalUsingJoins extends SqlTestCase {
     public TestNaturalUsingJoins() {
         super("setup_testNaturalUsingJoins");

src/test/java/edu/caltech/test/nanodb/sql/TestScalarSubquery.java

@@ -13,7 +13,7 @@ import edu.caltech.nanodb.server.CommandResult;
  * This class exercises the database with some simple scalar subqueries, to
  * verify that the most basic functionality works.
  **/
-@Test
+@Test(groups={"sql"})
 public class TestScalarSubquery extends SqlTestCase {
     public TestScalarSubquery() {
         super("setup_testExists");

src/test/java/edu/caltech/test/nanodb/sql/TestSelectProject.java

@@ -13,7 +13,7 @@ import edu.caltech.nanodb.server.NanoDBServer;
  * statements against a single table, to see if simple selects and
  * predicates work properly.
  */
-@Test(groups={"sql"})
+@Test(groups={"sql", "hw2"})
 public class TestSelectProject extends SqlTestCase {
 
     public TestSelectProject() {

src/test/java/edu/caltech/test/nanodb/sql/TestSimpleSelects.java

@@ -13,7 +13,7 @@ import edu.caltech.nanodb.server.NanoDBServer;
  * statements against a single table, to see if simple selects and
  * predicates work properly.
  */
-@Test(groups={"sql"})
+@Test(groups={"sql", "hw2"})
 public class TestSimpleSelects extends SqlTestCase {
 
     public TestSimpleSelects() {

src/test/java/edu/caltech/test/nanodb/sql/TestStringMatch.java

@@ -12,7 +12,7 @@ import edu.caltech.nanodb.server.CommandResult;
  * statements against a single table, to see if simple selects and
  * predicates work properly.
  */
-@Test(groups={"sql"})
+@Test(groups={"sql", "hw2"})
 public class TestStringMatch extends SqlTestCase {
 
     public TestStringMatch() {
@@ -166,5 +166,4 @@ public class TestStringMatch extends SqlTestCase {
             "SELECT * FROM test_string_match WHERE s LIKE '_r%'", true);
         assert checkUnorderedResults(expected2, result);
     }
-
 }