adopting unitTests to new implementation of getting the default value
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/AbstractFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/AbstractFilterTest.java
index 1da6095..01d1600 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/AbstractFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/AbstractFilterTest.java
@@ -21,7 +21,11 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.rmf.reqif10.AttributeDefinition;
+import org.eclipse.rmf.reqif10.ReqIF10Factory;
import org.eclipse.rmf.reqif10.SpecElementWithAttributes;
+import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.SpecObjectType;
import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
import org.eclipse.rmf.reqif10.search.filter.IFilter;
import org.eclipse.rmf.reqif10.search.filter.IFilter.Operator;
@@ -117,4 +121,17 @@
public abstract void createFixture(Object object);
+
+
+ /**
+ * create a specObjectType, adds the give attributeDefinition and sets it as the type of the specObject
+ *
+ * @param specObject
+ */
+ protected void createSpecObjectType(SpecObject specObject, AttributeDefinition attributeDefinition){
+ SpecObjectType specObjectType = ReqIF10Factory.eINSTANCE.createSpecObjectType();
+ specObjectType.getSpecAttributes().add(attributeDefinition);
+ specObject.setType(specObjectType);
+
+ }
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/BoolFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/BoolFilterTest.java
index 5c18dec..93378a9 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/BoolFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/BoolFilterTest.java
@@ -120,14 +120,7 @@
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
specObject.getValues().add(attributeValue);
-// try {
-// dumpEObjectToConsole(specObject);
-// } catch (IOException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// System.out.println(attributeValue.isTheValue());
-// System.out.println(attributeValue.isSetTheValue());
+ createSpecObjectType(specObject, attributeDefinition);
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterDefaultsTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterDefaultsTest.java
index 996b31b..27cdf78 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterDefaultsTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterDefaultsTest.java
@@ -49,6 +49,8 @@
//specObject.getValues().add(attributeValue);
specObject.setLastChange(new GregorianCalendar(2014, 12, 03));
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterTest.java
index 523ea6a..9bb3d8e 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/DateFilterTest.java
@@ -53,6 +53,8 @@
specObject.getValues().add(attributeValue);
specObject.setLastChange(new GregorianCalendar(2014, 12, 03));
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
@@ -74,7 +76,13 @@
doMatch(filter, false);
filter = new DateFilter(IFilter.Operator.IS, new GregorianCalendar(2014,12,03,0,0,0), null, attributeDefinition);
- doMatch(filter, true);
+ doMatch(filter, true);
+
+ // we do the match on date only, the time of the day should be ignored
+ createFixture(new GregorianCalendar(2014, 12, 03, 13, 14, 15));
+
+ filter = new DateFilter(IFilter.Operator.IS, new GregorianCalendar(2014,12,03), null, attributeDefinition);
+ doMatch(filter, true);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterDefaultsTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterDefaultsTest.java
index 1be112f..065d257 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterDefaultsTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterDefaultsTest.java
@@ -48,7 +48,8 @@
attributeDefinition.setDefaultValue(attributeValue);
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
- //specObject.getValues().add(attributeValue);
+
+ createSpecObjectType(specObject, attributeDefinition);
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterTest.java
index 0a48912..97e720d 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/EnumFilterTest.java
@@ -252,6 +252,8 @@
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
specObject.getValues().add(attributeValue);
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterDefaultsTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterDefaultsTest.java
index 3f44b0e..0b06cc0 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterDefaultsTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterDefaultsTest.java
@@ -16,7 +16,6 @@
import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
import org.eclipse.rmf.reqif10.ReqIF10Factory;
import org.eclipse.rmf.reqif10.SpecObject;
-import org.eclipse.rmf.reqif10.SpecObjectType;
import org.junit.Test;
public class IntegerFilterDefaultsTest extends IntegerFilterTest {
@@ -46,10 +45,8 @@
attributeValue.setTheValue(theValue);
attributeDefinition.setDefaultValue(attributeValue);
- SpecObjectType specObjectType = ReqIF10Factory.eINSTANCE.createSpecObjectType();
- specObjectType.getSpecAttributes().add(attributeDefinition);
-
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
+ createSpecObjectType(specObject, attributeDefinition);
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterTest.java
index 259bcdd..5bbf62c 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/IntegerFilterTest.java
@@ -188,6 +188,8 @@
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
specObject.getValues().add(attributeValue);
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterDefaultsTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterDefaultsTest.java
index 93596f3..c5c5d1c 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterDefaultsTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterDefaultsTest.java
@@ -24,6 +24,7 @@
// Do nothing, since this test will fall back on default values
}
+
/**
* Sets the value as the defaultValue.
* No value is set on the specObject
@@ -51,6 +52,7 @@
specObjectType.getSpecAttributes().add(attributeDefinition);
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
+ specObject.setType(specObjectType);
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterTest.java
index a5a2e94..813790e 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/RealFilterTest.java
@@ -193,6 +193,8 @@
SpecObject specObject = ReqIF10Factory.eINSTANCE.createSpecObject();
specObject.getValues().add(attributeValue);
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterDefaultsValueTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterDefaultsValueTest.java
index 4db40a8..9ac621b 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterDefaultsValueTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterDefaultsValueTest.java
@@ -10,7 +10,6 @@
******************************************************************************/
package org.eclipse.rmf.reqif10.search.test;
-import java.io.IOException;
import java.util.GregorianCalendar;
import org.eclipse.rmf.reqif10.AttributeValueString;
@@ -27,6 +26,30 @@
// Do nothing, since this test will fall back on default values
}
+// @Override
+// @Test
+// public void testIsSet() throws Exception {
+// fail("not yet implemented");
+// }
+//
+// @Override
+// @Test
+// public void testNotContains() throws Exception {
+// fail("not yet implemented");
+// }
+//
+// @Override
+// @Test
+// public void testContains() throws Exception {
+// fail("not yet implemented");
+// }
+//
+// @Override
+// @Test
+// public void testIsNotSet() throws Exception {
+// fail("not yet implemented");
+// }
+//
/**
* Sets the value as the defaultValue.
@@ -58,12 +81,7 @@
specObject.setDesc("THE_SPECOBJECT_DESC");
specObject.setLongName("THE_SPECOBJECT_LONG_NAME");
- try {
- dumpEObjectToConsole(attributeDefinition);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ createSpecObjectType(specObject, attributeDefinition);
setFixture(specObject);
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterTest.java
index c8a3e14..68ee854 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/StringFilterTest.java
@@ -260,8 +260,8 @@
@Test
public void isSetInternal() throws Exception {
- StringFilter filter = new StringFilter(IFilter.Operator.IS_SET, null, AbstractTextFilter.InternalAttribute.DESC, false);
- doMatch(filter, false);
+ StringFilter filter = new StringFilter(IFilter.Operator.IS_SET, "", AbstractTextFilter.InternalAttribute.DESC, false);
+ doMatch(filter, true);
fail("write more tests here");
}
@@ -299,6 +299,8 @@
specObject.setDesc("THE_SPECOBJECT_DESC");
specObject.setLongName("THE_SPECOBJECT_LONG_NAME");
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
}
diff --git a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/XhtmlFilterTest.java b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/XhtmlFilterTest.java
index c76177e..554d337 100644
--- a/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/XhtmlFilterTest.java
+++ b/org.eclipse.rmf.reqif10.search.test/src/org/eclipse/rmf/reqif10/search/test/XhtmlFilterTest.java
@@ -211,6 +211,9 @@
}
attributeDefinition = (AttributeDefinitionXHTML) ReqIF10Util.getAttributeDefinition(attributeValue);
+
+ createSpecObjectType(specObject, attributeDefinition);
+
setFixture(specObject);
} catch (URISyntaxException e) {
e.printStackTrace();
