fixed tests

Author: smiklosovic

src/java/org/apache/cassandra/db/ColumnFamilyStore.java

@@ -2073,7 +2073,9 @@ private void validateSnapshotName(String snapshotName)
         // which is what blocks traversal attempts such as "../../mysnapshot"
         if (!Pattern.compile("[a-zA-Z0-9_.+-]+").matcher(snapshotName).matches())
         {
-            throw new IllegalArgumentException("Snapshot name contains illegal characters: " + snapshotName);
+            throw new IllegalArgumentException("Snapshot name contains illegal characters: " + snapshotName + ". " +
+                                               "Allowed characters must match the pattern: [a-zA-Z0-9_.+-]+" +
+                                               " with a maximum of length of " + FILENAME_LENGTH + " characters.");
         }
     }
 

test/unit/org/apache/cassandra/db/SnapshotTest.java

@@ -96,24 +96,24 @@ public void testSnapshotNameValidation()
             // The shell-significant S3 "safe" characters (! * ' ( )) are deliberately NOT allowed.
             assertThatThrownBy(() -> cfs.snapshot("important!"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: important!");
+            .hasMessageContaining("Snapshot name contains illegal characters: important!");
             assertThatThrownBy(() -> cfs.snapshot("backup*"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: backup*");
+            .hasMessageContaining("Snapshot name contains illegal characters: backup*");
             assertThatThrownBy(() -> cfs.snapshot("o'snap"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: o'snap");
+            .hasMessageContaining("Snapshot name contains illegal characters: o'snap");
             assertThatThrownBy(() -> cfs.snapshot("snap(1)"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: snap(1)");
+            .hasMessageContaining("Snapshot name contains illegal characters: snap(1)");
 
             // Other characters outside the allowed set must still be rejected.
             assertThatThrownBy(() -> cfs.snapshot("a tag"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: a tag");
+            .hasMessageContaining("Snapshot name contains illegal characters: a tag");
             assertThatThrownBy(() -> cfs.snapshot("a:tag"))
             .isInstanceOf(IllegalArgumentException.class)
-            .hasMessage("Snapshot name contains illegal characters: a:tag");
+            .hasMessageContaining("Snapshot name contains illegal characters: a:tag");
 
             // "." and ".." pass the charset check but resolve to the snapshots/ dir itself
             // and its parent (the live table dir) respectively, so they must be rejected as reserved.