Author: echatellier Date: 2010-06-23 17:55:51 +0200 (Wed, 23 Jun 2010) New Revision: 151 Url: http://nuiton.org/repositories/revision/wikitty/151 Log: Fix notNull check and tests Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 15:55:51 UTC (rev 151) @@ -136,7 +136,7 @@ for (String fieldName : ext.getFieldNames()) { FieldType type = ext.getFieldType(fieldName); if (type.isNotNull()) { - if (null == w.getFqField(fieldName)) { + if (null == w.getFieldAsObject(ext.getName(), fieldName)) { throw new WikittyException(String.format( "Field %s must not be null", fieldName)); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 15:55:51 UTC (rev 151) @@ -158,9 +158,9 @@ public void testFieldConstraint() throws Exception { WikittyExtension ext = new WikittyExtension("TestConstraint", "1", null, WikittyUtil.buildFieldMapExtension( - "String id not null", - "String ext[0-n] unique", - "String other[0-n] unique not null" + "String id notNull=true", + "String ext[0-n] unique=true", + "String other[0-n] unique=true notNull=true" )); ws.storeExtension(null, Arrays.asList(ext));