harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r592673 [9/10] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/build/platform/ depends/manifests/icu4j_3.8/META-INF/ make/ modules/archive/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native...
Date Wed, 07 Nov 2007 09:51:11 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java Wed Nov  7 01:51:00 2007
@@ -55,15 +55,11 @@
      * an instance is created. Fields content and next are null and type is 0.
      */
     public void testContentModel001() {
-        try {
-            cm = new ContentModel();
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel();
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /*
@@ -77,15 +73,11 @@
      * and next are null and type is 0.
      */
     public void testContentModelElement001() {
-        try {
-            cm = new ContentModel(null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -97,27 +89,22 @@
      * and next is null.
      */
     public void testContentModelElement003() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(el);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(cm2, el.content);
-            assertEquals(el, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(el);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(cm2, el.content);
+        assertEquals(el, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -129,26 +116,22 @@
      * content is equal to el ,type is 0 and next is null.
      */
     public void testContentModelElement004() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(el);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(cm2, el.content);
-            assertEquals(el, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(el);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(cm2, el.content);
+        assertEquals(el, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -159,20 +142,16 @@
      * null.
      */
     public void testContentModelElement005() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertNull(el.content);
-            assertEquals(el, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertNull(el.content);
+        assertEquals(el, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /*
@@ -188,16 +167,12 @@
      * and next is null
      */
     public void testContentModelIntContentModel001() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(0, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(0, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -208,16 +183,12 @@
      * Integer.MIN_VALUE and next is null
      */
     public void testContentModelIntContentModel002() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(Integer.MIN_VALUE, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(Integer.MIN_VALUE, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -228,16 +199,12 @@
      * Integer.MAX_VALUE and next is null
      */
     public void testContentModelIntContentModel003() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(Integer.MAX_VALUE, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(Integer.MAX_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(Integer.MAX_VALUE, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(Integer.MAX_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -248,16 +215,12 @@
      * next is null
      */
     public void testContentModelIntContentModel004() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(42, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(42, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(42, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(42, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -268,16 +231,12 @@
      * next is null
      */
     public void testContentModelIntContentModel005() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(43, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(43, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(43, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(43, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -288,16 +247,12 @@
      * next is null
      */
     public void testContentModelIntContentModel006() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(44, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(44, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(44, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(44, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -308,16 +263,12 @@
      * next is null
      */
     public void testContentModelIntContentModel007() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(63, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(63, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(63, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(63, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -328,16 +279,12 @@
      * next is null
      */
     public void testContentModelIntContentModel008() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(124, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(124, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(124, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(124, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -348,16 +295,12 @@
      * next is null
      */
     public void testContentModelIntContentModel009() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(38, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(38, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(38, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(38, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -367,15 +310,11 @@
      * created. content is equal to null, type is 0 and next is null
      */
     public void testContentModelIntContentModel010() {
-        try {
-            cm = new ContentModel(0, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(0, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -386,15 +325,11 @@
      * and next is null
      */
     public void testContentModelIntContentModel011() {
-        try {
-            cm = new ContentModel(Integer.MIN_VALUE, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(Integer.MIN_VALUE, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -405,15 +340,11 @@
      * and next is null
      */
     public void testContentModelIntContentModel012() {
-        try {
-            cm = new ContentModel(Integer.MAX_VALUE, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(Integer.MAX_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(Integer.MAX_VALUE, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(Integer.MAX_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -423,15 +354,11 @@
      * created. content is equal to null, type is 42 and next is null
      */
     public void testContentModelIntContentModel013() {
-        try {
-            cm = new ContentModel(42, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(42, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(42, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(42, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -441,15 +368,11 @@
      * created. content is equal to null, type is 43 and next is null
      */
     public void testContentModelIntContentModel014() {
-        try {
-            cm = new ContentModel(43, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(43, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(43, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(43, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -459,15 +382,11 @@
      * created. content is equal to null, type is 44 and next is null
      */
     public void testContentModelIntContentModel015() {
-        try {
-            cm = new ContentModel(44, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(44, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(44, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(44, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -477,15 +396,11 @@
      * created. content is equal to null, type is 63 and next is null
      */
     public void testContentModelIntContentModel016() {
-        try {
-            cm = new ContentModel(63, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(63, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(63, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(63, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -495,16 +410,11 @@
      * created. content is equal to null, type is 124 and next is null
      */
     public void testContentModelIntContentModel017() {
-        try {
-            cm = new ContentModel(124, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(124, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(124, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(124, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -514,16 +424,11 @@
      * created. content is equal to null, type is 38 and next is null
      */
     public void testContentModelIntContentModel018() {
-        try {
-            cm = new ContentModel(38, null);
-            assertNotNull(cm);
-            assertNull(cm.content);
-            assertEquals(38, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(38, null);
+        assertNotNull(cm);
+        assertNull(cm.content);
+        assertEquals(38, cm.type);
+        assertNull(cm.next);
     }
 
 
@@ -535,18 +440,13 @@
      * ContentModel(0,ContentModel()), type is 0 and next is null
      */
     public void testContentModelIntContentModel028() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(0, cm2);
-            cm = new ContentModel(0, cm3);
-            assertNotNull(cm);
-            assertEquals(cm3, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(0, cm2);
+        cm = new ContentModel(0, cm3);
+        assertNotNull(cm);
+        assertEquals(cm3, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -559,18 +459,13 @@
      * and next is null
      */
     public void testContentModelIntContentModel029() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(Integer.MAX_VALUE, cm2);
-            cm = new ContentModel(Integer.MIN_VALUE, cm3);
-            assertNotNull(cm);
-            assertEquals(cm3, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(Integer.MAX_VALUE, cm2);
+        cm = new ContentModel(Integer.MIN_VALUE, cm3);
+        assertNotNull(cm);
+        assertEquals(cm3, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -583,18 +478,13 @@
      * and next is null
      */
     public void testContentModelIntContentModel030() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(Integer.MIN_VALUE, cm2);
-            cm = new ContentModel(Integer.MAX_VALUE, cm3);
-            assertNotNull(cm);
-            assertEquals(cm3, cm.content);
-            assertEquals(Integer.MAX_VALUE, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(Integer.MIN_VALUE, cm2);
+        cm = new ContentModel(Integer.MAX_VALUE, cm3);
+        assertNotNull(cm);
+        assertEquals(cm3, cm.content);
+        assertEquals(Integer.MAX_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -605,18 +495,12 @@
      * 42 and next is null
      */
     public void testContentModelIntContentModel031() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(42, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(42, cm.type);
-            assertNull(cm.next);
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(42, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(42, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -627,18 +511,12 @@
      * 43 and next is null
      */
     public void testContentModelIntContentModel032() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(43, cm2);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(43, cm.type);
-            assertNull(cm.next);
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(43, cm2);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(43, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -650,26 +528,22 @@
      * and next is null.
      */
     public void testContentModelIntContentModel034() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(0, cm2);
-            assertNotNull(cm);
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(0, cm2);
+        assertNotNull(cm);
 
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -681,26 +555,22 @@
      * content is equal to el ,type is 0 and next is null.
      */
     public void testContentModelIntContentModel035() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(43, cm2);
-            assertNotNull(cm);
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(43, cm2);
+        assertNotNull(cm);
 
-            assertEquals(cm2, cm.content);
-            assertEquals(43, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertEquals(cm2, cm.content);
+        assertEquals(43, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -712,20 +582,16 @@
      * ,type is 0 and next is null.
      */
     public void testContentModelIntContentModel036() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            assertNotNull(cm2);
-
-            assertEquals(cm, cm2.content);
-            assertEquals(0, cm2.type);
-            assertNull(cm2.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        assertNotNull(cm2);
+
+        assertEquals(cm, cm2.content);
+        assertEquals(0, cm2.type);
+        assertNull(cm2.next);
     }
 
     /*
@@ -1250,16 +1116,12 @@
      * and next is null
      */
     public void testContentModelIntObjectContentModel043() {
-        try {
-            dtd = new DTDGetter("hi");
-            cm = new ContentModel(38, dtd, null);
-            assertNotNull(cm);
-            assertNull(cm.next);
-            assertEquals(38, cm.type);
-            assertEquals(dtd, cm.content);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("hi");
+        cm = new ContentModel(38, dtd, null);
+        assertNotNull(cm);
+        assertNull(cm.next);
+        assertEquals(38, cm.type);
+        assertEquals(dtd, cm.content);
     }
 
 
@@ -1273,24 +1135,20 @@
      * type is -38 and next is null
      */
     public void testContentModelIntObjectContentModel045() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(-38, el, null);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(-38, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(-38, el, null);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(-38, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1304,25 +1162,21 @@
      * is 0 and next is null
      */
     public void testContentModelIntObjectContentModel046() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(3);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", '.', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
-            cm = new ContentModel(0, cm2, null);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(3);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", '.', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
+        cm = new ContentModel(0, cm2, null);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1338,24 +1192,20 @@
      * null
      */
     public void testContentModelIntObjectContentModel047() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(Integer.MIN_VALUE, el, null);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(Integer.MIN_VALUE, el, null);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1368,18 +1218,14 @@
      * and next is null
      */
     public void testContentModelIntObjectContentModel048() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(Integer.MAX_VALUE, el, null);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(Integer.MAX_VALUE, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(Integer.MAX_VALUE, el, null);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(Integer.MAX_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1393,26 +1239,22 @@
      * next is null
      */
     public void testContentModelIntObjectContentModel049() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
 
-            cm = new ContentModel(42, cm2, null);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(42, cm.type);
-            assertNull(cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(42, cm2, null);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(42, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1433,26 +1275,21 @@
      * Vector(),new AttributeList(null)))
      */
     public void testContentModelIntObjectContentModel050() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            cm = new ContentModel(0, cm2, null);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        cm = new ContentModel(0, cm2, null);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1466,21 +1303,16 @@
      */
 
     public void testContentModelIntObjectContentModel051() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            cm = new ContentModel(Integer.MIN_VALUE, cm2, null);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertNull(cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        cm = new ContentModel(Integer.MIN_VALUE, cm2, null);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertNull(cm.next);
     }
 
     /**
@@ -1725,17 +1557,13 @@
      * new DTDGetter("hi"), type is 38 and next is new ContentModel()
      */
     public void testContentModelIntObjectContentModel076() {
-        try {
-            ContentModel cmnext = new ContentModel();
-            dtd = new DTDGetter("hi");
-            cm = new ContentModel(38, dtd, cmnext);
-            assertNotNull(cm);
-            assertEquals(cmnext, cm.next);
-            assertEquals(38, cm.type);
-            assertEquals(dtd, cm.content);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cmnext = new ContentModel();
+        dtd = new DTDGetter("hi");
+        cm = new ContentModel(38, dtd, cmnext);
+        assertNotNull(cm);
+        assertEquals(cmnext, cm.next);
+        assertEquals(38, cm.type);
+        assertEquals(dtd, cm.content);
     }
 
 
@@ -1750,26 +1578,22 @@
      * to null, type is 0 and next is new ContentModel()
      */
     public void testContentModelIntObjectContentModel079() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cmnext = new ContentModel();
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
-            cm = new ContentModel(0, cm2, cmnext);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertEquals(cmnext, cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cmnext = new ContentModel();
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
+        cm = new ContentModel(0, cm2, cmnext);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1785,25 +1609,21 @@
      * new ContentModel()
      */
     public void testContentModelIntObjectContentModel080() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cmnext = new ContentModel();
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(Integer.MIN_VALUE, el, cmnext);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertEquals(cmnext, cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cmnext = new ContentModel();
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(Integer.MIN_VALUE, el, cmnext);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1816,19 +1636,15 @@
      * and next is new ContentModel()
      */
     public void testContentModelIntObjectContentModel081() {
-        try {
-            ContentModel cmnext = new ContentModel();
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(Integer.MAX_VALUE, el, cmnext);
-            assertNotNull(cm);
-            assertEquals(el, cm.content);
-            assertEquals(Integer.MAX_VALUE, cm.type);
-            assertEquals(cmnext, cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cmnext = new ContentModel();
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(Integer.MAX_VALUE, el, cmnext);
+        assertNotNull(cm);
+        assertEquals(el, cm.content);
+        assertEquals(Integer.MAX_VALUE, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1842,27 +1658,23 @@
      * and next is new ContentModel()
      */
     public void testContentModelIntObjectContentModel082() {
-        try {
-            ContentModel cmnext = new ContentModel();
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
+        ContentModel cmnext = new ContentModel();
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
 
-            cm = new ContentModel(42, cm2, cmnext);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(42, cm.type);
-            assertEquals(cmnext, cm.next);
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(42, cm2, cmnext);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(42, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1884,28 +1696,23 @@
      * Vector(),new AttributeList(null)))
      */
     public void testContentModelIntObjectContentModel083() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cmnext = new ContentModel();
-
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            cm = new ContentModel(0, cm2, cmnext);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(0, cm.type);
-            assertEquals(cmnext, cm.next);
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cmnext = new ContentModel();
 
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        cm = new ContentModel(0, cm2, cmnext);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(0, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1920,22 +1727,17 @@
      */
 
     public void testContentModelIntObjectContentModel084() {
-        try {
-            ContentModel cmnext = new ContentModel();
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            cm = new ContentModel(Integer.MIN_VALUE, cm2, cmnext);
-            assertNotNull(cm);
-            assertEquals(cm2, cm.content);
-            assertEquals(Integer.MIN_VALUE, cm.type);
-            assertEquals(cmnext, cm.next);
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cmnext = new ContentModel();
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        cm = new ContentModel(Integer.MIN_VALUE, cm2, cmnext);
+        assertNotNull(cm);
+        assertEquals(cm2, cm.content);
+        assertEquals(Integer.MIN_VALUE, cm.type);
+        assertEquals(cmnext, cm.next);
     }
 
     /**
@@ -1948,9 +1750,8 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: " + e.getClass() + " " + e.getMessage());
-        }
+            // Expected
+        } 
     }
 
     /**
@@ -1964,8 +1765,7 @@
 
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -1976,23 +1776,18 @@
      * Expected: "elemento"
      */
     public void testToString004() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(el);
-
-            assertEquals("elemento", cm.toString());
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(el);
 
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertEquals("elemento", cm.toString());
     }
 
     /**
@@ -2001,23 +1796,18 @@
      */
 
     public void testToString005() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(el);
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(el);
 
-            assertEquals("", cm.toString());
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertEquals("", cm.toString());
     }
 
     /**
@@ -2025,17 +1815,12 @@
      * ContentModel(Element("1",0,true,true,null,null,null,null)) Expected: "1"
      */
     public void testToString006() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-
-            assertEquals("1", cm.toString());
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
 
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertEquals("1", cm.toString());
     }
 
     /**
@@ -2049,8 +1834,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2066,8 +1850,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2083,8 +1866,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2099,8 +1881,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2109,12 +1890,8 @@
      * Parameters type=43, null Expected result is "null+"
      */
     public void testToString011() {
-        try {
-            cm = new ContentModel(43, null);
-            assertEquals("null+", cm.toString());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(43, null);
+        assertEquals("null+", cm.toString());
     }
 
     /**
@@ -2122,12 +1899,8 @@
      * Parameters type=44, null Expected result is "()"
      */
     public void testToString012() {
-        try {
             cm = new ContentModel(44, null);
             assertEquals("()", cm.toString());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
     }
 
     /**
@@ -2144,9 +1917,8 @@
 
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
-        }
+            // Expected
+        } 
     }
 
     /**
@@ -2163,8 +1935,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2183,8 +1954,7 @@
             cm.toString();
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2193,15 +1963,9 @@
      * Parameters type=42, ContentModel(42,null) Expected result is "null**"
      */
     public void testToString019() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(42, cm2);
-            assertEquals("null**", cm.toString());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(42, cm2);
+        assertEquals("null**", cm.toString());
     }
 
     /**
@@ -2209,15 +1973,9 @@
      * Parameters type=43, ContentModel(42,null) Expected result is "null*+"
      */
     public void testToString020() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(43, cm2);
-            assertEquals("null*+", cm.toString());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(43, cm2);
+        assertEquals("null*+", cm.toString());
     }
 
     /**
@@ -2227,22 +1985,18 @@
      * Expected result is "elemento"
      */
     public void testToString022() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(0, cm2);
-            assertEquals("elemento", cm.toString());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(0, cm2);
+        assertEquals("elemento", cm.toString());
     }
 
     /**
@@ -2252,22 +2006,18 @@
      * Vector(),new AttributeList(null)) . Expected result is "+"
      */
     public void testToString023() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(43, cm2);
-            assertEquals("+", cm.toString());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(43, cm2);
+        assertEquals("+", cm.toString());
     }
 
     /**
@@ -2277,16 +2027,12 @@
      * instantiated Expected result is "1"
      */
     public void testToString024() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            assertEquals("1", cm.toString());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        assertEquals("1", cm.toString());
     }
 
     /**
@@ -2294,15 +2040,9 @@
      * Parameters type='&', ContentModel('|',null) Expected result is "null|&"
      */
     public void testToString025() {
-        try {
-            ContentModel cm2 = new ContentModel('&', null);
-            cm = new ContentModel('|', cm2);
-            assertEquals("(())", cm.toString());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel('&', null);
+        cm = new ContentModel('|', cm2);
+        assertEquals("(())", cm.toString());
     }
 
 
@@ -2329,13 +2069,9 @@
      * ContentModel(0,cm2) Expected result is false
      */
     public void testEmpty003() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(0, cm2);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(0, cm2);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2344,48 +2080,39 @@
      * ContentModel()),BitSet(0).set(1),BitSet(168).set(45),AttributeList("1"))
      * Expected result is false
      */
-    public void testEmpty004() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(el);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
-    }
-
-    /**
-     * Test method for 'org.apache.harmony.swing.tests.javax.swing.text.parser.ContentModel.empty()'
-     * ContentModel(Element("elemento",',',false,false,('*',new
-     * ContentModel()),BitSet(0).set(1),BitSet(168).set(45),AttributeList("1")
-     * Expected result is false
-     */
-    public void testEmpty005() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(el);
+    public void testEmpty004() {
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(el);
+        assertFalse(cm.empty());
+    }
 
-            assertFalse(cm.empty());
+    /**
+     * Test method for 'org.apache.harmony.swing.tests.javax.swing.text.parser.ContentModel.empty()'
+     * ContentModel(Element("elemento",',',false,false,('*',new
+     * ContentModel()),BitSet(0).set(1),BitSet(168).set(45),AttributeList("1")
+     * Expected result is false
+     */
+    public void testEmpty005() {
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(el);
 
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2394,15 +2121,11 @@
      * result is false
      */
     public void testEmpty006() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        assertFalse(cm.empty());
     }
 
 
@@ -2412,13 +2135,9 @@
      * false
      */
     public void testEmpty008() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(Integer.MIN_VALUE, cm2);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(Integer.MIN_VALUE, cm2);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2427,13 +2146,9 @@
      * false
      */
     public void testEmpty009() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(Integer.MAX_VALUE, cm2);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(Integer.MAX_VALUE, cm2);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2441,13 +2156,9 @@
      * Parameters type=42, ContentModel() Expected result is true
      */
     public void testEmpty010() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(42, cm2);
-            assertTrue(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(42, cm2);
+        assertTrue(cm.empty());
     }
 
     /**
@@ -2455,12 +2166,8 @@
      * Parameters type=43, null Expected result is false
      */
     public void testEmpty011() {
-        try {
-            cm = new ContentModel(43, null);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(43, null);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2468,12 +2175,8 @@
      * Parameters type=44, null Expected result is true
      */
     public void testEmpty012() {
-        try {
-            cm = new ContentModel(44, null);
-            assertTrue(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(44, null);
+        assertTrue(cm.empty());
     }
 
     /**
@@ -2482,15 +2185,10 @@
      * false
      */
     public void testEmpty016() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(0, cm2);
-            cm = new ContentModel(0, cm3);
-            assertFalse(cm.empty());
-
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(0, cm2);
+        cm = new ContentModel(0, cm3);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2499,14 +2197,10 @@
      * ContentModel(Integer.MAX_VALUE,ContentModel()) Expected result is false
      */
     public void testEmpty017() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(Integer.MAX_VALUE, cm2);
-            cm = new ContentModel(Integer.MIN_VALUE, cm3);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(Integer.MAX_VALUE, cm2);
+        cm = new ContentModel(Integer.MIN_VALUE, cm3);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2515,14 +2209,10 @@
      * ContentModel(Integer.MIN_VALUE,ContentModel()) Expected result is false
      */
     public void testEmpty018() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            ContentModel cm3 = new ContentModel(Integer.MIN_VALUE, cm2);
-            cm = new ContentModel(Integer.MAX_VALUE, cm3);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        ContentModel cm3 = new ContentModel(Integer.MIN_VALUE, cm2);
+        cm = new ContentModel(Integer.MAX_VALUE, cm3);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2530,15 +2220,9 @@
      * Parameters type=42, ContentModel(42,null) Expected result is True
      */
     public void testEmpty019() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(42, cm2);
-            assertTrue(cm.empty());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(42, cm2);
+        assertTrue(cm.empty());
     }
 
     /**
@@ -2546,15 +2230,9 @@
      * Parameters type=43, ContentModel(42,null) Expected result is true
      */
     public void testEmpty020() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(43, cm2);
-            assertTrue(cm.empty());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(43, cm2);
+        assertTrue(cm.empty());
     }
 
     /**
@@ -2564,22 +2242,18 @@
      * Expected result is false
      */
     public void testEmpty022() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(0, cm2);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(0, cm2);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2589,22 +2263,18 @@
      * Vector(),new AttributeList(null)) Expected result is false
      */
     public void testEmpty023() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(43, cm2);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(43, cm2);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2613,16 +2283,12 @@
      * "1",0,true,true,null,null,null,null)) Expected result is false
      */
     public void testEmpty024() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            assertFalse(cm.empty());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        assertFalse(cm.empty());
     }
 
     /**
@@ -2652,21 +2318,17 @@
      * ContentModel()),BitSet(0).set(1),BitSet(168).set(45),AttributeList("1")
      */
     public void testFirst004() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(el);
-            assertEquals(el, cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(el);
+        assertEquals(el, cm.first());
     }
 
     /**
@@ -2679,21 +2341,17 @@
      * Vector(),new AttributeList(null))
      */
     public void testFirst005() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm = new ContentModel(el);
-            assertEquals(el, cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm = new ContentModel(el);
+        assertEquals(el, cm.first());
     }
 
     /**
@@ -2702,15 +2360,11 @@
      * Element("1",0,true,true,null,null,null,null)
      */
     public void testFirst006() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            assertEquals(el, cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        assertEquals(el, cm.first());
     }
 
     /**
@@ -2725,10 +2379,7 @@
             Element result = cm.first();
             fail("Should raise ClassCastException, but was returned:" + result);
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2744,10 +2395,7 @@
             Element result = cm.first();
             fail("Should raise ClassCastException, but was returned:" + result);
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2756,13 +2404,9 @@
      * Parameters type=42, ContentModel() Expected result is null
      */
     public void testFirst010() {
-        try {
-            ContentModel cm2 = new ContentModel();
-            cm = new ContentModel(42, cm2);
-            assertNull(cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel();
+        cm = new ContentModel(42, cm2);
+        assertNull(cm.first());
     }
 
     /**
@@ -2775,8 +2419,7 @@
             assertNull(cm.first());
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2790,8 +2433,7 @@
             assertNull(cm.first());
             fail("Should raise NullPointerException");
         } catch (NullPointerException e) {
-        } catch (Throwable e) {
-            fail("Should throw NullPointerException, but was raised a: "  + e.getClass() + " " + e.getMessage());
+            // Expected
         }
     }
 
@@ -2809,10 +2451,7 @@
             Element result = cm.first();
             fail("Should raise ClassCastException, but was returned:" + result);
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2830,10 +2469,7 @@
             Element result = cm.first();
             fail("Should raise ClassCastException, but was returned:" + result);
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2851,10 +2487,7 @@
             Element result = cm.first();
             fail("Should raise ClassCastException, but was returned:" + result);
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2863,15 +2496,9 @@
      * Parameters type=42, ContentModel(42,null) Expected result is null
      */
     public void testFirst019() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(42, cm2);
-            assertNull(cm.first());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(42, cm2);
+        assertNull(cm.first());
     }
 
     /**
@@ -2879,15 +2506,9 @@
      * Parameters type=43, ContentModel(42,null) Expected result is null
      */
     public void testFirst020() {
-        try {
-            ContentModel cm2 = new ContentModel(42, null);
-            cm = new ContentModel(43, cm2);
-            assertNull(cm.first());
-        }
-
-        catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        ContentModel cm2 = new ContentModel(42, null);
+        cm = new ContentModel(43, cm2);
+        assertNull(cm.first());
     }
 
 
@@ -2914,10 +2535,7 @@
             assertEquals(el, cm.first());
             fail("Should raise ClassCastException");
         } catch (ClassCastException e) {
-        } catch (AssertionFailedError e){
-            throw e;
-        } catch (Throwable e) {
-            fail("Should throw ClassCastException, but was raised a: "  + e.getClass());
+            // Expected
         }
     }
 
@@ -2931,22 +2549,18 @@
      * Vector(),new AttributeList(null))
      */
     public void testFirst023() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(128);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(7);
-            AttributeList al = new AttributeList("bigC", -2147483648, -1,
-                    "value", new Vector(), new AttributeList(null));
-            Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
-                    al);
-            cm2 = new ContentModel(el);
-            ContentModel cm = new ContentModel(43, cm2);
-            assertEquals(el, cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(128);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(7);
+        AttributeList al = new AttributeList("bigC", -2147483648, -1,
+                "value", new Vector(), new AttributeList(null));
+        Element el = dtd.defineElement("", '*', true, false, cm2, bs1, bs2,
+                al);
+        cm2 = new ContentModel(el);
+        ContentModel cm = new ContentModel(43, cm2);
+        assertEquals(el, cm.first());
     }
 
     /**
@@ -2956,16 +2570,12 @@
      * "1",0,true,true,null,null,null,null)
      */
     public void testFirst024() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            Element el = dtd.defineElement("1", 0, true, true, null, null,
-                    null, null);
-            cm = new ContentModel(el);
-            ContentModel cm2 = new ContentModel(0, cm);
-            assertEquals(el, cm.first());
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        Element el = dtd.defineElement("1", 0, true, true, null, null,
+                null, null);
+        cm = new ContentModel(el);
+        ContentModel cm2 = new ContentModel(0, cm);
+        assertEquals(el, cm.first());
     }
 
     /**
@@ -2973,12 +2583,8 @@
      * ContentModel().first(null) Expected: True
      */
     public void testFirstObject001() {
-        try {
-            cm = new ContentModel();
-            assertTrue(cm.first(null));
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel();
+        assertTrue(cm.first(null));
     }
 
     /**
@@ -2986,12 +2592,8 @@
      * ContentModel(null).first(null) Expected: True
      */
     public void testFirstObject002() {
-        try {
-            cm = new ContentModel(null);
-            assertTrue(cm.first(null));
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(null);
+        assertTrue(cm.first(null));
     }
 
     /**
@@ -3000,12 +2602,8 @@
      */
 
     public void testFirstObject003() {
-        try {
-            cm = new ContentModel(null);
-            assertFalse(cm.first(cm));
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        cm = new ContentModel(null);
+        assertFalse(cm.first(cm));
     }
 
 
@@ -3018,31 +2616,27 @@
      * Expected: true
      */
     public void testFirstObject005() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");
-            ContentModel cm2 = new ContentModel('*', new ContentModel());
-            BitSet bs1 = new BitSet(0);
-            bs1.set(1);
-            BitSet bs2 = new BitSet(168);
-            bs2.set(45);
-            AttributeList al = new AttributeList("1");
-            Element el = dtd.defineElement("elemento", ',', false, false, cm2,
-                    bs1, bs2, al);
-            cm = new ContentModel(el);
-            assertTrue(cm.first(el));
-            assertFalse(cm.first(cm));
-            assertFalse(cm.first(cm2));
-            assertFalse(cm.first(dtd));
-
-            assertFalse(cm.first(bs1));
-            assertFalse(cm.first(bs2));
-            assertFalse(cm.first(al));
-            assertFalse(cm.first(""));
-            assertFalse(cm.first("elemento"));
-            assertFalse(cm.first(null));
-        } catch (Exception e) {
-            fail("Should not throw any exception but was: " + e);
-        }
+        dtd = new DTDGetter("TestContentModelSemantic");
+        ContentModel cm2 = new ContentModel('*', new ContentModel());
+        BitSet bs1 = new BitSet(0);
+        bs1.set(1);
+        BitSet bs2 = new BitSet(168);
+        bs2.set(45);
+        AttributeList al = new AttributeList("1");
+        Element el = dtd.defineElement("elemento", ',', false, false, cm2,
+                bs1, bs2, al);
+        cm = new ContentModel(el);
+        assertTrue(cm.first(el));
+        assertFalse(cm.first(cm));
+        assertFalse(cm.first(cm2));
+        assertFalse(cm.first(dtd));
+
+        assertFalse(cm.first(bs1));
+        assertFalse(cm.first(bs2));
+        assertFalse(cm.first(al));
+        assertFalse(cm.first(""));
+        assertFalse(cm.first("elemento"));
+        assertFalse(cm.first(null));
     }
 
     /**
@@ -3055,30 +2649,26 @@
      */
 
     public void testFirstObject006() {
-        try {
-            dtd = new DTDGetter("TestContentModelSemantic");

[... 1461 lines stripped ...]


Mime
View raw message