Fix comments and extend different class

SVN r64442 |2019-09-05 23:11:47 +0000

Author: i.hilerio

java/src/org/labkey/remoteapi/query/TruncateTableCommand.java

@@ -15,19 +15,13 @@
  */
 package org.labkey.remoteapi.query;
 
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.labkey.remoteapi.PostCommand;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
 /**
- * Command for deleting rows from a read-write schema. The user associated
+ * Command for truncating a table from a read-write schema. The user associated
  * with the connection used when executing this command must have
  * permission to delete the data.
- * <p>
  */
 public class TruncateTableCommand extends PostCommand<TruncateTableResponse>
 {
@@ -106,7 +100,6 @@ public JSONObject getJsonObject()
         JSONObject json = new JSONObject();
         json.put("schemaName", getSchemaName());
         json.put("queryName", getQueryName());
-        //json.put("rows", jsonRows);
         return json;
     }
 }

java/src/org/labkey/remoteapi/query/TruncateTableResponse.java

@@ -16,6 +16,7 @@
 package org.labkey.remoteapi.query;
 
 import org.json.simple.JSONObject;
+import org.labkey.remoteapi.CommandResponse;
 
 /*
 * User: Dave
@@ -24,14 +25,14 @@
 */
 
 /**
- * Response object used for commands that derive from SaveRowsCommand.
+ * Response object used for commands that derive from TruncateTableCommand.
  * This response object provides helper methods for accessing the important
  * bits of the parsed response data.
  */
-public class TruncateTableResponse extends RowsResponse
+public class TruncateTableResponse extends CommandResponse
 {
     /**
-     * Constructs a new SaveRowsResponse given the response text and status code
+     * Constructs a new TruncateTableResponse given the response text and status code
      * @param text The response text.
      * @param statusCode The HTTP status code.
      * @param contentType The Content-Type header value.
@@ -44,8 +45,8 @@ public TruncateTableResponse(String text, int statusCode, String contentType, JS
     }
 
     /**
-     * Returns the 'rowsAffected' response property.
-     * @return The number of rows affected by the command, or null if this property
+     * Returns the 'deletedRows' response property.
+     * @return The number of rows deleted by the command, or null if this property
      * was not present in the response.
      */
     public Number getDeletedRowCount()

java/src/org/labkey/remoteapi/test/Test.java

@@ -50,19 +50,19 @@ public static void main(String[] args) throws Exception
         try
         {
             // Import /remoteapi/sas/People.xls as list "People" into project "Api Test"
-//            selectTest(cn, "Api Test");
-//            crudTest(cn, "Api Test");
-//            execSqlTest(cn, "Api Test");
-//            schemasTest(cn, "Api Test");
-//            extendedFormatTest(cn, "Api Test");
-//
-//            // Run ShortStudyTest with -Dclean=false
-//            datasetTest(cn, "StudyVerifyProject/My Study");
-//
-//            // Run NabAssayTest with -Dclean=false and rename subfolder "Rename############" to "nabassay"
-//            nabTest(cn, "/Nab Test Verify Project/nabassay");
-//            assayTest(cn, "/Nab Test Verify Project/nabassay");
-//            truncateAssayFailsTest(cn, "/Nab Test Verify Project/nabassay");
+            selectTest(cn, "Api Test");
+            crudTest(cn, "Api Test");
+            execSqlTest(cn, "Api Test");
+            schemasTest(cn, "Api Test");
+            extendedFormatTest(cn, "Api Test");
+
+            // Run ShortStudyTest with -Dclean=false
+            datasetTest(cn, "StudyVerifyProject/My Study");
+
+            // Run NabAssayTest with -Dclean=false and rename subfolder "Rename############" to "nabassay"
+            nabTest(cn, "/Nab Test Verify Project/nabassay");
+            assayTest(cn, "/Nab Test Verify Project/nabassay");
+            truncateAssayFailsTest(cn, "/Nab Test Verify Project/nabassay");
 
             truncateTableSuccessTest(cn, "Api Test");
             System.out.println("*** All tests completed successfully ***");
@@ -145,7 +145,6 @@ public static void truncateTableSuccessTest(Connection cn, String folder) throws
         TruncateTableResponse resp = trunc.execute(cn, folder);
 
         assert resp.getDeletedRowCount().intValue() == 9;
-        assert resp.getRows().size() == 0;
     }
 
     // Assumes that /remoteapi/sas/People.xls has been imported as a list into folder