Uncommenting tests for share snapshots

Author: Josh Friedman

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileClientTests.java

@@ -115,7 +115,7 @@ public void testListSharesMaxResultsValidationTest() throws StorageException, UR
         assertNotNull(fileClient.listSharesSegmented("thereshouldntbeanyshareswiththisprefix"));
     }
 
-    //@Test
+    @Test
     public void testListSharesWithSnapshot() throws StorageException, URISyntaxException {
         CloudFileClient fileClient = FileTestHelper.createCloudFileClient();
         CloudFileShare share = fileClient.getShareReference(UUID.randomUUID().toString());

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileDirectoryTests.java

@@ -480,7 +480,7 @@ private static void testMetadataFailures(CloudFileDirectory directory, String ke
         directory.getMetadata().remove(key);
     }
 
-    //@Test
+    @Test
     public void testUnsupportedDirectoryApisWithinShareSnapshot() throws StorageException, URISyntaxException {
         CloudFileShare snapshot = this.share.createSnapshot();
         CloudFileDirectory rootDir = snapshot.getRootDirectoryReference();
@@ -509,7 +509,7 @@ public void testUnsupportedDirectoryApisWithinShareSnapshot() throws StorageExce
         snapshot.delete();
     }
 
-    //@Test
+    @Test
     public void testSupportedDirectoryApisInShareSnapshot() throws StorageException, URISyntaxException {
         CloudFileDirectory dir = this.share.getRootDirectoryReference().getDirectoryReference("dir1");
         dir.deleteIfExists();

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileShareTests.java

@@ -494,7 +494,7 @@ public void eventOccurred(SendingRequestEvent eventArg) {
         assertTrue(this.share.deleteIfExists(null, null, ctx));
     }
 
-    //@Test
+    @Test
     public void testCreateShareSnapshot() throws StorageException, URISyntaxException, IOException {
         // create share with metadata
         this.share.create();
@@ -551,15 +551,15 @@ public void testCreateShareSnapshot() throws StorageException, URISyntaxExceptio
 
         final UriQueryBuilder uriBuilder = new UriQueryBuilder();
         uriBuilder.add("sharesnapshot", snapshot.snapshotID);
-//        CloudFileShare snapshotRef5 = new CloudFileShare(uriBuilder.addToURI(this.share.getUri()),
-//                                                         this.share.getServiceClient().getCredentials(), null);
-//        assertEquals(snapshot.snapshotID, snapshotRef5.snapshotID);
-//        assertTrue(snapshotRef5.exists());
+        CloudFileShare snapshotRef5 = new CloudFileShare(uriBuilder.addToURI(this.share.getUri()),
+                                                         this.share.getServiceClient().getCredentials());
+        assertEquals(snapshot.snapshotID, snapshotRef5.snapshotID);
+        assertTrue(snapshotRef5.exists());
 
         snapshot.delete();
     }
 
-    //@Test
+    @Test
     public void testDeleteShareSnapshotOptions() throws StorageException, URISyntaxException, IOException {
         // create share with metadata
         this.share.create();
@@ -583,7 +583,7 @@ public void testDeleteShareSnapshotOptions() throws StorageException, URISyntaxE
         assertFalse(snapshot.exists());
     }
 
-    //@Test
+    @Test
     public void testListFilesAndDirectoriesWithinShareSnapshot() throws StorageException, URISyntaxException {
         this.share.create();
 
@@ -624,7 +624,7 @@ public void testListFilesAndDirectoriesWithinShareSnapshot() throws StorageExcep
         snapshot.delete();
     }
 
-    //@Test
+    @Test
     public void testUnsupportedApisShareSnapshot() throws StorageException, URISyntaxException {
         CloudFileClient client = FileTestHelper.createCloudFileClient();
         this.share.create();
@@ -637,13 +637,6 @@ public void testUnsupportedApisShareSnapshot() throws StorageException, URISynta
         catch (IllegalArgumentException e) {
             assertEquals(SR.INVALID_OPERATION_FOR_A_SHARE_SNAPSHOT, e.getMessage());
         }
-//        try {
-//            new CloudFileShare(snapshot.getQualifiedUri(), client.getCredentials(), "2016-10-24T16:37:17.0000000Z");
-//            fail("Shouldn't get here");
-//        }
-//        catch (IllegalArgumentException e) {
-//            assertEquals(SR.SNAPSHOT_QUERY_OPTION_ALREADY_DEFINED, e.getMessage());
-//        }
         try {
             snapshot.downloadPermissions();
             fail("Shouldn't get here");

microsoft-azure-storage-test/src/com/microsoft/azure/storage/file/CloudFileTests.java

@@ -1617,7 +1617,7 @@ private void doCloudFileCopy(boolean sourceIsSas, boolean destinationIsSas)
         source.delete();
     }
 
-    //@Test
+    @Test
     public void testUnsupportedFileApisWithinShareSnapshot() throws StorageException, URISyntaxException {
         CloudFileShare snapshot = this.share.createSnapshot();
         CloudFile file = snapshot.getRootDirectoryReference().getFileReference("file");
@@ -1677,7 +1677,7 @@ public void testUnsupportedFileApisWithinShareSnapshot() throws StorageException
         snapshot.delete();
     }
 
-    //@Test
+    @Test
     public void testSupportedFileApisInShareSnapshot() throws StorageException, URISyntaxException, UnsupportedEncodingException {
         CloudFileDirectory dir = this.share.getRootDirectoryReference().getDirectoryReference("dir1");
         dir.deleteIfExists();

microsoft-azure-storage/src/com/microsoft/azure/storage/file/CloudFileClient.java

@@ -121,7 +121,7 @@ public CloudFileShare getShareReference(final String shareName) throws URISyntax
      * @see <a href="http://msdn.microsoft.com/en-us/library/azure/dn167011.aspx">Naming and Referencing Shares,
      *      Directories, Files, and Metadata</a>
      */
-    protected CloudFileShare getShareReference(final String shareName, String snapshotID) throws URISyntaxException, StorageException {
+    public CloudFileShare getShareReference(final String shareName, String snapshotID) throws URISyntaxException, StorageException {
         Utility.assertNotNullOrEmpty("shareName", shareName);
         return new CloudFileShare(shareName, snapshotID, this);
     }

microsoft-azure-storage/src/com/microsoft/azure/storage/file/CloudFileShare.java

@@ -111,7 +111,7 @@ public final class CloudFileShare {
      * @see <a href="http://msdn.microsoft.com/en-us/library/azure/dn167011.aspx">Naming and Referencing Shares,
      *      Directories, Files, and Metadata</a>
      */
-    protected CloudFileShare(final String shareName, String snapshotID, final CloudFileClient client) throws URISyntaxException,
+    public CloudFileShare(final String shareName, String snapshotID, final CloudFileClient client) throws URISyntaxException,
             StorageException {
         Utility.assertNotNull("client", client);
         Utility.assertNotNull("shareName", shareName);
@@ -395,7 +395,7 @@ public void delete(AccessCondition accessCondition, FileRequestOptions options,
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    protected void delete(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext opContext)
+    public void delete(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext opContext)
             throws StorageException {
         if (opContext == null) {
             opContext = new OperationContext();
@@ -508,7 +508,7 @@ public boolean deleteIfExists(AccessCondition accessCondition, FileRequestOption
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    protected boolean deleteIfExists(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options,
+    public boolean deleteIfExists(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options,
             OperationContext opContext) throws StorageException {
         options = FileRequestOptions.populateAndApplyDefaults(options, this.fileServiceClient);
 
@@ -728,7 +728,7 @@ public FileSharePermissions postProcessResponse(HttpURLConnection connection,
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    protected final CloudFileShare createSnapshot() throws StorageException {
+    public final CloudFileShare createSnapshot() throws StorageException {
         return this
                 .createSnapshot(null /* metadata */, null /* accessCondition */, null /* options */, null /* opContext */);
     }
@@ -753,7 +753,7 @@ protected final CloudFileShare createSnapshot() throws StorageException {
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    protected final CloudFileShare createSnapshot(final AccessCondition accessCondition, FileRequestOptions options,
+    public final CloudFileShare createSnapshot(final AccessCondition accessCondition, FileRequestOptions options,
             OperationContext opContext) throws StorageException {
         return this.createSnapshot(null /* metadata */, accessCondition, options, opContext);
     }
@@ -780,7 +780,7 @@ protected final CloudFileShare createSnapshot(final AccessCondition accessCondit
      *             If a storage service error occurred.
      */
     @DoesServiceRequest
-    protected final CloudFileShare createSnapshot(final HashMap<String, String> metadata,
+    public final CloudFileShare createSnapshot(final HashMap<String, String> metadata,
             final AccessCondition accessCondition, FileRequestOptions options, OperationContext opContext)
             throws StorageException {
         assertNoSnapshot();
@@ -1502,7 +1502,7 @@ public URI getUri() {
      * 
      * @return The snapshotID as a string for this share.
      */
-    protected final String getSnapshot() {
+    public final String getSnapshot() {
         return this.snapshotID;
     }
 
@@ -1513,7 +1513,7 @@ protected final String getSnapshot() {
      *
      * @see DeleteSnapshotsOption
      */
-    protected final boolean isSnapshot() {
+    public final boolean isSnapshot() {
         return this.snapshotID != null;
     }
 
@@ -1591,7 +1591,7 @@ public void setMetadata(final HashMap<String, String> metadata) {
      *            A {@link FileShareProperties} object that represents the properties being assigned to the
      *            share.
      */
-    protected void setProperties(final FileShareProperties properties) {
+    public void setProperties(final FileShareProperties properties) {
         this.properties = properties;
     }