User: squirest
Date: 01/12/20 19:00:56
Modified: src/main/test/compliance/objectname MalformedTEST.java
PatternTEST.java
Log:
improved test coverage
Revision Changes Path
1.2 +140 -71 jmx/src/main/test/compliance/objectname/MalformedTEST.java
Index: MalformedTEST.java
===================================================================
RCS file: /cvsroot/jboss/jmx/src/main/test/compliance/objectname/MalformedTEST.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MalformedTEST.java 2001/12/20 01:50:58 1.1
+++ MalformedTEST.java 2001/12/21 03:00:56 1.2
@@ -13,6 +13,10 @@
import javax.management.ObjectName;
import java.util.Hashtable;
+/**
+ * FIXME THS - not 100% test coverage but it's late and I want to check
+ * in my changes. Expect this testcase to be refactored... maybe.
+ */
public class MalformedTEST extends TestCase
{
public MalformedTEST(String s)
@@ -22,100 +26,164 @@
public void testMalformed_a()
{
- try
- {
- ObjectName name = new ObjectName(null);
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest(null);
}
public void testMalformed_b()
{
- try
- {
- ObjectName name = new ObjectName(null, "key1", "val1");
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest(null, "key1", "val1");
}
public void testMalformed_c()
{
- try
- {
- ObjectName name = new ObjectName("domain", null, null);
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest("domain", null, null);
+ }
+
+ public void testMalformed_ca()
+ {
+ doTest("domain", "key", "");
+ }
+
+ public void testMalformed_cb()
+ {
+ doTest("domain", "", "val");
+ }
+
+ public void testMalformed_cc()
+ {
+ doTest("domain", "ke,y", "val");
+ }
+
+ public void testMalformed_cd()
+ {
+ doTest("domain", "ke:y", "val");
+ }
+
+ public void testMalformed_ce()
+ {
+ doTest("domain", "ke=y", "val");
}
+ public void testMalformed_cf()
+ {
+ doTest("domain", "key", "v=al");
+ }
+
+ public void testMalformed_cg()
+ {
+ doTest("domain", "key", "v,al");
+ }
+
public void testMalformed_d()
{
- try
- {
- ObjectName name = new ObjectName("domain", (Hashtable) null);
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest("domain", (Hashtable) null);
}
public void testMalformed_e()
{
- try
- {
- ObjectName name = new ObjectName("domain", new Hashtable());
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest("domain", new Hashtable());
+ }
+
+ public void testMalformed_ea()
+ {
+ doTestHash("domain", "", "val1");
}
+ public void testMalformed_eb()
+ {
+ doTestHash("domain", "key1", "");
+ }
+
+ public void testMalformed_ec()
+ {
+ doTestHash("domain", "key1", "val=val");
+ }
+
+ public void testMalformed_ed()
+ {
+ doTestHash("domain", "key1", "val,xx");
+ }
+
+ public void testMalformed_ee()
+ {
+ doTestHash("domain", "key1=blah", "val1");
+ }
+
+ public void testMalformed_ef()
+ {
+ doTestHash("domain", "key1,blah", "val1");
+ }
+
+ public void testMalformed_eg()
+ {
+ doTestHash("domain", new Object(), "val1");
+ }
+
+ public void testMalformed_eh()
+ {
+ doTestHash("domain", "key1", new Object());
+ }
+
public void testMalformed_f()
{
- try
- {
- ObjectName name = new ObjectName("domain:key=val,key=val");
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest("domain:key=val,key=val");
}
public void testMalformed_g()
{
- try
- {
- ObjectName name = new ObjectName("domain:key=val=val");
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ doTest("domain:key=val=val");
}
public void testMalformed_h()
{
+ doTest("domain:key==val,foo=bar");
+ }
+
+ public void testMalformed_i()
+ {
+ doTest("domain:=val,foo=bar");
+ }
+
+ public void testMalformed_j()
+ {
+ doTest("domain:key=,foo=bar");
+ }
+
+ public void testMalformed_k()
+ {
+ doTest("domain:key=val,,foo=bar");
+ }
+
+ public void testMalformed_l()
+ {
+ doTest("domain:key=val, ,foo=bar");
+ }
+
+ public void testMalformed_m()
+ {
+ doTest("domain:,key=val,foo=bar");
+ }
+
+ public void testMalformed_n()
+ {
+ doTest("domain:key=val,foo=bar,");
+ }
+
+ public void testMalformed_o()
+ {
+ doTest("doma,in:key=val,foo=bar");
+ }
+
+ public void testMalformed_p()
+ {
+ doTest("doma=in:key=val,foo=bar");
+ }
+
+ private void doTest(String str)
+ {
try
{
- ObjectName name = new ObjectName("domain:key==val,foo=bar");
+ ObjectName name = new ObjectName(str);
}
catch (MalformedObjectNameException e)
{
@@ -124,11 +192,11 @@
fail("expected a MalformedObjectNameException");
}
- public void testMalformed_i()
+ private void doTest(String domain, String key, String value)
{
try
{
- ObjectName name = new ObjectName("domain:=val,foo=bar");
+ ObjectName name = new ObjectName(domain, key, value);
}
catch (MalformedObjectNameException e)
{
@@ -137,11 +205,11 @@
fail("expected a MalformedObjectNameException");
}
- public void testMalformed_j()
+ private void doTest(String domain, Hashtable hash)
{
try
{
- ObjectName name = new ObjectName("domain:key=,foo=bar");
+ ObjectName name = new ObjectName(domain, hash);
}
catch (MalformedObjectNameException e)
{
@@ -150,11 +218,13 @@
fail("expected a MalformedObjectNameException");
}
- public void testMalformed_k()
+ private void doTestHash(String domain, Object key, Object value)
{
try
{
- ObjectName name = new ObjectName("domain:key=val,,foo=bar");
+ Hashtable h = new Hashtable();
+ h.put(key, value);
+ ObjectName name = new ObjectName(domain, h);
}
catch (MalformedObjectNameException e)
{
@@ -162,5 +232,4 @@
}
fail("expected a MalformedObjectNameException");
}
-
}
1.2 +45 -10 jmx/src/main/test/compliance/objectname/PatternTEST.java
Index: PatternTEST.java
===================================================================
RCS file: /cvsroot/jboss/jmx/src/main/test/compliance/objectname/PatternTEST.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PatternTEST.java 2001/12/20 01:50:58 1.1
+++ PatternTEST.java 2001/12/21 03:00:56 1.2
@@ -26,8 +26,19 @@
assertTrue("isPattern should be true", name.isPattern());
assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("*", name.getDomain());
}
+ public void testBasicDomainPatternExtra()
+ {
+ String nameArg = "**:key1=val1,key2=val2";
+ ObjectName name = constructSafely(nameArg);
+ assertTrue("isPattern should be true", name.isPattern());
+ assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
+ assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("**", name.getDomain());
+ }
+
public void testPartialDomainPattern()
{
String nameArg = "*domain:key1=val1,key2=val2";
@@ -35,6 +46,7 @@
assertTrue("isPattern should be true", name.isPattern());
assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("*domain", name.getDomain());
}
public void testHarderPartialDomainPattern()
@@ -44,6 +56,17 @@
assertTrue("isPattern should be true", name.isPattern());
assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("d*n", name.getDomain());
+ }
+
+ public void testHarderPartialDomainPatternExtra()
+ {
+ String nameArg = "d**n:key1=val1,key2=val2";
+ ObjectName name = constructSafely(nameArg);
+ assertTrue("isPattern should be true", name.isPattern());
+ assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
+ assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("d**n", name.getDomain());
}
public void testPositionalDomainPattern()
@@ -53,6 +76,7 @@
assertTrue("isPattern should be true", name.isPattern());
assertEquals("toString should be: '" + nameArg + "'", nameArg,
name.toString());
assertTrue("isPropertyPattern should be false", !name.isPropertyPattern());
+ assertEquals("do??in", name.getDomain());
}
public void testPatternOnly()
@@ -83,19 +107,30 @@
assertEquals("toString should be: 'domain:key1=val1'", "domain:key1=val1",
name.toString());
assertTrue("key properties hash should only have 1 element", 1 ==
name.getKeyPropertyList().size());
}
+
+ public void testEquality_a()
+ {
+ ObjectName pat1 = constructSafely("domain:*,key=value");
+ ObjectName pat2 = constructSafely("domain:key=value,*");
+ assertEquals(pat1, pat2);
+ }
+
+ public void testEquality_b()
+ {
+ ObjectName pat1 = constructSafely("do**main:key=value,*");
+ ObjectName pat2 = constructSafely("do*main:key=value,*");
+ assertTrue(".equals() should return false", !pat1.equals(pat2));
+ }
- public void testMalformedPattern()
+/* FIXME THS - this test fails when run against the RI!
+ public void testEquality_c()
{
- try
- {
- ObjectName name = new ObjectName("domain:key1=*,key2=val2");
- }
- catch (MalformedObjectNameException e)
- {
- return;
- }
- fail("expected a MalformedObjectNameException");
+ ObjectName conc = constructSafely("domain:key=value");
+ ObjectName pat = constructSafely("domain:key=value,*");
+ assertEquals("toString() should match", conc.toString(), pat.toString());
+ assertTrue("equals() should be false", !conc.equals(pat));
}
+*/
private ObjectName constructSafely(String nameArg)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
