Fixing Issue 483 For Defining HeavyWeight Test Groups

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientDirectoriesIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientFindIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -51,7 +51,6 @@
  * @author <a href="https://github.com/yunong">Yunong Xiao</a>
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  */
-//@Test(dependsOnGroups = { "directory" })
 public class MantaClientIT {
 
     private static final String TEST_DATA = "EPISODEII_IS_BEST_EPISODE";
@@ -504,7 +503,7 @@ private void moveDirectoryWithContents(final String source, final String destina
                 + source);
     }
 
-    @Test
+    @Test(groups = { "move" })
     public final void canMoveDirectoryWithContents() throws IOException {
         final String name = "source-" + UUID.randomUUID().toString();
         final String source = testPathPrefix + name + MantaClient.SEPARATOR;

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientMetadataIT.java

@@ -27,7 +27,7 @@
  *
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  */
-@Test( groups = { "metadata" })
+@Test(groups = { "metadata" })
 public class MantaClientMetadataIT {
     private static final String TEST_DATA = "EPISODEII_IS_BEST_EPISODE";
 

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientPutIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2016-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

java-manta-it/src/test/java/com/joyent/manta/client/MantaClientRangeIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2017-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

java-manta-it/src/test/java/com/joyent/manta/client/MantaDirectoryListingIteratorIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29,7 +29,7 @@
  *
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  */
-@Test
+@Test(groups={"directory"})
 public class MantaDirectoryListingIteratorIT {
     private static final String TEST_DATA = "EPISODEII_IS_BEST_EPISODE";
 

java-manta-it/src/test/java/com/joyent/manta/client/MantaObjectOutputStreamIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2016-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

java-manta-it/src/test/java/com/joyent/manta/client/jobs/MantaClientJobIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36,7 +36,7 @@
  *
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  */
-@Test(groups = { "job" }, retryAnalyzer = ThreeTriesRetryAnalyzer.class)
+@Test(groups = { "jobs" }, retryAnalyzer = ThreeTriesRetryAnalyzer.class)
 public class MantaClientJobIT {
     private static final Logger LOG = LoggerFactory.getLogger(MantaClientJobIT.class);
 
@@ -167,7 +167,7 @@ public void canAddAndGetInputsFromStream() throws IOException {
         }
     }
 
-    @Test(dependsOnMethods = { "createJob", "getJob" })
+    @Test(dependsOnMethods = { "createJob", "getJob" }, groups = { "nightly" })
     public void canListAllJobIDs() throws IOException, InterruptedException {
         final MantaJob job1 = buildJob();
         final UUID job1id = mantaClient.createJob(job1);
@@ -197,7 +197,7 @@ public void canListAllJobIDs() throws IOException, InterruptedException {
      * and development environments. The code path for testing job lists is
      * tested elsewhere, but not the specific operation of listing ALL jobs.
      */
-    @Test(enabled = false, dependsOnMethods = { "createJob", "getJob" })
+    @Test(enabled = false, dependsOnMethods = { "createJob", "getJob" }, groups = { "nightly" })
     public void canListAllJobs() throws IOException, InterruptedException {
         final MantaJob job1 = buildJob();
         final UUID job1id = mantaClient.createJob(job1);
@@ -228,7 +228,7 @@ public void canListAllJobs() throws IOException, InterruptedException {
         }
     }
 
-    @Test(dependsOnMethods = { "createJob", "getJob" })
+    @Test(dependsOnMethods = { "createJob", "getJob" }, groups = { "nightly" })
     public void canListAllRunningJobIDs() throws IOException, InterruptedException {
         final MantaJob job1 = buildJob();
         final UUID job1id = mantaClient.createJob(job1);
@@ -261,7 +261,7 @@ public void canListAllRunningJobIDs() throws IOException, InterruptedException {
         }
     }
 
-    @Test(dependsOnMethods = { "createJob", "getJob" })
+    @Test(dependsOnMethods = { "createJob", "getJob" }, groups = { "nightly" })
     public void canListAllRunningJobs() throws IOException, InterruptedException {
         final MantaJob job1 = buildJob();
         final UUID job1id = mantaClient.createJob(job1);

java-manta-it/src/test/java/com/joyent/manta/client/jobs/MantaJobBuilderIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2015-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -30,7 +30,7 @@
  *
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  */
-@Test(dependsOnGroups = "job")
+@Test(dependsOnGroups = "jobs")
 public class MantaJobBuilderIT {
     private static final String TEST_DATA =
               "line 01 aa\n"

java-manta-it/src/test/java/com/joyent/manta/client/multipart/EncryptedJobsMultipartManagerIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2017-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -55,7 +55,7 @@
 /* Tests are disabled because functionality is obsolete and overall test runtime
  * is very long and expensive. */
 @Deprecated
-@Test(groups = { "encrypted" }, enabled = false)
+@Test(groups = { "nightly" }, enabled = false)
 public class EncryptedJobsMultipartManagerIT {
     private MantaClient mantaClient;
     private EncryptedJobsMultipartManager multipart;

java-manta-it/src/test/java/com/joyent/manta/client/multipart/JobsMultipartManagerIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2016-2019, Joyent, Inc. All rights reserved.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52,7 +52,7 @@
 /* Tests are disabled because functionality is obsolete and overall test runtime
  * is very long and expensive. */
 @Deprecated
-@Test(enabled = false)
+@Test(groups = { "nightly" }, enabled = false)
 public class JobsMultipartManagerIT {
     private MantaClient mantaClient;
     private JobsMultipartManager multipart;

java-manta-it/src/test/java/com/joyent/manta/client/multipart/ServerSideMultipartManagerIT.java

@@ -91,6 +91,7 @@ public final void canAbortUpload() throws IOException {
         }
     }
 
+    @Test(groups = { "nightly" })
     public final void canListUploadsInProgress() throws IOException {
         final String name = UUID.randomUUID().toString();
         final String path = testPathPrefix + name;

java-manta-it/src/test/resources/testng-it.xml

@@ -11,29 +11,77 @@
             <class name="com.joyent.test.util.RandomInputStreamTest"/>
         </classes>
     </test>
-
+    <test name="Manta Client Directory Tests">
+        <groups>
+            <define name="directory" />
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.MantaClientDirectoriesIT" />
+            <class name="com.joyent.manta.client.MantaDirectoryListingIteratorIT" />
+        </classes>
+    </test>
     <test name="Manta Client Integration Tests [Unencrypted]">
         <groups>
             <run>
-                <exclude name="encrypted"/>
+                <exclude name="encrypted" />
                 <exclude name="encryption-provider" />
+                <exclude name="directory" />
+                <exclude name="jobs" />
+                <exclude name="nightly" />
             </run>
         </groups>
         <packages>
-            <package name="com.joyent.manta.client.*">
-                <exclude name="com.joyent.manta.client.jobs"/>
-            </package>
             <package name="com.joyent.manta.client.multipart.*"/>
             <package name="com.joyent.manta.http.*"/>
         </packages>
     </test>
     <!-- We run many of the integration tests over again using client-side encryption -->
+    <test name="Manta Client Heavyweight Tests">
+        <parameter name="usingEncryption" value="true" />
+        <groups>
+            <define name="nightly" />
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.jobs.MantaClientJobIT" />
+            <class name="com.joyent.manta.client.multipart.EncryptedJobsMultipartManagerIT" />
+            <class name="com.joyent.manta.client.multipart.JobsMultipartManagerIT" />
+            <class name="com.joyent.manta.client.multipart.ServerSideMultipartManagerIT" />
+        </classes>
+    </test>
+    <test name="Manta Client Integration Tests [Modified Time]">
+        <parameter name="usingEncryption" value="true" />
+        <groups>
+            <define name="mtime" />
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.MantaClientIT" />
+        </classes>
+    </test>
+    <test name="Manta Client Integration Tests [Move Operations]">
+        <parameter name="usingEncryption" value="true" />
+        <groups>
+            <define name="move" />
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.MantaClientIT" />
+        </classes>
+    </test>
+    <test name="Manta Client Metadata Tests [Metadata Operations]">
+        <parameter name="usingEncryption" value="true" />
+        <groups>
+            <define name="metadata" />
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.MantaClientIT" />
+        </classes>
+    </test>
     <test name="Manta Client Integration Tests [AES128/CTR Encrypted]">
         <parameter name="usingEncryption" value="true"/>
         <parameter name="encryptionCipher" value="AES128/CTR/NoPadding"/>
         <groups>
             <run>
                 <exclude name="encryption-provider" />
+                <exclude name="nightly" />
             </run>
         </groups>
         <packages>
@@ -49,6 +97,7 @@
         <groups>
             <run>
                 <exclude name="encryption-provider" />
+                <exclude name="nightly" />
             </run>
         </groups>
         <packages>
@@ -63,6 +112,7 @@
         <groups>
             <run>
                 <exclude name="encryption-provider" />
+                <exclude name="nightly" />
             </run>
         </groups>
         <packages>
@@ -73,8 +123,14 @@
     </test>
 
     <test name="Manta Job Tests">
-        <packages>
-            <package name="com.joyent.manta.client.jobs.*"/>
-        </packages>
+        <groups>
+            <define name="jobs" />
+            <run>
+                <exclude name="nightly" />
+            </run>
+        </groups>
+        <classes>
+            <class name="com.joyent.manta.client.jobs.MantaClientJobIT" />
+        </classes>
     </test>
 </suite>