Return-Path: Delivered-To: apmail-db-ddlutils-dev-archive@www.apache.org Received: (qmail 62352 invoked from network); 16 Jun 2008 03:46:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Jun 2008 03:46:36 -0000 Received: (qmail 85517 invoked by uid 500); 16 Jun 2008 03:46:39 -0000 Delivered-To: apmail-db-ddlutils-dev-archive@db.apache.org Received: (qmail 85497 invoked by uid 500); 16 Jun 2008 03:46:39 -0000 Mailing-List: contact ddlutils-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ddlutils-dev@db.apache.org Delivered-To: mailing list ddlutils-dev@db.apache.org Received: (qmail 85486 invoked by uid 500); 16 Jun 2008 03:46:39 -0000 Delivered-To: apmail-db-ddlutils-commits@db.apache.org Received: (qmail 85483 invoked by uid 99); 16 Jun 2008 03:46:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jun 2008 20:46:38 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2008 03:45:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D23B2388A06; Sun, 15 Jun 2008 20:46:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r668050 [1/2] - in /db/ddlutils/trunk/src/test/java/org/apache/ddlutils: ./ alteration/ io/ platform/ task/ Date: Mon, 16 Jun 2008 03:46:13 -0000 To: ddlutils-commits@db.apache.org From: tomdz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080616034614.3D23B2388A06@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomdz Date: Sun Jun 15 20:46:13 2008 New Revision: 668050 URL: http://svn.apache.org/viewvc?rev=668050&view=rev Log: Updated tests for XML Schema validation. Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/RunAllTests.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestForeignKeyComparison.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestIndexComparison.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestPrimaryKeyComparison.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestTableComparison.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestInsertColumn.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/platform/TestPlatformImplBase.java db/ddlutils/trunk/src/test/java/org/apache/ddlutils/task/TestWriteSchemaToFileCommand.java Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/RunAllTests.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/RunAllTests.java?rev=668050&r1=668049&r2=668050&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/RunAllTests.java (original) +++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/RunAllTests.java Sun Jun 15 20:46:13 2008 @@ -20,7 +20,11 @@ */ import org.apache.ddlutils.alteration.TestAlterationAlgorithm; +import org.apache.ddlutils.alteration.TestForeignKeyComparison; +import org.apache.ddlutils.alteration.TestIndexComparison; import org.apache.ddlutils.alteration.TestModelComparison; +import org.apache.ddlutils.alteration.TestPrimaryKeyComparison; +import org.apache.ddlutils.alteration.TestTableComparison; import org.apache.ddlutils.dynabean.TestDynaSqlQueries; import org.apache.ddlutils.io.TestAddColumn; import org.apache.ddlutils.io.TestAlteration; @@ -30,6 +34,7 @@ import org.apache.ddlutils.io.TestDatabaseIO; import org.apache.ddlutils.io.TestDatatypes; import org.apache.ddlutils.io.TestDropColumn; +import org.apache.ddlutils.io.TestInsertColumn; import org.apache.ddlutils.io.TestMisc; import org.apache.ddlutils.io.converters.TestDateConverter; import org.apache.ddlutils.io.converters.TestTimeConverter; @@ -123,11 +128,17 @@ suite.addTestSuite(TestSybasePlatform.class); suite.addTestSuite(TestModelComparison.class); suite.addTestSuite(TestAlterationAlgorithm.class); + suite.addTestSuite(TestModelComparison.class); + suite.addTestSuite(TestTableComparison.class); + suite.addTestSuite(TestPrimaryKeyComparison.class); + suite.addTestSuite(TestIndexComparison.class); + suite.addTestSuite(TestForeignKeyComparison.class); suite.addTest(TestDynaSqlQueries.suite()); suite.addTest(TestDatatypes.suite()); suite.addTest(TestConstraints.suite()); suite.addTest(TestAlteration.suite()); suite.addTest(TestAddColumn.suite()); + suite.addTest(TestInsertColumn.suite()); suite.addTest(TestChangeColumn.suite()); suite.addTest(TestDropColumn.suite()); suite.addTest(TestMisc.suite()); Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestForeignKeyComparison.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestForeignKeyComparison.java?rev=668050&r1=668049&r2=668050&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestForeignKeyComparison.java (original) +++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestForeignKeyComparison.java Sun Jun 15 20:46:13 2008 @@ -22,6 +22,7 @@ import java.sql.Types; import java.util.List; +import org.apache.ddlutils.io.DatabaseIO; import org.apache.ddlutils.model.Database; /** @@ -40,7 +41,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + "
\n" + @@ -50,7 +51,7 @@ "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -94,7 +95,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -105,7 +106,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -158,7 +159,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -170,7 +171,7 @@ "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -238,7 +239,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -251,7 +252,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -323,7 +324,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -334,7 +335,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -425,7 +426,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -436,7 +437,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -471,7 +472,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -486,7 +487,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -527,7 +528,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -545,7 +546,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -614,7 +615,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -632,7 +633,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -700,7 +701,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -714,7 +715,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -810,7 +811,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -829,7 +830,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -888,7 +889,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -906,7 +907,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -965,7 +966,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -982,7 +983,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1012,7 +1013,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1031,7 +1032,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1090,7 +1091,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1110,7 +1111,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1166,7 +1167,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1186,7 +1187,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1244,7 +1245,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1264,7 +1265,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1324,7 +1325,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -1338,7 +1339,7 @@ "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + "
\n" + @@ -1371,7 +1372,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -1391,7 +1392,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1427,7 +1428,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -1441,7 +1442,7 @@ "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + "
\n" + @@ -1482,7 +1483,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -1499,7 +1500,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestIndexComparison.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestIndexComparison.java?rev=668050&r1=668049&r2=668050&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestIndexComparison.java (original) +++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestIndexComparison.java Sun Jun 15 20:46:13 2008 @@ -22,6 +22,7 @@ import java.sql.Types; import java.util.List; +import org.apache.ddlutils.io.DatabaseIO; import org.apache.ddlutils.model.Database; /** @@ -40,7 +41,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -48,7 +49,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -69,7 +70,7 @@ assertEquals("TableA", change.getChangedTable()); - assertIndex("TESTINDEX", false, new String[] { "COL" }, + assertIndex("TESTINDEX", false, new String[] { "Col" }, change.getNewIndex()); } @@ -80,14 +81,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -128,7 +129,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -138,7 +139,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -163,7 +164,7 @@ assertEquals("TableA", change.getChangedTable()); - assertIndex("TESTINDEX", true, new String[] { "COL3", "COL1", "COL2" }, + assertIndex("TESTINDEX", true, new String[] { "Col3", "Col1", "Col2" }, change.getNewIndex()); } @@ -174,14 +175,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -244,7 +245,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -257,7 +258,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -309,7 +310,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -320,7 +321,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -382,7 +383,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -396,7 +397,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -438,7 +439,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -451,7 +452,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -493,7 +494,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -506,7 +507,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -546,7 +547,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -558,7 +559,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -598,7 +599,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -611,7 +612,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -650,7 +651,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -663,7 +664,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -703,7 +704,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -714,7 +715,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -748,7 +749,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -763,7 +764,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -809,7 +810,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -822,7 +823,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -874,7 +875,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -889,7 +890,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -935,7 +936,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -946,7 +947,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -975,7 +976,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -990,7 +991,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1021,7 +1022,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1032,7 +1033,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestPrimaryKeyComparison.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestPrimaryKeyComparison.java?rev=668050&r1=668049&r2=668050&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestPrimaryKeyComparison.java (original) +++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestPrimaryKeyComparison.java Sun Jun 15 20:46:13 2008 @@ -22,6 +22,7 @@ import java.sql.Types; import java.util.List; +import org.apache.ddlutils.io.DatabaseIO; import org.apache.ddlutils.model.Database; /** @@ -38,14 +39,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -85,14 +86,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + "
\n" + @@ -122,7 +123,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -130,7 +131,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -163,7 +164,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -172,7 +173,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -218,7 +219,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -226,7 +227,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -291,7 +292,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -300,7 +301,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -350,7 +351,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -358,7 +359,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -390,7 +391,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -398,7 +399,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -426,7 +427,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -435,7 +436,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -464,14 +465,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + "
\n" + @@ -497,7 +498,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -506,7 +507,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -534,7 +535,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -545,7 +546,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestTableComparison.java URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestTableComparison.java?rev=668050&r1=668049&r2=668050&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestTableComparison.java (original) +++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/alteration/TestTableComparison.java Sun Jun 15 20:46:13 2008 @@ -22,6 +22,7 @@ import java.sql.Types; import java.util.List; +import org.apache.ddlutils.io.DatabaseIO; import org.apache.ddlutils.model.Database; /** @@ -38,14 +39,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -77,14 +78,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -116,14 +117,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -155,14 +156,14 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + "
"; final String MODEL2 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -194,7 +195,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -202,7 +203,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -231,7 +232,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -239,7 +240,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -268,7 +269,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -276,7 +277,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -305,7 +306,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -313,7 +314,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -342,7 +343,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -350,7 +351,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -379,7 +380,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -387,7 +388,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -416,7 +417,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -424,7 +425,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -453,7 +454,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -461,7 +462,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -490,7 +491,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -498,7 +499,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -527,7 +528,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -535,7 +536,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -564,7 +565,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -572,7 +573,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -601,7 +602,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -609,7 +610,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -640,7 +641,7 @@ // expect a change for it because the size is not relevant for this type final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -648,7 +649,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -677,7 +678,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -685,7 +686,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -714,7 +715,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -722,7 +723,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -755,7 +756,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -763,7 +764,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -784,7 +785,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -792,7 +793,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -821,7 +822,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -829,7 +830,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -859,7 +860,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -867,7 +868,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -888,7 +889,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -896,7 +897,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -925,7 +926,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -933,7 +934,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -962,7 +963,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -970,7 +971,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -999,7 +1000,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1009,7 +1010,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1044,7 +1045,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1053,7 +1054,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1096,7 +1097,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1106,7 +1107,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1146,7 +1147,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + " \n" + @@ -1154,7 +1155,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -1182,7 +1183,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -1190,7 +1191,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" + @@ -1218,7 +1219,7 @@ { final String MODEL1 = "\n" + - "\n" + + "\n" + " \n" + " \n" + " \n" + @@ -1226,7 +1227,7 @@ ""; final String MODEL2 = "\n" + - "\n" + + "\n" + "
\n" + " \n" + "
\n" +