Author: michiel
Date: 2010-07-15 18:54:59 +0200 (Thu, 15 Jul 2010)
New Revision: 42916
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/ModifiableQueryTest.java
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
Log:
failed som test cases
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-07-15 16:31:37 UTC (rev 42915)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-07-15 16:54:59 UTC (rev 42916)
@@ -60,8 +60,12 @@
}
public NodeSearchQuery(NodeManager nodeManager) {
+ if (nodeManager == null) {
+ throw new IllegalArgumentException("Invalid nodeManager: " +
nodeManager);
+ }
Step step = super.addStep(nodeManager.getName());
for (Field f : nodeManager.getFields(NodeManager.ORDER_CREATE)) {
+
if (! f.isVirtual() && f.getType() != Field.TYPE_BINARY) {
addField(step, f);
}
Modified:
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/ModifiableQueryTest.java
===================================================================
---
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/ModifiableQueryTest.java
2010-07-15 16:31:37 UTC (rev 42915)
+++
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/ModifiableQueryTest.java
2010-07-15 16:54:59 UTC (rev 42916)
@@ -17,7 +17,7 @@
*/
public class ModifiableQueryTest {
- private final static String IMAGES = "mags";
+ private final static String IMAGES = "images";
private final static String TITLE = "title";
private final static String DESCRIPTION = "description";
private final static String NEWS = "news";
@@ -48,6 +48,7 @@
MockCloudContext.getInstance().addCore();
MockCloudContext.getInstance().addCoreModel();
MockCloudContext.getInstance().addNodeManagers(MockBuilderReader.getBuilderLoader().getChildResourceLoader("mynews"));
+
MockCloudContext.getInstance().addNodeManagers(MockBuilderReader.getBuilderLoader().getChildResourceLoader("resources"));
}
/*
Modified:
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
===================================================================
---
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
2010-07-15 16:31:37 UTC (rev 42915)
+++
mmbase/trunk/bridge/src/test/java/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
2010-07-15 16:54:59 UTC (rev 42916)
@@ -97,7 +97,7 @@
Step step = instance.getSteps().get(0);
Collection<Field> fields = images.getFields();
for (Field field : fields) {
- if (! field.isVirtual()) {
+ if (! field.isVirtual() && field.getType() != Field.TYPE_BINARY) {
StepField stepField = instance.getField(field);
assertTrue(stepField != null);
assertTrue(stepField.getFieldName().equals(field.getName()));
@@ -105,7 +105,7 @@
assertTrue(stepField.getType() == field.getType());
assertTrue(stepField.getStep().equals(step));
} else {
- // Non-persistent field: should throw IllegalArgumentException.
+ // Non-persistent field or binary fields: should throw
IllegalArgumentException.
try {
instance.getField(field);
fail("Non-persistent field: '" + field + "' should throw
IllegalArgumentException.");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
