You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/01/22 08:36:26 UTC
svn commit: r1234456 [6/17] - in /incubator/isis/trunk/framework/runtimes:
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/objec...
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java Sun Jan 22 07:36:07 2012
@@ -26,10 +26,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Test;
-
import org.apache.isis.applib.value.Color;
import org.apache.isis.applib.value.Date;
import org.apache.isis.applib.value.DateTime;
@@ -45,16 +41,21 @@ import org.apache.isis.runtimes.dflt.obj
import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SimpleClass;
import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SimpleClassTwo;
import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SqlDataClass;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.Test;
/**
* @author Kevin kevin@kmz.co.za
*
- * The Singleton class {@link SqlIntegrationTestSingleton} is used to preserve values between tests. If
- * {@link SqlIntegrationTestSingleton} state is 0, then a full NOF context is recreated. If
- * {@link SqlIntegrationTestSingleton} state is 1, then the previous context is re-used.
+ * The Singleton class {@link SqlIntegrationTestSingleton} is used to
+ * preserve values between tests. If {@link SqlIntegrationTestSingleton}
+ * state is 0, then a full NOF context is recreated. If
+ * {@link SqlIntegrationTestSingleton} state is 1, then the previous
+ * context is re-used.
*
- * The state of 1 is used to separate tests into stand-alone methods, for clarity purposes - without reloading
- * the entire framework.
+ * The state of 1 is used to separate tests into stand-alone methods,
+ * for clarity purposes - without reloading the entire framework.
*
*/
public abstract class SqlIntegrationTestCommon extends SqlIntegrationTestCommonBase {
@@ -68,19 +69,23 @@ public abstract class SqlIntegrationTest
static {
/*
*
- * // For testing -ve offset timezone local regions. GMTm2_TIME_ZONE = TimeZone.getTimeZone("GMT-0200");
- * //GMTm2_TIME_ZONE = TimeZone.getTimeZone("UTC"); TimeZone.setDefault(GMTm2_TIME_ZONE);
+ * // For testing -ve offset timezone local regions. GMTm2_TIME_ZONE =
+ * TimeZone.getTimeZone("GMT-0200"); //GMTm2_TIME_ZONE =
+ * TimeZone.getTimeZone("UTC"); TimeZone.setDefault(GMTm2_TIME_ZONE);
*/
/*
- * TimeZone timeZone = TimeZone.getTimeZone("Etc/UTC"); if (timeZone == null) { timeZone =
- * TimeZone.getTimeZone("UTC"); } UTC_TIME_ZONE = timeZone;
+ * TimeZone timeZone = TimeZone.getTimeZone("Etc/UTC"); if (timeZone ==
+ * null) { timeZone = TimeZone.getTimeZone("UTC"); } UTC_TIME_ZONE =
+ * timeZone;
*/
/*
- * There is still an issue assigning a java.sql.Date variable from a calendar. final Calendar cal =
- * Calendar.getInstance(); cal.setTimeZone(UTC_TIME_ZONE); cal.clear(); cal.set(Calendar.YEAR, 2011);
- * cal.set(Calendar.MONTH, 4-1); cal.set(Calendar.DAY_OF_MONTH, 8);
+ * There is still an issue assigning a java.sql.Date variable from a
+ * calendar. final Calendar cal = Calendar.getInstance();
+ * cal.setTimeZone(UTC_TIME_ZONE); cal.clear(); cal.set(Calendar.YEAR,
+ * 2011); cal.set(Calendar.MONTH, 4-1); cal.set(Calendar.DAY_OF_MONTH,
+ * 8);
*/
// 2011-4-8 = 1270684800000
final Date date20100308 = new Date(2010, 4, 8);
@@ -88,7 +93,8 @@ public abstract class SqlIntegrationTest
}
// {{ Setup
- private static final Date applibDate = new Date(2010, 3, 5); // 2010-03-05 = 1267747200000
+ private static final Date applibDate = new Date(2010, 3, 5); // 2010-03-05 =
+ // 1267747200000
private static final DateTime dateTime = new DateTime(2010, 3, 5, 1, 23);
private static final TimeStamp timeStamp = new TimeStamp(dateTime.millisSinceEpoch());
private static final Time time = new Time(14, 56);
@@ -114,8 +120,7 @@ public abstract class SqlIntegrationTest
// Collection mapper tests
private static final List<String> stringList1 = Arrays.asList("Baking", "Bakery", "Canned", "Dairy");
- private static final List<String> stringList2 = Arrays.asList("Fridge", "Deli", "Fresh Produce", "Frozen",
- "Household", "Other..");
+ private static final List<String> stringList2 = Arrays.asList("Fridge", "Deli", "Fresh Produce", "Frozen", "Household", "Other..");
private static List<SimpleClass> simpleClassList1 = new ArrayList<SimpleClass>();
private static List<SimpleClass> simpleClassList2 = new ArrayList<SimpleClass>();
@@ -140,7 +145,7 @@ public abstract class SqlIntegrationTest
* @throws Exception
*/
public void testCreate() throws Exception {
- for (String tableName : getTableNames()) {
+ for (final String tableName : getTableNames()) {
SqlIntegrationTestSingleton.drop(tableName);
}
@@ -283,12 +288,14 @@ public abstract class SqlIntegrationTest
LOG.log(Level.INFO, "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch());
if (!applibDate.isEqualTo(sqlDataClass.getDate())) {
- fail("Applib date: Test '2010-3-5', expected " + applibDate.toString() + ", but got "
- + sqlDataClass.getDate().toString() + ". Check log for more info.");
- // LOG.log(Level.INFO, "Applib date: Test '2011-3-5', expected " + applibDate.toString() + ", but got "
- // + sqlDataClass.getDate().toString()+". Check log for more info.");
+ fail("Applib date: Test '2010-3-5', expected " + applibDate.toString() + ", but got " + sqlDataClass.getDate().toString() + ". Check log for more info.");
+ // LOG.log(Level.INFO, "Applib date: Test '2011-3-5', expected " +
+ // applibDate.toString() + ", but got "
+ // +
+ // sqlDataClass.getDate().toString()+". Check log for more info.");
} else {
- // LOG.log(Level.INFO, "SQL applib.value.date: test passed! Woohoo!");
+ // LOG.log(Level.INFO,
+ // "SQL applib.value.date: test passed! Woohoo!");
}
}
@@ -306,19 +313,23 @@ public abstract class SqlIntegrationTest
LOG.log(Level.INFO, "Test: testSqlDate() '2011-4-8' == 1302220800000");
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDate.toString() as String:" + sqlDate); // shows as 2011-04-07
+ LOG.log(Level.INFO, "sqlDate.toString() as String:" + sqlDate); // shows
+ // as
+ // 2011-04-07
LOG.log(Level.INFO, "sqlDate.getTime() as Long:" + sqlDate.getTime());
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows as
+ LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows
+ // as
// 2011-04-07
LOG.log(Level.INFO, "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime());
if (sqlDate.compareTo(sqlDataClass.getSqlDate()) != 0) {
- fail("SQL date: Test '2011-4-8', expected " + sqlDate.toString() + ", but got "
- + sqlDataClass.getSqlDate().toString() + ". Check log for more info.");
- // LOG.log(Level.INFO, "SQL date: Test '2011-4-8', expected " + sqlDate.toString() + ", and got "
- // + sqlDataClass.getSqlDate().toString() +". Check log for more info.");
+ fail("SQL date: Test '2011-4-8', expected " + sqlDate.toString() + ", but got " + sqlDataClass.getSqlDate().toString() + ". Check log for more info.");
+ // LOG.log(Level.INFO, "SQL date: Test '2011-4-8', expected " +
+ // sqlDate.toString() + ", and got "
+ // + sqlDataClass.getSqlDate().toString()
+ // +". Check log for more info.");
} else {
// LOG.log(Level.INFO, "SQL date: test passed! Woohoo!");
}
@@ -327,25 +338,31 @@ public abstract class SqlIntegrationTest
public void testDateTimezoneIssue() {
/*
- * At the moment, applib Date and java.sql.Date are restored from ValueSemanticsProviderAbstractTemporal with an
- * explicit hourly offset that comes from the timezone. I.e. in South Africa, with TZ +2h00, they have an
- * implicit time of 02h00 (2AM). This can potentially seriously screw up GMT-X dates, which, I suspect, will
- * actually be set to the dat BEFORE.
+ * At the moment, applib Date and java.sql.Date are restored from
+ * ValueSemanticsProviderAbstractTemporal with an explicit hourly offset
+ * that comes from the timezone. I.e. in South Africa, with TZ +2h00,
+ * they have an implicit time of 02h00 (2AM). This can potentially
+ * seriously screw up GMT-X dates, which, I suspect, will actually be
+ * set to the dat BEFORE.
*
- * This test is a simple test to confirm that date/time before and after checks work as expected.
+ * This test is a simple test to confirm that date/time before and after
+ * checks work as expected.
*/
/*
* *
* SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getPerson();
*
- * DateTime dateTime = sqlDataClass.getDateTime(); // new DateTime(2010, 3, 5, 1, 23); Date date =
- * sqlDataClass.getDate(); // new Date(2010, 3, 5);
+ * DateTime dateTime = sqlDataClass.getDateTime(); // new DateTime(2010,
+ * 3, 5, 1, 23); Date date = sqlDataClass.getDate(); // new Date(2010,
+ * 3, 5);
*
* //java.sql.Date sqlDate = sqlDataClass.getSqlDate(); // "2010-03-05"
- * //assertTrue("dateTime's value ("+dateTime.dateValue()+ // ") should be after java.sql.date's ("+ sqlDate
- * +")", dateTime.dateValue().after(sqlDate));
+ * //assertTrue("dateTime's value ("+dateTime.dateValue()+ //
+ * ") should be after java.sql.date's ("+ sqlDate +")",
+ * dateTime.dateValue().after(sqlDate));
*
- * assertTrue("dateTime's value ("+dateTime.dateValue()+ ") should be after date's ("+ date +")",
+ * assertTrue("dateTime's value ("+dateTime.dateValue()+
+ * ") should be after date's ("+ date +")",
* dateTime.dateValue().after(date.dateValue()));
*/
}
@@ -357,7 +374,8 @@ public abstract class SqlIntegrationTest
public void testMoney() {
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
assertEquals(money, sqlDataClass.getMoney());
- // assertTrue("Money " + money.toString() + " is not equal to " + sqlDataClass.getMoney().toString(),
+ // assertTrue("Money " + money.toString() + " is not equal to " +
+ // sqlDataClass.getMoney().toString(),
// money.equals(sqlDataClass.getMoney()));
}
@@ -371,8 +389,7 @@ public abstract class SqlIntegrationTest
LOG.log(Level.INFO, "sqlDataClass.getDateTime() as String:" + sqlDataClass.getDateTime());
LOG.log(Level.INFO, "dateTime.toString() as String:" + dateTime);
- LOG.log(Level.INFO, "sqlDataClass.getDateTime().getTime() as Long:"
- + sqlDataClass.getDateTime().millisSinceEpoch());
+ LOG.log(Level.INFO, "sqlDataClass.getDateTime().getTime() as Long:" + sqlDataClass.getDateTime().millisSinceEpoch());
LOG.log(Level.INFO, "dateTime.getTime() as Long:" + dateTime.millisSinceEpoch());
if (!dateTime.equals(sqlDataClass.getDateTime())) {
@@ -385,8 +402,7 @@ public abstract class SqlIntegrationTest
*/
public void testTimeStamp() {
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
- assertTrue("TimeStamp " + timeStamp.toString() + " is not equal to " + sqlDataClass.getTimeStamp().toString(),
- timeStamp.isEqualTo(sqlDataClass.getTimeStamp()));
+ assertTrue("TimeStamp " + timeStamp.toString() + " is not equal to " + sqlDataClass.getTimeStamp().toString(), timeStamp.isEqualTo(sqlDataClass.getTimeStamp()));
}
/**
@@ -397,8 +413,7 @@ public abstract class SqlIntegrationTest
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
assertNotNull("sqlDataClass is null", sqlDataClass);
assertNotNull("getTime() is null", sqlDataClass.getTime());
- assertTrue("Time 14h56: expected " + time.toString() + ", but got " + sqlDataClass.getTime().toString(),
- time.isEqualTo(sqlDataClass.getTime()));
+ assertTrue("Time 14h56: expected " + time.toString() + ", but got " + sqlDataClass.getTime().toString(), time.isEqualTo(sqlDataClass.getTime()));
}
/**/
@@ -409,7 +424,8 @@ public abstract class SqlIntegrationTest
public void testColor() {
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
assertEquals(color, sqlDataClass.getColor());
- // assertTrue("Color Black, expected " + color.toString() + " but got " + sqlDataClass.getColor().toString(),
+ // assertTrue("Color Black, expected " + color.toString() + " but got "
+ // + sqlDataClass.getColor().toString(),
// color.isEqualTo(sqlDataClass.getColor()));
}
@@ -418,15 +434,20 @@ public abstract class SqlIntegrationTest
*/
// TODO: Images are not equal...
/*
- * public void testImage(){ SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getPerson(); Image image2 =
+ * public void testImage(){ SqlDataClass sqlDataClass =
+ * SqlIntegrationTestSingleton.getPerson(); Image image2 =
* sqlDataClass.getImage(); assertEqual(image, image2); }
*
- * private void assertEqual(Image image2, Image image3) { assertEquals(image2.getHeight(), image3.getHeight());
- * assertEquals(image2.getWidth(), image3.getWidth()); boolean same = true; int i=0,j=0; int p1=0, p2=0; String
- * error = ""; int [][] i1 = image2.getImage(), i2 = image3.getImage(); for(i = 0; same &&
- * i<image2.getHeight();i++){ int [] r1 = i1[i], r2 = i2[i]; for (j = 0; same && j < image2.getWidth(); j++){ if
- * (r1[j] != r2[j]){ same = false; p1 = r1[j]; p2 = r2[j]; error = "Images differ at i = "+i+", j = "+j+", "+p1+
- * " is not "+p2+"!"; break; } } } assertTrue(error, same); }
+ * private void assertEqual(Image image2, Image image3) {
+ * assertEquals(image2.getHeight(), image3.getHeight());
+ * assertEquals(image2.getWidth(), image3.getWidth()); boolean same = true;
+ * int i=0,j=0; int p1=0, p2=0; String error = ""; int [][] i1 =
+ * image2.getImage(), i2 = image3.getImage(); for(i = 0; same &&
+ * i<image2.getHeight();i++){ int [] r1 = i1[i], r2 = i2[i]; for (j = 0;
+ * same && j < image2.getWidth(); j++){ if (r1[j] != r2[j]){ same = false;
+ * p1 = r1[j]; p2 = r2[j]; error =
+ * "Images differ at i = "+i+", j = "+j+", "+p1+ " is not "+p2+"!"; break; }
+ * } } assertTrue(error, same); }
*/
/**
@@ -452,7 +473,11 @@ public abstract class SqlIntegrationTest
assertEquals(shortMaxValue, numericTestMaxClass.getShortValue());
assertEquals(intMaxValue, numericTestMaxClass.getIntValue());
assertEquals(longMaxValue, numericTestMaxClass.getLongValue());
- assertEquals(doubleMaxValue, numericTestMaxClass.getDoubleValue()); // fails in MySQL = infinity
+ assertEquals(doubleMaxValue, numericTestMaxClass.getDoubleValue()); // fails
+ // in
+ // MySQL
+ // =
+ // infinity
assertEquals(floatMaxValue, numericTestMaxClass.getFloatValue());
}
@@ -463,7 +488,11 @@ public abstract class SqlIntegrationTest
assertEquals(shortMinValue, numericTestMinClass.getShortValue());
assertEquals(intMinValue, numericTestMinClass.getIntValue());
assertEquals(longMinValue, numericTestMinClass.getLongValue());
- assertEquals(doubleMinValue, numericTestMinClass.getDoubleValue()); // fails in MySQL = infinity
+ assertEquals(doubleMinValue, numericTestMinClass.getDoubleValue()); // fails
+ // in
+ // MySQL
+ // =
+ // infinity
assertEquals(floatMinValue, numericTestMinClass.getFloatValue());
}
@@ -471,9 +500,11 @@ public abstract class SqlIntegrationTest
* Test {@link StringCollection} type.
*/
/*
- * public void testStringCollection(){ SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getPerson();
- * List<String> collection = sqlDataClass.getStringCollection(); int i = 0; for (String string : collection) {
- * assertEquals(SqlIntegrationTestCommon.stringList.get(i++), string); } }
+ * public void testStringCollection(){ SqlDataClass sqlDataClass =
+ * SqlIntegrationTestSingleton.getPerson(); List<String> collection =
+ * sqlDataClass.getStringCollection(); int i = 0; for (String string :
+ * collection) { assertEquals(SqlIntegrationTestCommon.stringList.get(i++),
+ * string); } }
*/
public void testSingleReferenceLazy() {
@@ -492,8 +523,7 @@ public abstract class SqlIntegrationTest
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
final List<SimpleClass> collection = sqlDataClass.getSimpleClasses1();
- assertEquals("collection size is not equal!", SqlIntegrationTestCommon.simpleClassList1.size(),
- collection.size());
+ assertEquals("collection size is not equal!", SqlIntegrationTestCommon.simpleClassList1.size(), collection.size());
int i = 0;
for (final SimpleClass simpleClass : SqlIntegrationTestCommon.simpleClassList1) {
@@ -509,8 +539,7 @@ public abstract class SqlIntegrationTest
final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass();
final List<SimpleClass> collection = sqlDataClass.getSimpleClasses2();
- assertEquals("collection size is not equal!", SqlIntegrationTestCommon.simpleClassList2.size(),
- collection.size());
+ assertEquals("collection size is not equal!", SqlIntegrationTestCommon.simpleClassList2.size(), collection.size());
int i = 0;
for (final SimpleClass simpleClass : SqlIntegrationTestCommon.simpleClassList2) {
@@ -592,10 +621,10 @@ public abstract class SqlIntegrationTest
final SqlDataClassFactory factory = SqlIntegrationTestSingleton.getSqlDataClassFactory();
final List<SqlDataClass> sqlDataClasses = factory.allDataClasses();
- SqlDataClass sqlDataClass = sqlDataClasses.get(0);
+ final SqlDataClass sqlDataClass = sqlDataClasses.get(0);
final List<SimpleClass> collection = sqlDataClass.getSimpleClasses1();
- SimpleClass simpleClass1 = collection.get(0);
+ final SimpleClass simpleClass1 = collection.get(0);
// simpleClass1.setString(stringList1.get(3));
collection.remove(simpleClass1);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommonBase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommonBase.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommonBase.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommonBase.java Sun Jan 22 07:36:07 2012
@@ -26,11 +26,10 @@ import java.util.Properties;
import junit.framework.TestCase;
+import org.apache.isis.runtimes.dflt.objectstores.sql.singleton.SqlIntegrationTestSingleton;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.isis.runtimes.dflt.objectstores.sql.singleton.SqlIntegrationTestSingleton;
-
public abstract class SqlIntegrationTestCommonBase extends TestCase {
protected SqlIntegrationTestSingleton getSingletonInstance() {
@@ -54,16 +53,16 @@ public abstract class SqlIntegrationTest
public abstract String getPropertiesFilename();
/**
- * This method can be used to do any DB specific actions the first time the test framework is setup. e.g. In the XML
- * test, it must delete all XML files in the data store directory.
+ * This method can be used to do any DB specific actions the first time the
+ * test framework is setup. e.g. In the XML test, it must delete all XML
+ * files in the data store directory.
*/
public void initialiseTests() {
}
// Set-up the test environment
@Override
- public void setUp() throws FileNotFoundException, IOException, ClassNotFoundException, InstantiationException,
- IllegalAccessException, SQLException {
+ public void setUp() throws FileNotFoundException, IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException {
Logger.getRootLogger().setLevel(Level.INFO);
// Initialise the framework
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/singleton/SqlIntegrationTestSingleton.java Sun Jan 22 07:36:07 2012
@@ -73,17 +73,14 @@ public class SqlIntegrationTestSingleton
private SqlDataClassFactory sqlDataClassFactory = null;
private TestProxySystemIII system = null;
- public void initNOF(final String propertiesDirectory, final String propertiesFileName)
- throws FileNotFoundException, IOException, SQLException, ClassNotFoundException, InstantiationException,
- IllegalAccessException {
+ public void initNOF(final String propertiesDirectory, final String propertiesFileName) throws FileNotFoundException, IOException, SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
final Properties properties = new Properties();
properties.load(new FileInputStream(propertiesDirectory + "/" + propertiesFileName));
this.initNOF(properties);
}
- public void initNOF(final Properties properties) throws SQLException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
+ public void initNOF(final Properties properties) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
final IsisConfigurationDefault configuration = new IsisConfigurationDefault();
configuration.add(properties);
persistorName = configuration.getString("isis.persistor");
@@ -107,8 +104,7 @@ public class SqlIntegrationTestSingleton
private PolyTestClass polyTestClass;
@SuppressWarnings("unchecked")
- private void resetPersistorState(final IsisConfigurationDefault IsisConfigurationDefault) throws SQLException,
- ClassNotFoundException, InstantiationException, IllegalAccessException {
+ private void resetPersistorState(final IsisConfigurationDefault IsisConfigurationDefault) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException {
final String jdbcClassName = IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.driver");
if (jdbcClassName == null) {
c = null;
@@ -120,11 +116,7 @@ public class SqlIntegrationTestSingleton
DriverManager.registerDriver(driver);
// jdbc - connect to DB and drop tables.
- c =
- DriverManager.getConnection(
- IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.connection"),
- IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.user"),
- IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.password"));
+ c = DriverManager.getConnection(IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.connection"), IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.user"), IsisConfigurationDefault.getString(SqlObjectStore.BASE_NAME + ".jdbc.password"));
s = c.createStatement();
// dropTable(SqlObjectStore.getTableName());
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/SqlDataClassFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/SqlDataClassFactory.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/SqlDataClassFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/SqlDataClassFactory.java Sun Jan 22 07:36:07 2012
@@ -83,7 +83,7 @@ public class SqlDataClassFactory extends
return allInstances(SimpleClass.class);
}
- public List<SimpleClass> allSimpleClassesThatMatch(SimpleClass simpleClassMatch) {
+ public List<SimpleClass> allSimpleClassesThatMatch(final SimpleClass simpleClassMatch) {
return allMatches(SimpleClass.class, simpleClassMatch);
}
@@ -107,7 +107,7 @@ public class SqlDataClassFactory extends
return object;
}
- public List<NumericTestClass> allNumericTestClassesThatMatch(NumericTestClass match) {
+ public List<NumericTestClass> allNumericTestClassesThatMatch(final NumericTestClass match) {
return allMatches(NumericTestClass.class, match);
}
@@ -157,11 +157,11 @@ public class SqlDataClassFactory extends
return allInstances(PolyInterface.class);
}
- public List<PolyInterface> queryPolyInterfaces(PolyInterface query) {
+ public List<PolyInterface> queryPolyInterfaces(final PolyInterface query) {
return allMatches(PolyInterface.class, query);
}
- public List<EmptyInterface> allEmptyInterfacesThatMatch(EmptyInterface match) {
+ public List<EmptyInterface> allEmptyInterfacesThatMatch(final EmptyInterface match) {
return allMatches(EmptyInterface.class, match);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/TestProxySystemIII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/TestProxySystemIII.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/TestProxySystemIII.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/TestProxySystemIII.java Sun Jan 22 07:36:07 2012
@@ -22,11 +22,6 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.ArrayList;
import java.util.List;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
-
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -48,6 +43,10 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
/*
* TODO allow to be created with specific requirements for components being set up rather than using mocks.
@@ -113,13 +112,9 @@ public class TestProxySystemIII {
}
persistenceMechanismInstaller.setConfiguration(configuration);
- final PersistenceSessionFactory persistenceSessionFactory =
- persistenceMechanismInstaller.createPersistenceSessionFactory(DeploymentType.PROTOTYPE);
+ final PersistenceSessionFactory persistenceSessionFactory = persistenceMechanismInstaller.createPersistenceSessionFactory(DeploymentType.PROTOTYPE);
- sessionFactory =
- new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, configuration, mockTemplateImageLoader,
- mockSpecificationLoader, mockAuthenticationManager, mockAuthorizationManager, mockUserProfileLoader,
- persistenceSessionFactory, servicesList);
+ sessionFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, configuration, mockTemplateImageLoader, mockSpecificationLoader, mockAuthenticationManager, mockAuthorizationManager, mockUserProfileLoader, persistenceSessionFactory, servicesList);
context = IsisContextStatic.createRelaxedInstance(sessionFactory);
IsisContext.setConfiguration(sessionFactory.getConfiguration());
sessionFactory.init();
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/SqlDataClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/SqlDataClass.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/SqlDataClass.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/SqlDataClass.java Sun Jan 22 07:36:07 2012
@@ -36,10 +36,12 @@ import org.apache.isis.applib.value.Time
import org.apache.isis.runtimes.dflt.objectstores.sql.common.SqlIntegrationTestCommon;
/**
- * The SqlDataClass is a test class used in the sql-persistor integration tests. It's properties are stored and
- * retrieved using the persistor, to confirm accurate persistence behaviour.
+ * The SqlDataClass is a test class used in the sql-persistor integration tests.
+ * It's properties are stored and retrieved using the persistor, to confirm
+ * accurate persistence behaviour.
*
- * Each property here requires an equivalent test in {@link SqlIntegrationTestCommon}
+ * Each property here requires an equivalent test in
+ * {@link SqlIntegrationTestCommon}
*
* @author Kevin Meyer
*
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolySelfRefClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolySelfRefClass.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolySelfRefClass.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolySelfRefClass.java Sun Jan 22 07:36:07 2012
@@ -25,9 +25,11 @@ import java.util.List;
import org.apache.isis.applib.AbstractDomainObject;
/**
- * This test class is used to test that a class can contain a collection of itself.
+ * This test class is used to test that a class can contain a collection of
+ * itself.
*
- * Caveat: Every class instance can only be contained by 1 parent collection, and will only be contained once.
+ * Caveat: Every class instance can only be contained by 1 parent collection,
+ * and will only be contained once.
*
* @author Kevin
*
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolyTestClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolyTestClass.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolyTestClass.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/testsystem/dataclasses/polymorphism/PolyTestClass.java Sun Jan 22 07:36:07 2012
@@ -28,8 +28,10 @@ import java.util.List;
import org.apache.isis.applib.AbstractDomainObject;
/**
- * This class is the collection point of all the polymorphism and related tests. There is nothing really special about
- * it, it is just a placeholder for the various tests related to polymorphism or recursion (JIRA ISIS-117 and ISIS-118).
+ * This class is the collection point of all the polymorphism and related tests.
+ * There is nothing really special about it, it is just a placeholder for the
+ * various tests related to polymorphism or recursion (JIRA ISIS-117 and
+ * ISIS-118).
*
* @author Kevin
*
@@ -91,7 +93,8 @@ public class PolyTestClass extends Abstr
// }}
- // {{ PolySelfRefClass: Can we store / restore classes that contain self-referencing collections?
+ // {{ PolySelfRefClass: Can we store / restore classes that contain
+ // self-referencing collections?
private PolySelfRefClass polySelfRefClass;
public PolySelfRefClass getPolySelfRefClass() {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/HsqlTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/HsqlTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/HsqlTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/HsqlTest.java Sun Jan 22 07:36:07 2012
@@ -31,7 +31,8 @@ public class HsqlTest extends SqlIntegra
@Override
public Properties getProperties() {
Properties properties = super.getProperties();
- if (properties == null) { // Only used if properties file does not exist.
+ if (properties == null) { // Only used if properties file does not
+ // exist.
properties = new Properties();
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "org.hsqldb.jdbcDriver");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:hsqldb:file:hsql-db/tests");
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PolymorphismTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PolymorphismTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PolymorphismTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-common/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PolymorphismTest.java Sun Jan 22 07:36:07 2012
@@ -84,7 +84,8 @@ public class PolymorphismTest extends Sq
@Override
public Properties getProperties() {
Properties properties = super.getProperties();
- if (properties == null) { // Only used if properties file does not exist.
+ if (properties == null) { // Only used if properties file does not
+ // exist.
properties = new Properties();
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "org.hsqldb.jdbcDriver");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:hsqldb:file:hsql-db/polytests");
@@ -131,19 +132,19 @@ public class PolymorphismTest extends Sq
polyTestClass.setString("polyTestClassString");
// {{ Setup self-referencing collection
- PolySelfRefClass polySelfRefClassParent = factory.newPolySelfRefClass();
+ final PolySelfRefClass polySelfRefClassParent = factory.newPolySelfRefClass();
polySelfRefClassParent.setString("Parent");
- PolySelfRefClass polySelfRefClassChild1 = factory.newPolySelfRefClass();
+ final PolySelfRefClass polySelfRefClassChild1 = factory.newPolySelfRefClass();
polySelfRefClassChild1.setString(CHILD_1);
polySelfRefClassParent.addToPolySelfRefClasses(polySelfRefClassChild1);
- PolySelfRefClass polySelfRefClassChild2 = factory.newPolySelfRefClass();
+ final PolySelfRefClass polySelfRefClassChild2 = factory.newPolySelfRefClass();
polySelfRefClassChild2.setString("Child 2");
polySelfRefClassParent.addToPolySelfRefClasses(polySelfRefClassChild2);
factory.save(polySelfRefClassChild2);
- PolySelfRefClass polySelfRefClassChild3 = factory.newPolySelfRefClass();
+ final PolySelfRefClass polySelfRefClassChild3 = factory.newPolySelfRefClass();
polySelfRefClassChild3.setString("Child 1 of Child 1");
polySelfRefClassChild1.addToPolySelfRefClasses(polySelfRefClassChild3);
@@ -165,15 +166,15 @@ public class PolymorphismTest extends Sq
polyTestClass.getPolyInterfaces().add(polyIntImpA);
// setup the polyTestClass
- PolySubClassOne polySubClassOne = factory.newPolySubClassOne();
+ final PolySubClassOne polySubClassOne = factory.newPolySubClassOne();
polySubClassOne.setStringBase("PolySubClassOne 1");
polySubClassOne.setStringClassOne("Class 1");
- PolySubClassTwo polySubClassTwo = factory.newPolySubClassTwo();
+ final PolySubClassTwo polySubClassTwo = factory.newPolySubClassTwo();
polySubClassTwo.setStringBase("PolySubClassTwo 1");
polySubClassTwo.setStringClassTwo("Class 2");
- PolySubClassThree polySubClassThree = factory.newPolySubClassThree();
+ final PolySubClassThree polySubClassThree = factory.newPolySubClassThree();
polySubClassThree.setStringBase("PolySubClassThree 1");
polySubClassThree.setStringClassThree("Another String");
polySubClassThree.setStringClassTwo("Class 3");
@@ -211,7 +212,7 @@ public class PolymorphismTest extends Sq
public void testPolymorphicLoad() {
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- List<PolyBaseClass> polyBaseClasses = polyTestClass.getPolyBaseClasses();
+ final List<PolyBaseClass> polyBaseClasses = polyTestClass.getPolyBaseClasses();
assertEquals(3, polyBaseClasses.size());
PolyBaseClass polyClassBase = polyBaseClasses.get(0);
@@ -236,7 +237,7 @@ public class PolymorphismTest extends Sq
final SqlDataClassFactory factory = SqlIntegrationTestSingleton.getSqlDataClassFactory();
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- PolyInterface loaded = polyTestClass.getPolyInterfaceType();
+ final PolyInterface loaded = polyTestClass.getPolyInterfaceType();
factory.resolve(loaded);
assertEquals(polyIntImpA.getString(), loaded.getString());
}
@@ -244,12 +245,12 @@ public class PolymorphismTest extends Sq
public void testLoadSelfReferencingCollection() {
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- PolySelfRefClass polySelfRefParent = polyTestClass.getPolySelfRefClass();
- List<PolySelfRefClass> list = polySelfRefParent.getPolySelfRefClasses();
+ final PolySelfRefClass polySelfRefParent = polyTestClass.getPolySelfRefClass();
+ final List<PolySelfRefClass> list = polySelfRefParent.getPolySelfRefClasses();
assertEquals(2, list.size());
PolySelfRefClass polySelfRefChild1 = null;
- for (PolySelfRefClass polySelfRefClass : list) {
+ for (final PolySelfRefClass polySelfRefClass : list) {
if (polySelfRefClass.getString().equals(CHILD_1)) {
polySelfRefChild1 = polySelfRefClass;
}
@@ -267,16 +268,16 @@ public class PolymorphismTest extends Sq
public void testInterfaceLoadProperty() {
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- PolyInterface loaded = polyTestClass.getPolyInterfaceType();
+ final PolyInterface loaded = polyTestClass.getPolyInterfaceType();
assertEquals(polyIntImpA.getString(), loaded.getString());
}
public void testInterfaceLoadCollection() {
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- List<PolyInterface> list = polyTestClass.getPolyInterfaces();
+ final List<PolyInterface> list = polyTestClass.getPolyInterfaces();
assertEquals(1, list.size());
- PolyInterface loaded = list.get(0);
+ final PolyInterface loaded = list.get(0);
assertEquals(polyIntImpA.getString(), loaded.getString());
}
@@ -300,13 +301,13 @@ public class PolymorphismTest extends Sq
testLoad(); // reload data
final PolyTestClass polyTestClass = SqlIntegrationTestSingleton.getStaticPolyTestClass();
- PolyInterface loaded = polyTestClass.getPolyInterfaceType();
+ final PolyInterface loaded = polyTestClass.getPolyInterfaceType();
assertEquals(polyIntImpB.getString(), loaded.getString());
}
public void testAllInterfacesInstancesLoaded() {
final SqlDataClassFactory factory = SqlIntegrationTestSingleton.getSqlDataClassFactory();
- List<PolyInterface> list = factory.allPolyInterfaces();
+ final List<PolyInterface> list = factory.allPolyInterfaces();
assertEquals(2, list.size());
}
@@ -314,19 +315,19 @@ public class PolymorphismTest extends Sq
final SqlDataClassFactory factory = SqlIntegrationTestSingleton.getSqlDataClassFactory();
// PolyInterface query = polyIntImpA;
- PolyInterfaceEx query = new PolyInterfaceEx();
+ final PolyInterfaceEx query = new PolyInterfaceEx();
query.setString(IMPL_A_STRING);
- List<PolyInterface> list = factory.queryPolyInterfaces(query);
+ final List<PolyInterface> list = factory.queryPolyInterfaces(query);
assertEquals(1, list.size());
}
public void testInterfacesLoadedByQuerySpecial() {
final SqlDataClassFactory factory = SqlIntegrationTestSingleton.getSqlDataClassFactory();
- PolyInterfaceEx query = new PolyInterfaceEx();
+ final PolyInterfaceEx query = new PolyInterfaceEx();
- List<PolyInterface> list = factory.queryPolyInterfaces(query);
+ final List<PolyInterface> list = factory.queryPolyInterfaces(query);
assertEquals(2, list.size());
}
@@ -336,8 +337,8 @@ public class PolymorphismTest extends Sq
final List<EmptyInterface> matches = factory.allEmptyInterfacesThatMatch(match);
assertEquals(1, matches.size());
- EmptyInterface emptyInterface = matches.get(0);
- PolyInterfaceImplB imp = (PolyInterfaceImplB) emptyInterface;
+ final EmptyInterface emptyInterface = matches.get(0);
+ final PolyInterfaceImplB imp = (PolyInterfaceImplB) emptyInterface;
assertEquals(IMPL_B_STRING, imp.getString());
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java Sun Jan 22 07:36:07 2012
@@ -38,8 +38,7 @@ public class MySqlTest extends SqlIntegr
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "com.mysql.jdbc.Driver");
// properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection",
// "jdbc:mysql://abacus/noftest&useTimezone=true&serverTimezone=GMT");
- properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection",
- "jdbc:mysql://abacus/noftest&useLegacyDatetimeCode=false");
+ properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:mysql://abacus/noftest&useLegacyDatetimeCode=false");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.user", "nof");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.jdbc.password", "");
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java Sun Jan 22 07:36:07 2012
@@ -33,14 +33,17 @@ public class PostgreSqlTest extends SqlI
Properties properties = super.getProperties();
if (properties == null) {
properties = new Properties();
- // Only used if src/test/config/postgresql.properties does not exist.
+ // Only used if src/test/config/postgresql.properties does not
+ // exist.
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.driver", "org.postgresql.Driver");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.connection", "jdbc:postgresql://abacus/noftest");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.user", "nof");
properties.put(SqlObjectStore.BASE_NAME + ".jdbc.password", "");
- // properties.put(SqlObjectStore.BASE_NAME + ".datatypes.timestamp", "TIMESTAMP");
- // properties.put(SqlObjectStore.BASE_NAME + ".datatypes.datetime", "TIMESTAMP");
+ // properties.put(SqlObjectStore.BASE_NAME + ".datatypes.timestamp",
+ // "TIMESTAMP");
+ // properties.put(SqlObjectStore.BASE_NAME + ".datatypes.datetime",
+ // "TIMESTAMP");
}
return properties;
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java Sun Jan 22 07:36:07 2012
@@ -174,8 +174,7 @@ public class XmlObjectStore implements O
}
}
- private void initObjectSetupReference(final ObjectAdapter object, final ObjectData data,
- final ObjectAssociation field) {
+ private void initObjectSetupReference(final ObjectAdapter object, final ObjectData data, final ObjectAssociation field) {
final SerialOid referenceOid = (SerialOid) data.get(field.getId());
LOG.debug("setting up field " + field + " with " + referenceOid);
if (referenceOid == null) {
@@ -185,42 +184,44 @@ public class XmlObjectStore implements O
final Data fieldData = dataManager.loadData(referenceOid);
if (fieldData == null) {
- final ObjectAdapter adapter =
- getPersistenceSession().recreateAdapter(referenceOid, field.getSpecification());
+ final ObjectAdapter adapter = getPersistenceSession().recreateAdapter(referenceOid, field.getSpecification());
if (!adapter.getResolveState().isDestroyed()) {
adapter.changeState(ResolveState.DESTROYED);
}
((OneToOneAssociation) field).initAssociation(object, adapter);
- LOG.warn("No data found for " + referenceOid + " so field '" + field.getName() + "' not set in object '"
- + object.titleString() + "'");
+ LOG.warn("No data found for " + referenceOid + " so field '" + field.getName() + "' not set in object '" + object.titleString() + "'");
} else {
final ObjectAdapter reference = getPersistenceSession().recreateAdapter(referenceOid, specFor(fieldData));
((OneToOneAssociation) field).initAssociation(object, reference);
}
/*
- * if (loadedObjects().isLoaded(referenceOid)) { ObjectAdapter loadedObject =
- * loadedObjects().getLoadedObject(referenceOid); LOG.debug("using loaded object " + loadedObject);
- * object.initAssociation((OneToOneAssociation) field, loadedObject); } else { ObjectAdapter fieldObject; Data
- * fieldData = (Data) dataManager.loadData((SerialOid) referenceOid);
+ * if (loadedObjects().isLoaded(referenceOid)) { ObjectAdapter
+ * loadedObject = loadedObjects().getLoadedObject(referenceOid);
+ * LOG.debug("using loaded object " + loadedObject);
+ * object.initAssociation((OneToOneAssociation) field, loadedObject); }
+ * else { ObjectAdapter fieldObject; Data fieldData = (Data)
+ * dataManager.loadData((SerialOid) referenceOid);
*
- * if (fieldData != null) { fieldObject = (ObjectAdapter) specFor(fieldData).acquireInstance(); } else {
- * fieldObject = (ObjectAdapter) field.getSpecification().acquireInstance(); }
+ * if (fieldData != null) { fieldObject = (ObjectAdapter)
+ * specFor(fieldData).acquireInstance(); } else { fieldObject =
+ * (ObjectAdapter) field.getSpecification().acquireInstance(); }
*
* fieldObject.setOid(referenceOid);
*
- * if (fieldObject instanceof CollectionAdapter) { fieldObject.setResolved(); }
+ * if (fieldObject instanceof CollectionAdapter) {
+ * fieldObject.setResolved(); }
*
- * loadedObjects().loaded(fieldObject); object.initAssociation((OneToOneAssociation) field, fieldObject); }
+ * loadedObjects().loaded(fieldObject);
+ * object.initAssociation((OneToOneAssociation) field, fieldObject); }
*/
}
- private void initObjectSetupCollection(final ObjectAdapter object, final ObjectData data,
- final ObjectAssociation field) {
+ private void initObjectSetupCollection(final ObjectAdapter object, final ObjectData data, final ObjectAssociation field) {
/*
- * The internal collection is already a part of the object, and therefore cannot be recreated, but its oid must
- * be set
+ * The internal collection is already a part of the object, and
+ * therefore cannot be recreated, but its oid must be set
*/
final ReferenceVector refs = (ReferenceVector) data.get(field.getId());
final ObjectAdapter collection = field.get(object);
@@ -330,8 +331,8 @@ public class XmlObjectStore implements O
}
/*
- * The ObjectData holds all references for internal collections, so the object should haves its internal collection
- * populated by this method.
+ * The ObjectData holds all references for internal collections, so the
+ * object should haves its internal collection populated by this method.
*/
private ObjectAdapter recreateObject(final ObjectData data) {
final SerialOid oid = data.getOid();
@@ -349,9 +350,7 @@ public class XmlObjectStore implements O
public ObjectAdapter[] getInstances(final PersistenceQuery persistenceQuery) {
if (!(persistenceQuery instanceof PersistenceQueryBuiltIn)) {
- throw new IllegalArgumentException(MessageFormat.format(
- "Provided PersistenceQuery not supported; was {0}; " + "the XML object store only supports {1}",
- persistenceQuery.getClass().getName(), PersistenceQueryBuiltIn.class.getName()));
+ throw new IllegalArgumentException(MessageFormat.format("Provided PersistenceQuery not supported; was {0}; " + "the XML object store only supports {1}", persistenceQuery.getClass().getName(), PersistenceQueryBuiltIn.class.getName()));
}
final PersistenceQueryBuiltIn builtIn = (PersistenceQueryBuiltIn) persistenceQuery;
@@ -425,7 +424,8 @@ public class XmlObjectStore implements O
// /////////////////////////////////////////////////////////
/**
- * Set the clock used to generate sequence numbers and last changed dates for version objects.
+ * Set the clock used to generate sequence numbers and last changed dates
+ * for version objects.
*/
public void setClock(final Clock clock) {
FileVersion.setClock(clock);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstaller.java Sun Jan 22 07:36:07 2012
@@ -44,8 +44,7 @@ public class XmlPersistenceMechanismInst
}
@Override
- protected ObjectStore createObjectStore(final IsisConfiguration configuration,
- final ObjectAdapterFactory objectFactory, final AdapterManager adapterManager) {
+ protected ObjectStore createObjectStore(final IsisConfiguration configuration, final ObjectAdapterFactory objectFactory, final AdapterManager adapterManager) {
if (objectStore == null) {
objectStore = new XmlObjectStore(configuration);
objectStore.setClock(new DefaultClock());
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceSessionFactory.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceSessionFactory.java Sun Jan 22 07:36:07 2012
@@ -25,8 +25,7 @@ import org.apache.isis.runtimes.dflt.run
public class XmlPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
- public XmlPersistenceSessionFactory(final DeploymentType deploymentType,
- final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
+ public XmlPersistenceSessionFactory(final DeploymentType deploymentType, final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
super(deploymentType, persistenceSessionFactoryDelegate);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/adapter/XmlAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/adapter/XmlAdapterManager.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/adapter/XmlAdapterManager.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/adapter/XmlAdapterManager.java Sun Jan 22 07:36:07 2012
@@ -27,8 +27,7 @@ import org.apache.isis.runtimes.dflt.run
public class XmlAdapterManager extends AdapterManagerDefault {
@Override
- protected ObjectAdapter createAggregatedAdapter(final Object pojo, final ObjectAdapter ownerAdapter,
- final IdentifiedHolder identifiedHolder) {
+ protected ObjectAdapter createAggregatedAdapter(final Object pojo, final ObjectAdapter ownerAdapter, final IdentifiedHolder identifiedHolder) {
if (identifiedHolder instanceof OneToOneAssociation) {
// do not yet support AggregatedOids for aggregated associations
return adapterFor(pojo);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/commands/AbstractXmlPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/commands/AbstractXmlPersistenceCommand.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/commands/AbstractXmlPersistenceCommand.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/commands/AbstractXmlPersistenceCommand.java Sun Jan 22 07:36:07 2012
@@ -52,8 +52,7 @@ abstract class AbstractXmlPersistenceCom
}
final ObjectSpecification adapterSpec = adapter.getSpecification();
- final ObjectData data =
- new ObjectData(adapterSpec, (SerialOid) adapter.getOid(), (FileVersion) adapter.getVersion());
+ final ObjectData data = new ObjectData(adapterSpec, (SerialOid) adapter.getOid(), (FileVersion) adapter.getVersion());
final List<ObjectAssociation> associations = adapterSpec.getAssociations();
for (final ObjectAssociation association : associations) {
@@ -77,18 +76,15 @@ abstract class AbstractXmlPersistenceCom
return data;
}
- private void saveReference(final ObjectData data, final String associationId, final ObjectAdapter associatedObject,
- final boolean ensurePersistent) {
+ private void saveReference(final ObjectData data, final String associationId, final ObjectAdapter associatedObject, final boolean ensurePersistent) {
data.addAssociation(associatedObject, associationId, ensurePersistent);
}
- private void saveCollection(final String associationId, final ObjectData data,
- final ObjectAdapter associatedObject, final boolean ensurePersistent) {
+ private void saveCollection(final String associationId, final ObjectData data, final ObjectAdapter associatedObject, final boolean ensurePersistent) {
data.addInternalCollection(associatedObject, associationId, ensurePersistent);
}
- private void saveEncoded(final ObjectData data, final String associationId, final ObjectAdapter associatedObject,
- final boolean isEmpty) {
+ private void saveEncoded(final ObjectData data, final String associationId, final ObjectAdapter associatedObject, final boolean isEmpty) {
if (associatedObject == null || isEmpty) {
data.saveValue(associationId, isEmpty, null);
} else {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java Sun Jan 22 07:36:07 2012
@@ -120,11 +120,12 @@ public class ObjectData extends Data {
set(fieldId, fieldContent == null ? null : fieldContent.getOid());
}
- public void addInternalCollection(final ObjectAdapter collection, final String fieldId,
- final boolean ensurePersistent) {
+ public void addInternalCollection(final ObjectAdapter collection, final String fieldId, final boolean ensurePersistent) {
/*
- * if (ensurePersistent && collection != null && collection.getOid() == null) { throw new
- * IllegalStateException("Cannot save a collection that is not persistent: " + collection); }
+ * if (ensurePersistent && collection != null && collection.getOid() ==
+ * null) { throw new
+ * IllegalStateException("Cannot save a collection that is not persistent: "
+ * + collection); }
*/
initCollection(fieldId);
@@ -144,9 +145,11 @@ public class ObjectData extends Data {
}
/*
- * while (e.hasMoreElements()) { ObjectAdapter element = (ObjectAdapter) e.nextElement(); //
- * LOG.debug("adding element to internal collection field " + fieldId +" " + element); Object elementOid =
- * element.getOid(); if (elementOid == null) { throw new IllegalStateException("Element is not persistent
+ * while (e.hasMoreElements()) { ObjectAdapter element = (ObjectAdapter)
+ * e.nextElement(); //
+ * LOG.debug("adding element to internal collection field " + fieldId
+ * +" " + element); Object elementOid = element.getOid(); if (elementOid
+ * == null) { throw new IllegalStateException("Element is not persistent
* "+element); }
*
* addElement(fieldId, (SimpleOid) elementOid); }
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java Sun Jan 22 07:36:07 2012
@@ -89,8 +89,7 @@ public class XmlDataManager implements D
}
@Override
- public void startElement(final String ns, final String name, final String tagName, final Attributes attributes)
- throws SAXException {
+ public void startElement(final String ns, final String name, final String tagName, final Attributes attributes) throws SAXException {
if (object != null) {
if (tagName.equals("value")) {
fieldName = attributes.getValue("field");
@@ -144,8 +143,7 @@ public class XmlDataManager implements D
}
@Override
- public void startElement(final String ns, final String name, final String tagName, final Attributes attrs)
- throws SAXException {
+ public void startElement(final String ns, final String name, final String tagName, final Attributes attrs) throws SAXException {
if (tagName.equals("instance")) {
final long oid = Long.valueOf(attrs.getValue("id"), 16).longValue();
instances.addElement(SerialOid.createPersistent(oid));
@@ -165,8 +163,7 @@ public class XmlDataManager implements D
}
@Override
- public void startElement(final String ns, final String name, final String tagName, final Attributes attrs)
- throws SAXException {
+ public void startElement(final String ns, final String name, final String tagName, final Attributes attrs) throws SAXException {
captureValue = tagName.equals("number");
}
}
@@ -248,8 +245,9 @@ public class XmlDataManager implements D
}
/**
- * A helper that determines if two sets of data match. A match occurs when the types are the same and any field in
- * the pattern also occurs in the data set under test.
+ * A helper that determines if two sets of data match. A match occurs when
+ * the types are the same and any field in the pattern also occurs in the
+ * data set under test.
*/
// TODO we need to be able to find collection instances as well
protected boolean matchesPattern(final ObjectData patternData, final ObjectData candidateData) {
@@ -463,8 +461,7 @@ public class XmlDataManager implements D
for (int i = 0; i < size; i++) {
final Object oid = references.elementAt(i);
if (((SerialOid) oid).isTransient()) {
- throw new ObjectPersistenceException("Can't add tranisent OID (" + oid + ") to " + field
- + " element.");
+ throw new ObjectPersistenceException("Can't add tranisent OID (" + oid + ") to " + field + " element.");
}
xml.append(" <element ");
xml.append("ref=\"" + encodedOid((SerialOid) oid) + "\"/>\n");
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java Sun Jan 22 07:36:07 2012
@@ -50,8 +50,7 @@ class ServiceHandler extends DefaultHand
Vector services = new Vector();
@Override
- public void startElement(final String ns, final String name, final String tagName, final Attributes attrs)
- throws SAXException {
+ public void startElement(final String ns, final String name, final String tagName, final Attributes attrs) throws SAXException {
if (tagName.equals("service")) {
final long oid = Long.valueOf(attrs.getValue("oid"), 16).longValue();
final String id = attrs.getValue("id");
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest.java Sun Jan 22 07:36:07 2012
@@ -143,8 +143,7 @@ public class XmlObjectStoreTest extends
public void validatesObjectStoreGetObject() throws Exception {
final SaveObjectCommand command = objectStore.createSaveObjectCommand(adapter);
objectStore.execute(Collections.<PersistenceCommand> singletonList(command));
- assertTrue(objectStore.getObject(adapter.getOid(), adapter.getSpecification()).getOid()
- .equals(adapter.getOid()));
+ assertTrue(objectStore.getObject(adapter.getOid(), adapter.getSpecification()).getOid().equals(adapter.getOid()));
}
@Test
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlPersistenceMechanismInstallerTest.java Sun Jan 22 07:36:07 2012
@@ -38,9 +38,7 @@ public class XmlPersistenceMechanismInst
@Before
public void setUp() throws Exception {
- deploymentType =
- new DeploymentType("SINGLE_USER", DeploymentCategory.PRODUCTION, ContextCategory.STATIC,
- SystemConstants.VIEWER_DEFAULT, Splash.NO_SHOW);
+ deploymentType = new DeploymentType("SINGLE_USER", DeploymentCategory.PRODUCTION, ContextCategory.STATIC, SystemConstants.VIEWER_DEFAULT, Splash.NO_SHOW);
installer = new XmlPersistenceMechanismInstaller();
}