Skip to content
Snippets Groups Projects
Commit e0edefe2 authored by anttil's avatar anttil
Browse files

SSDM-4647: Multiline regexp in tests

SVN: 37817
parent 3d925323
No related branches found
No related tags found
No related merge requests found
...@@ -34,31 +34,31 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException; ...@@ -34,31 +34,31 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
public class CreateExternalDmsTest extends AbstractExternalDmsTest public class CreateExternalDmsTest extends AbstractExternalDmsTest
{ {
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Code is required.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Code is required.*")
void creationFailsWithoutCode() void creationFailsWithoutCode()
{ {
create(externalDms().withCode(null)); create(externalDms().withCode(null));
} }
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Type is required.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Type is required.*")
void creationFailsWithoutType() void creationFailsWithoutType()
{ {
create(externalDms().withType(null)); create(externalDms().withType(null));
} }
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Address is required.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Address is required.*")
void creationFailsWithoutAddress() void creationFailsWithoutAddress()
{ {
create(externalDms().withAddress(null)); create(externalDms().withAddress(null));
} }
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Code is required.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Code is required.*")
void creationFailsWithEmptyCode() void creationFailsWithEmptyCode()
{ {
create(externalDms().withCode("")); create(externalDms().withCode(""));
} }
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Address is required.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Address is required.*")
void creationFailsWithEmptyAddress() void creationFailsWithEmptyAddress()
{ {
create(externalDms().withAddress("")); create(externalDms().withAddress(""));
...@@ -123,13 +123,13 @@ public class CreateExternalDmsTest extends AbstractExternalDmsTest ...@@ -123,13 +123,13 @@ public class CreateExternalDmsTest extends AbstractExternalDmsTest
return new Object[][] { { "host/path" }, { ":" }, { ":path" }, { "1234" } }; return new Object[][] { { "host/path" }, { ":" }, { ":path" }, { "1234" } };
} }
@Test(dataProvider = "InvalidFileSystemAddresses", expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*Invalid address.*") @Test(dataProvider = "InvalidFileSystemAddresses", expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*Invalid address.*")
void creationWithTypeFileSystemFailsWithInvalidAddress(String invalid) void creationWithTypeFileSystemFailsWithInvalidAddress(String invalid)
{ {
create(externalDms().withType(ExternalDmsAddressType.FILE_SYSTEM).withAddress(invalid)); create(externalDms().withType(ExternalDmsAddressType.FILE_SYSTEM).withAddress(invalid));
} }
@Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*already exists.*") @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = "(?s).*already exists.*")
void codeHasToBeUnique() void codeHasToBeUnique()
{ {
final String code = uuid(); final String code = uuid();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment