Bug 374493 - [region] invalid region name causes failure to registerv20120319-1602

MBean

1 files changed, 23 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java
index fe401aa10..c8bd9b367 100644
--- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java
+++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java
@@ -655,12 +655,27 @@ public class RegionSystemTests extends AbstractRegionSystemTest {
 		assertEquals("Wrong location found.", location + ".2", l2);
 	}
 
-	//	public void testInvalidRegionName() {
-	//		String invalidName = "name:withColon";
-	//		try {
-	//			digraph.createRegion(invalidName);
-	//		} catch (Exception e) {
-	//			fail("failed to create region: " + invalidName);
-	//		}
-	//	}
+	public void testInvalidRegionName() {
+		Collection<String> invalidNames = new ArrayList<String>();
+		invalidNames.addAll(Arrays.asList(":", "bad:Name", ":bad::name:", ":badname", "badname:"));
+		invalidNames.addAll(Arrays.asList("=", "bad=Name", "=bad==name=", "=badname", "badname="));
+		invalidNames.addAll(Arrays.asList("\n", "bad\nName", "\nbad\n\nname\n", "\nbadname", "badname\n"));
+		invalidNames.addAll(Arrays.asList("*", "bad*Name", "*bad**name*", "*badname", "badname*"));
+		invalidNames.addAll(Arrays.asList("?", "bad?Name", "?bad??name?", "?badname", "badname?"));
+		invalidNames.addAll(Arrays.asList(",", "bad,Name", ",bad,,name,", ",badname", "badname,"));
+		invalidNames.addAll(Arrays.asList("\"", "bad\"Name", "\"bad\"\"name\"", "\"badname", "badname\""));
+		invalidNames.addAll(Arrays.asList("\\", "bad\\Name", "\\bad\\\\name\\", "\\badname", "badname\\"));
+
+		for (String invalidName : invalidNames) {
+			try {
+				digraph.createRegion(invalidName);
+				fail("Expected failure to create region.");
+			} catch (IllegalArgumentException e) {
+				// expected
+			} catch (BundleException e) {
+				fail("Unexpected bundle exception: " + e.getMessage());
+			}
+		}
+
+	}
 }