cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1057397 [2/3] - in /cxf/branches/2.3.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/ common/common/src/test/java/org/apache/cxf/staxutils/resources/ distribution/src/main/release/samples/aegis/testSrc/org/apache/cxf/...
Date Mon, 10 Jan 2011 22:18:04 GMT
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java?rev=1057397&r1=1057396&r2=1057397&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java Mon Jan 10 22:18:02 2011
@@ -1,290 +1,290 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.ext.search;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.xml.datatype.DatatypeFactory;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-public class FiqlParserTest extends Assert {
-    private FiqlParser<Condition> parser = new FiqlParser<Condition>(Condition.class);
-
-    @Test(expected = FiqlParseException.class)
-    public void testCompareWrongComparator() throws FiqlParseException {
-        parser.parse("name>booba");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testCompareMissingName() throws FiqlParseException {
-        parser.parse("==30");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testCompareMissingValue() throws FiqlParseException {
-        parser.parse("name=gt=");
-    }
-
-    @Test
-    public void testCompareValueTextSpaces() throws FiqlParseException {
-        parser.parse("name=gt=some text");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testCompareNameTextSpaces() throws FiqlParseException {
-        parser.parse("some name=gt=text");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testDanglingOperator() throws FiqlParseException {
-        parser.parse("name==a;(level==10;),");
-    }
-
-    @Test
-    public void testMultilevelExpression() throws FiqlParseException {
-        parser.parse("name==a;(level==10,(name!=b;name!=c;(level=gt=10)))");
-    }
-
-    @Test
-    public void testMultilevelExpression2() throws FiqlParseException {
-        parser.parse("((name==a;level==10),name!=b;name!=c);level=gt=10");
-    }
-
-    @Test
-    public void testRedundantBrackets() throws FiqlParseException {
-        parser.parse("name==a;((((level==10))))");
-    }
-    
-    @Test
-    public void testAndOfOrs() throws FiqlParseException {
-        parser.parse("(name==a,name==b);(level=gt=0,level=lt=10)");
-    }
-    
-    @Test
-    public void testOrOfAnds() throws FiqlParseException {
-        parser.parse("(name==a;name==b),(level=gt=0;level=lt=10)");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testUnmatchedBracket() throws FiqlParseException {
-        parser.parse("name==a;(name!=b;(level==10,(name!=b))");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testUnmatchedBracket2() throws FiqlParseException {
-        parser.parse("name==bbb;))()level==111");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testMissingComparison() throws FiqlParseException {
-        parser.parse("name==bbb;,level==111");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testSetterMissing() throws FiqlParseException {
-        parser.parse("noSuchSetter==xxx");
-    }
-
-    @Test(expected = FiqlParseException.class)
-    public void testSetterWrongType() throws FiqlParseException {
-        parser.parse("exception==text");
-    }
-
-    @Test
-    public void testSetterNumericText() throws FiqlParseException {
-        parser.parse("name==10");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testMismatchedAccessorTypes() throws FiqlParseException {
-        new FiqlParser<MismatchedTypes>(MismatchedTypes.class);
-    }
-
-    @Test
-    public void testParseName() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==king");
-        assertTrue(filter.isMet(new Condition("king", 10, new Date())));
-        assertTrue(filter.isMet(new Condition("king", 0, null)));
-        assertFalse(filter.isMet(new Condition("diamond", 10, new Date())));
-        assertFalse(filter.isMet(new Condition("diamond", 0, null)));
-    }
-
-    @Test
-    public void testParseLevel() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("level=gt=10");
-        assertTrue(filter.isMet(new Condition("whatever", 15, new Date())));
-        assertTrue(filter.isMet(new Condition(null, 15, null)));
-        assertFalse(filter.isMet(new Condition("blah", 5, new Date())));
-        assertFalse(filter.isMet(new Condition("foobar", 0, null)));
-    }
-
-    @Test
-    public void testParseDate() throws FiqlParseException, ParseException {
-        SearchCondition<Condition> filter = parser.parse("time=le=2010-03-11T18:00:00.000+00:00");
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-        assertTrue(filter.isMet(new Condition("whatever", 15, df.parse("2010-03-11T18:00:00.000+0000"))));
-        assertTrue(filter.isMet(new Condition(null, null, df.parse("2010-03-10T22:22:00.000+0000"))));
-        assertFalse(filter.isMet(new Condition("blah", null, df.parse("2010-03-12T00:00:00.000+0000"))));
-        assertFalse(filter.isMet(new Condition(null, 123, df.parse("2010-03-12T00:00:00.000+0000"))));
-    }
-
-    @Test
-    public void testParseDateDuration() throws Exception {
-        SearchCondition<Condition> filter = parser.parse("time=gt=-PT1M");
-        Date now = new Date();
-        Date tenMinutesAgo = new Date();
-        DatatypeFactory.newInstance().newDuration("-PT10M").addTo(tenMinutesAgo);
-        assertTrue(filter.isMet(new Condition(null, null, now)));
-        assertFalse(filter.isMet(new Condition(null, null, tenMinutesAgo)));
-    }
-
-    @Test
-    public void testParseComplex1() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==ami*;level=gt=10");
-        assertTrue(filter.isMet(new Condition("amichalec", 12, new Date())));
-        assertTrue(filter.isMet(new Condition("ami", 12, new Date())));
-        assertFalse(filter.isMet(new Condition("ami", 8, null)));
-        assertFalse(filter.isMet(new Condition("am", 20, null)));
-    }
-    
-    @Test
-    public void testSQL1() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==ami*;level=gt=10");
-        String sql = filter.toSQL("table");
-        assertTrue("SELECT * FROM table WHERE name LIKE 'ami%' AND level > '10'".equals(sql)
-                   || "SELECT * FROM table WHERE level > '10' AND name LIKE 'ami%'".equals(sql));
-    }
-
-    @Test
-    public void testParseComplex2() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==ami*,level=gt=10");
-        assertTrue(filter.isMet(new Condition("ami", 0, new Date())));
-        assertTrue(filter.isMet(new Condition("foo", 20, null)));
-        assertFalse(filter.isMet(new Condition("foo", 0, null)));
-    }
-
-    @Test
-    public void testSQL2() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==ami*,level=gt=10");
-        String sql = filter.toSQL("table");
-        assertTrue("SELECT * FROM table WHERE (name LIKE 'ami%') OR (level > '10')".equals(sql)
-                   || "SELECT * FROM table WHERE (level > '10') OR (name LIKE 'ami%')".equals(sql));
-    }
-    
-    @Test
-    public void testParseComplex3() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==foo*;(name!=*bar,level=gt=10)");
-        assertTrue(filter.isMet(new Condition("fooooo", 0, null)));
-        assertTrue(filter.isMet(new Condition("fooooobar", 20, null)));
-        assertFalse(filter.isMet(new Condition("fooobar", 0, null)));
-        assertFalse(filter.isMet(new Condition("bar", 20, null)));
-    }
-
-    @Test
-    public void testSQL3() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==foo*;(name!=*bar,level=gt=10)");
-        String sql = filter.toSQL("table");
-        assertTrue(("SELECT * FROM table WHERE (name LIKE 'foo%') AND ((name NOT LIKE '%bar') "
-                   + "OR (level > '10'))").equals(sql)
-                   || ("SELECT * FROM table WHERE (name LIKE 'foo%') AND "
-                   + "((level > '10') OR (name NOT LIKE '%bar'))").equals(sql));
-    }
-    
-    @Test
-    public void testSQL4() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("(name==test,level==18);(name==test1,level!=19)");
-        String sql = filter.toSQL("table");
-        assertTrue(("SELECT * FROM table WHERE ((name = 'test') OR (level = '18'))"
-                   + " AND ((name = 'test1') OR (level <> '19'))").equals(sql)
-                   || ("SELECT * FROM table WHERE ((name = 'test1') OR (level <> '19'))"
-                   + " AND ((name = 'test') OR (level = '18'))").equals(sql));
-    }
-    
-    @Test
-    public void testParseComplex4() throws FiqlParseException {
-        SearchCondition<Condition> filter = parser.parse("name==foo*;name!=*bar,level=gt=10");
-        assertTrue(filter.isMet(new Condition("zonk", 20, null)));
-        assertTrue(filter.isMet(new Condition("foobaz", 0, null)));
-        assertTrue(filter.isMet(new Condition("foobar", 20, null)));
-        assertFalse(filter.isMet(new Condition("fooxxxbar", 0, null)));
-    }
-    
-    @Ignore
-    static class Condition {
-        private String name;
-        private Integer level;
-        private Date time;
-
-        public Condition() {
-        }
-
-        public Condition(String name, Integer level, Date time) {
-            this.name = name;
-            this.level = level;
-            this.time = time;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public int getLevel() {
-            return level;
-        }
-
-        public void setLevel(int level) {
-            this.level = level;
-        }
-
-        public Date getTime() {
-            return time;
-        }
-
-        public void setTime(Date time) {
-            this.time = time;
-        }
-
-        public void setException(Exception ex) {
-            // do nothing
-        }
-
-    }
-
-    // TODO refactor to Beanspector unit tests
-    @Ignore
-    static class MismatchedTypes {
-        public Date getFoo() {
-            return null;
-        }
-
-        public void setFoo(String val) {
-        }
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.ext.search;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.xml.datatype.DatatypeFactory;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+public class FiqlParserTest extends Assert {
+    private FiqlParser<Condition> parser = new FiqlParser<Condition>(Condition.class);
+
+    @Test(expected = FiqlParseException.class)
+    public void testCompareWrongComparator() throws FiqlParseException {
+        parser.parse("name>booba");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testCompareMissingName() throws FiqlParseException {
+        parser.parse("==30");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testCompareMissingValue() throws FiqlParseException {
+        parser.parse("name=gt=");
+    }
+
+    @Test
+    public void testCompareValueTextSpaces() throws FiqlParseException {
+        parser.parse("name=gt=some text");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testCompareNameTextSpaces() throws FiqlParseException {
+        parser.parse("some name=gt=text");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testDanglingOperator() throws FiqlParseException {
+        parser.parse("name==a;(level==10;),");
+    }
+
+    @Test
+    public void testMultilevelExpression() throws FiqlParseException {
+        parser.parse("name==a;(level==10,(name!=b;name!=c;(level=gt=10)))");
+    }
+
+    @Test
+    public void testMultilevelExpression2() throws FiqlParseException {
+        parser.parse("((name==a;level==10),name!=b;name!=c);level=gt=10");
+    }
+
+    @Test
+    public void testRedundantBrackets() throws FiqlParseException {
+        parser.parse("name==a;((((level==10))))");
+    }
+    
+    @Test
+    public void testAndOfOrs() throws FiqlParseException {
+        parser.parse("(name==a,name==b);(level=gt=0,level=lt=10)");
+    }
+    
+    @Test
+    public void testOrOfAnds() throws FiqlParseException {
+        parser.parse("(name==a;name==b),(level=gt=0;level=lt=10)");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testUnmatchedBracket() throws FiqlParseException {
+        parser.parse("name==a;(name!=b;(level==10,(name!=b))");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testUnmatchedBracket2() throws FiqlParseException {
+        parser.parse("name==bbb;))()level==111");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testMissingComparison() throws FiqlParseException {
+        parser.parse("name==bbb;,level==111");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testSetterMissing() throws FiqlParseException {
+        parser.parse("noSuchSetter==xxx");
+    }
+
+    @Test(expected = FiqlParseException.class)
+    public void testSetterWrongType() throws FiqlParseException {
+        parser.parse("exception==text");
+    }
+
+    @Test
+    public void testSetterNumericText() throws FiqlParseException {
+        parser.parse("name==10");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testMismatchedAccessorTypes() throws FiqlParseException {
+        new FiqlParser<MismatchedTypes>(MismatchedTypes.class);
+    }
+
+    @Test
+    public void testParseName() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==king");
+        assertTrue(filter.isMet(new Condition("king", 10, new Date())));
+        assertTrue(filter.isMet(new Condition("king", 0, null)));
+        assertFalse(filter.isMet(new Condition("diamond", 10, new Date())));
+        assertFalse(filter.isMet(new Condition("diamond", 0, null)));
+    }
+
+    @Test
+    public void testParseLevel() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("level=gt=10");
+        assertTrue(filter.isMet(new Condition("whatever", 15, new Date())));
+        assertTrue(filter.isMet(new Condition(null, 15, null)));
+        assertFalse(filter.isMet(new Condition("blah", 5, new Date())));
+        assertFalse(filter.isMet(new Condition("foobar", 0, null)));
+    }
+
+    @Test
+    public void testParseDate() throws FiqlParseException, ParseException {
+        SearchCondition<Condition> filter = parser.parse("time=le=2010-03-11T18:00:00.000+00:00");
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        assertTrue(filter.isMet(new Condition("whatever", 15, df.parse("2010-03-11T18:00:00.000+0000"))));
+        assertTrue(filter.isMet(new Condition(null, null, df.parse("2010-03-10T22:22:00.000+0000"))));
+        assertFalse(filter.isMet(new Condition("blah", null, df.parse("2010-03-12T00:00:00.000+0000"))));
+        assertFalse(filter.isMet(new Condition(null, 123, df.parse("2010-03-12T00:00:00.000+0000"))));
+    }
+
+    @Test
+    public void testParseDateDuration() throws Exception {
+        SearchCondition<Condition> filter = parser.parse("time=gt=-PT1M");
+        Date now = new Date();
+        Date tenMinutesAgo = new Date();
+        DatatypeFactory.newInstance().newDuration("-PT10M").addTo(tenMinutesAgo);
+        assertTrue(filter.isMet(new Condition(null, null, now)));
+        assertFalse(filter.isMet(new Condition(null, null, tenMinutesAgo)));
+    }
+
+    @Test
+    public void testParseComplex1() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==ami*;level=gt=10");
+        assertTrue(filter.isMet(new Condition("amichalec", 12, new Date())));
+        assertTrue(filter.isMet(new Condition("ami", 12, new Date())));
+        assertFalse(filter.isMet(new Condition("ami", 8, null)));
+        assertFalse(filter.isMet(new Condition("am", 20, null)));
+    }
+    
+    @Test
+    public void testSQL1() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==ami*;level=gt=10");
+        String sql = filter.toSQL("table");
+        assertTrue("SELECT * FROM table WHERE name LIKE 'ami%' AND level > '10'".equals(sql)
+                   || "SELECT * FROM table WHERE level > '10' AND name LIKE 'ami%'".equals(sql));
+    }
+
+    @Test
+    public void testParseComplex2() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==ami*,level=gt=10");
+        assertTrue(filter.isMet(new Condition("ami", 0, new Date())));
+        assertTrue(filter.isMet(new Condition("foo", 20, null)));
+        assertFalse(filter.isMet(new Condition("foo", 0, null)));
+    }
+
+    @Test
+    public void testSQL2() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==ami*,level=gt=10");
+        String sql = filter.toSQL("table");
+        assertTrue("SELECT * FROM table WHERE (name LIKE 'ami%') OR (level > '10')".equals(sql)
+                   || "SELECT * FROM table WHERE (level > '10') OR (name LIKE 'ami%')".equals(sql));
+    }
+    
+    @Test
+    public void testParseComplex3() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==foo*;(name!=*bar,level=gt=10)");
+        assertTrue(filter.isMet(new Condition("fooooo", 0, null)));
+        assertTrue(filter.isMet(new Condition("fooooobar", 20, null)));
+        assertFalse(filter.isMet(new Condition("fooobar", 0, null)));
+        assertFalse(filter.isMet(new Condition("bar", 20, null)));
+    }
+
+    @Test
+    public void testSQL3() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==foo*;(name!=*bar,level=gt=10)");
+        String sql = filter.toSQL("table");
+        assertTrue(("SELECT * FROM table WHERE (name LIKE 'foo%') AND ((name NOT LIKE '%bar') "
+                   + "OR (level > '10'))").equals(sql)
+                   || ("SELECT * FROM table WHERE (name LIKE 'foo%') AND "
+                   + "((level > '10') OR (name NOT LIKE '%bar'))").equals(sql));
+    }
+    
+    @Test
+    public void testSQL4() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("(name==test,level==18);(name==test1,level!=19)");
+        String sql = filter.toSQL("table");
+        assertTrue(("SELECT * FROM table WHERE ((name = 'test') OR (level = '18'))"
+                   + " AND ((name = 'test1') OR (level <> '19'))").equals(sql)
+                   || ("SELECT * FROM table WHERE ((name = 'test1') OR (level <> '19'))"
+                   + " AND ((name = 'test') OR (level = '18'))").equals(sql));
+    }
+    
+    @Test
+    public void testParseComplex4() throws FiqlParseException {
+        SearchCondition<Condition> filter = parser.parse("name==foo*;name!=*bar,level=gt=10");
+        assertTrue(filter.isMet(new Condition("zonk", 20, null)));
+        assertTrue(filter.isMet(new Condition("foobaz", 0, null)));
+        assertTrue(filter.isMet(new Condition("foobar", 20, null)));
+        assertFalse(filter.isMet(new Condition("fooxxxbar", 0, null)));
+    }
+    
+    @Ignore
+    static class Condition {
+        private String name;
+        private Integer level;
+        private Date time;
+
+        public Condition() {
+        }
+
+        public Condition(String name, Integer level, Date time) {
+            this.name = name;
+            this.level = level;
+            this.time = time;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getLevel() {
+            return level;
+        }
+
+        public void setLevel(int level) {
+            this.level = level;
+        }
+
+        public Date getTime() {
+            return time;
+        }
+
+        public void setTime(Date time) {
+            this.time = time;
+        }
+
+        public void setException(Exception ex) {
+            // do nothing
+        }
+
+    }
+
+    // TODO refactor to Beanspector unit tests
+    @Ignore
+    static class MismatchedTypes {
+        public Date getFoo() {
+            return null;
+        }
+
+        public void setFoo(String val) {
+        }
+    }
+}

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/FiqlParserTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java?rev=1057397&r1=1057396&r2=1057397&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java Mon Jan 10 22:18:02 2011
@@ -1,371 +1,371 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.jaxrs.ext.search;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class SimpleSearchConditionTest {
-
-    private static SearchCondition<SingleAttr> cEq;
-    private static SearchCondition<SingleAttr> cGt;
-    private static SearchCondition<SingleAttr> cGeq;
-    private static SearchCondition<SingleAttr> cLt;
-    private static SearchCondition<SingleAttr> cLeq;
-
-    private static SingleAttr attr = new SingleAttr("bbb");
-    private static SingleAttr attrGreater = new SingleAttr("ccc");
-    private static SingleAttr attrLesser = new SingleAttr("aaa");
-
-    // TODO 1. comparison with multiple values
-    // TODO 2. comparison when getter returns null/throws exception
-    private static DoubleAttr attr2Vals = new DoubleAttr("bbb", "ccc");
-    private static DoubleAttr attr2ValsGreater = new DoubleAttr("ccc", "ddd");
-    private static DoubleAttr attr2ValsLesser = new DoubleAttr("aaa", "bbb");
-
-    private static DoubleAttr attr1Val = new DoubleAttr("bbb", null);
-    private static DoubleAttr attr1ValGreater = new DoubleAttr("ccc", "ingored");
-    private static DoubleAttr attr1ValLesser = new DoubleAttr("aaa", "ingored");
-
-    private static SearchCondition<DoubleAttr> dc1Eq;
-    private static SearchCondition<DoubleAttr> dc1Gt;
-    private static SearchCondition<DoubleAttr> dc1Geq;
-    private static SearchCondition<DoubleAttr> dc1Lt;
-    private static SearchCondition<DoubleAttr> dc1Leq;
-
-    private static SearchCondition<DoubleAttr> dc2Eq;
-    private static SearchCondition<DoubleAttr> dc2Gt;
-    private static SearchCondition<DoubleAttr> dc2Geq;
-    private static SearchCondition<DoubleAttr> dc2Lt;
-    private static SearchCondition<DoubleAttr> dc2Leq;
-
-    private static List<ConditionType> supported = Arrays.asList(ConditionType.EQUALS,
-                                                                 ConditionType.NOT_EQUALS,
-                                                                 ConditionType.GREATER_OR_EQUALS,
-                                                                 ConditionType.GREATER_THAN,
-                                                                 ConditionType.LESS_OR_EQUALS,
-                                                                 ConditionType.LESS_THAN);
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        cEq = new SimpleSearchCondition<SingleAttr>(ConditionType.EQUALS, attr);
-        cGt = new SimpleSearchCondition<SingleAttr>(ConditionType.GREATER_THAN, attr);
-        cGeq = new SimpleSearchCondition<SingleAttr>(ConditionType.GREATER_OR_EQUALS, attr);
-        cLt = new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_THAN, attr);
-        cLeq = new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_OR_EQUALS, attr);
-
-        dc1Eq = new SimpleSearchCondition<DoubleAttr>(ConditionType.EQUALS, attr1Val);
-        dc1Gt = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_THAN, attr1Val);
-        dc1Geq = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_OR_EQUALS, attr1Val);
-        dc1Lt = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_THAN, attr1Val);
-        dc1Leq = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_OR_EQUALS, attr1Val);
-
-        dc2Eq = new SimpleSearchCondition<DoubleAttr>(ConditionType.EQUALS, attr2Vals);
-        dc2Gt = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_THAN, attr2Vals);
-        dc2Geq = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_OR_EQUALS, attr2Vals);
-        dc2Lt = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_THAN, attr2Vals);
-        dc2Leq = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_OR_EQUALS, attr2Vals);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testCtorNull1() {
-        new SimpleSearchCondition<SingleAttr>((ConditionType)null, attr);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testCtorNull2() {
-        new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_THAN, null);
-    }
-
-    @Test
-    public void testCtorCondSupported() {
-        for (ConditionType ct : ConditionType.values()) {
-            try {
-                new SimpleSearchCondition<SingleAttr>(ct, attr);
-                if (!supported.contains(ct)) {
-                    fail(String.format("Not supported type %s should throw exception", ct.name()));
-                }
-            } catch (IllegalArgumentException e) {
-                if (supported.contains(ct)) {
-                    fail(String.format("Supported type %s should not throw exception", ct.name()));
-                }
-            }
-        }
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testCtorMapNull() {
-        new SimpleSearchCondition<SingleAttr>((Map<String, ConditionType>)null, attr);
-    }
-
-    @Test
-    public void testCtorMapCondSupported() {
-        for (ConditionType ct : ConditionType.values()) {
-            try {
-                Map<String, ConditionType> map = new HashMap<String, ConditionType>();
-                map.put("foo", ct);
-                new SimpleSearchCondition<SingleAttr>(map, attr);
-                if (!supported.contains(ct)) {
-                    fail(String.format("Not supported type %s should throw exception", ct.name()));
-                }
-            } catch (IllegalArgumentException e) {
-                if (supported.contains(ct)) {
-                    fail(String.format("Supported type %s should not throw exception", ct.name()));
-                }
-            }
-        }
-    }
-
-    @Test
-    public void testGetCondition() {
-        assertEquals(cLeq.getCondition(), attr);
-    }
-
-    @Test
-    public void testGetConditionType() {
-        assertEquals(cEq.getConditionType(), ConditionType.EQUALS);
-        assertEquals(cLt.getConditionType(), ConditionType.LESS_THAN);
-    }
-
-    @Test
-    public void testGetConditions() {
-        assertEquals(cGt.getSearchConditions(), null);
-    }
-
-    @Test
-    public void testIsMetEq() {
-        assertTrue(cEq.isMet(attr));
-        assertFalse(cEq.isMet(attrGreater));
-    }
-
-    @Test
-    public void testIsMetGt() {
-        assertTrue(cGt.isMet(attrGreater));
-        assertFalse(cGt.isMet(attr));
-        assertFalse(cGt.isMet(attrLesser));
-    }
-
-    @Test
-    public void testIsMetGeq() {
-        assertTrue(cGeq.isMet(attrGreater));
-        assertTrue(cGeq.isMet(attr));
-        assertFalse(cGeq.isMet(attrLesser));
-    }
-
-    @Test
-    public void testIsMetLt() {
-        assertFalse(cLt.isMet(attrGreater));
-        assertFalse(cLt.isMet(attr));
-        assertTrue(cLt.isMet(attrLesser));
-    }
-
-    @Test
-    public void testIsMetLeq() {
-        assertFalse(cLeq.isMet(attrGreater));
-        assertTrue(cLeq.isMet(attr));
-        assertTrue(cLeq.isMet(attrLesser));
-    }
-
-    @Test
-    public void testIsMetEqPrimitive() {
-        assertTrue(new SimpleSearchCondition<String>(ConditionType.EQUALS, "foo").isMet("foo"));
-    }
-
-    @Test
-    public void testIsMetGtPrimitive() {
-        assertTrue(new SimpleSearchCondition<Float>(ConditionType.GREATER_THAN, 1.5f).isMet(2.5f));
-    }
-
-    @Test
-    public void testIsMetLtPrimitive() {
-        assertTrue(new SimpleSearchCondition<Integer>(ConditionType.LESS_THAN, 10).isMet(5));
-    }
-
-    @Test
-    public void testFindAll() {
-        List<SingleAttr> inputs = Arrays.asList(attr, attrGreater, attrLesser);
-        List<SingleAttr> found = Arrays.asList(attr, attrGreater);
-        assertEquals(found, cGeq.findAll(inputs));
-    }
-
-    @Test
-    public void testIsMetEqDouble1Val() {
-        assertFalse(dc1Eq.isMet(attr1ValGreater));
-        assertTrue(dc1Eq.isMet(attr1Val));
-        assertFalse(dc1Eq.isMet(attr1ValLesser));
-    }
-
-    @Test
-    public void testIsMetGtDouble1Val() {
-        assertTrue(dc1Gt.isMet(attr1ValGreater));
-        assertFalse(dc1Gt.isMet(attr1Val));
-        assertFalse(dc1Gt.isMet(attr1ValLesser));
-    }
-
-    @Test
-    public void testIsMetGeqDouble1Val() {
-        assertTrue(dc1Geq.isMet(attr1ValGreater));
-        assertTrue(dc1Geq.isMet(attr1Val));
-        assertFalse(dc1Geq.isMet(attr1ValLesser));
-    }
-
-    @Test
-    public void testIsMetLtDouble1Val() {
-        assertFalse(dc1Lt.isMet(attr1ValGreater));
-        assertFalse(dc1Lt.isMet(attr1Val));
-        assertTrue(dc1Lt.isMet(attr1ValLesser));
-    }
-
-    @Test
-    public void testIsMetLeqDouble1Val() {
-        assertFalse(dc1Leq.isMet(attr1ValGreater));
-        assertTrue(dc1Leq.isMet(attr1Val));
-        assertTrue(dc1Leq.isMet(attr1ValLesser));
-    }
-
-    @Test
-    public void testIsMetEqDouble2Vals() {
-        assertFalse(dc2Eq.isMet(attr2ValsGreater));
-        assertTrue(dc2Eq.isMet(attr2Vals));
-        assertFalse(dc2Eq.isMet(attr2ValsLesser));
-    }
-
-    @Test
-    public void testIsMetGtDouble2Vals() {
-        assertTrue(dc2Gt.isMet(attr2ValsGreater));
-        assertFalse(dc2Gt.isMet(attr2Vals));
-        assertFalse(dc2Gt.isMet(attr2ValsLesser));
-    }
-
-    @Test
-    public void testIsMetGeqDouble2Vals() {
-        assertTrue(dc2Geq.isMet(attr2ValsGreater));
-        assertTrue(dc2Geq.isMet(attr2Vals));
-        assertFalse(dc2Geq.isMet(attr2ValsLesser));
-    }
-
-    @Test
-    public void testIsMetLtDouble2Vals() {
-        assertFalse(dc2Lt.isMet(attr2ValsGreater));
-        assertFalse(dc2Lt.isMet(attr2Vals));
-        assertTrue(dc2Lt.isMet(attr2ValsLesser));
-    }
-
-    @Test
-    public void testIsMetLeqDouble2Vals() {
-        assertFalse(dc2Leq.isMet(attr2ValsGreater));
-        assertTrue(dc2Leq.isMet(attr2Vals));
-        assertTrue(dc2Leq.isMet(attr2ValsLesser));
-    }
-
-    @Test
-    public void testIsMetMappedOperators() {
-        Map<String, ConditionType> map = new HashMap<String, ConditionType>();
-        map.put("foo", ConditionType.LESS_THAN);
-        map.put("bar", ConditionType.GREATER_THAN);
-
-        // expression "template.getFoo() < pojo.getFoo() & template.getBar() > pojo.getBar()"
-        assertTrue(new SimpleSearchCondition<DoubleAttr>(map, new DoubleAttr("bbb", "ccc"))
-            .isMet(new DoubleAttr("aaa", "ddd")));
-
-        // expression "template.getBar() > pojo.getBar()"
-        assertTrue(new SimpleSearchCondition<DoubleAttr>(map, new DoubleAttr(null, "ccc"))
-            .isMet(new DoubleAttr("!not-interpreted!", "ddd")));
-    }
-
-    @Test
-    public void testIsMetWildcardEnds() {
-        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "bar*");
-        assertTrue(ssc.isMet("bar"));
-        assertTrue(ssc.isMet("barbaz"));
-        assertFalse(ssc.isMet("foobar"));
-    }
-
-    @Test
-    public void testIsMetWildcardStarts() {
-        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*bar");
-        assertTrue(ssc.isMet("bar"));
-        assertFalse(ssc.isMet("barbaz"));
-        assertTrue(ssc.isMet("foobar"));
-    }
-
-    @Test
-    public void testIsMetWildcardStartsEnds() {
-        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*bar*");
-        assertTrue(ssc.isMet("bar"));
-        assertTrue(ssc.isMet("barbaz"));
-        assertTrue(ssc.isMet("foobar"));
-    }
-
-    @Test
-    public void testIsMetWildcardMultiAsterisk() {
-        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*ba*r*");
-        assertFalse(ssc.isMet("bar"));
-        assertTrue(ssc.isMet("ba*r"));
-        assertTrue(ssc.isMet("fooba*r"));
-        assertTrue(ssc.isMet("fooba*rbaz"));
-        assertFalse(ssc.isMet("foobarbaz"));
-    }
-
-    static class SingleAttr {
-        private String foo;
-
-        public SingleAttr(String foo) {
-            this.foo = foo;
-        }
-
-        public String getFoo() {
-            return foo;
-        }
-
-        // this should not be used by "isMet" (is not public)
-        @SuppressWarnings("unused")
-        private String getBar() {
-            return "it's private!";
-        }
-    }
-
-    static class DoubleAttr {
-        private String foo;
-        private String bar;
-
-        public DoubleAttr(String foo, String bar) {
-            this.foo = foo;
-            this.bar = bar;
-        }
-
-        public String getFoo() {
-            return foo;
-        }
-
-        public String getBar() {
-            return bar;
-        }
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.ext.search;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class SimpleSearchConditionTest {
+
+    private static SearchCondition<SingleAttr> cEq;
+    private static SearchCondition<SingleAttr> cGt;
+    private static SearchCondition<SingleAttr> cGeq;
+    private static SearchCondition<SingleAttr> cLt;
+    private static SearchCondition<SingleAttr> cLeq;
+
+    private static SingleAttr attr = new SingleAttr("bbb");
+    private static SingleAttr attrGreater = new SingleAttr("ccc");
+    private static SingleAttr attrLesser = new SingleAttr("aaa");
+
+    // TODO 1. comparison with multiple values
+    // TODO 2. comparison when getter returns null/throws exception
+    private static DoubleAttr attr2Vals = new DoubleAttr("bbb", "ccc");
+    private static DoubleAttr attr2ValsGreater = new DoubleAttr("ccc", "ddd");
+    private static DoubleAttr attr2ValsLesser = new DoubleAttr("aaa", "bbb");
+
+    private static DoubleAttr attr1Val = new DoubleAttr("bbb", null);
+    private static DoubleAttr attr1ValGreater = new DoubleAttr("ccc", "ingored");
+    private static DoubleAttr attr1ValLesser = new DoubleAttr("aaa", "ingored");
+
+    private static SearchCondition<DoubleAttr> dc1Eq;
+    private static SearchCondition<DoubleAttr> dc1Gt;
+    private static SearchCondition<DoubleAttr> dc1Geq;
+    private static SearchCondition<DoubleAttr> dc1Lt;
+    private static SearchCondition<DoubleAttr> dc1Leq;
+
+    private static SearchCondition<DoubleAttr> dc2Eq;
+    private static SearchCondition<DoubleAttr> dc2Gt;
+    private static SearchCondition<DoubleAttr> dc2Geq;
+    private static SearchCondition<DoubleAttr> dc2Lt;
+    private static SearchCondition<DoubleAttr> dc2Leq;
+
+    private static List<ConditionType> supported = Arrays.asList(ConditionType.EQUALS,
+                                                                 ConditionType.NOT_EQUALS,
+                                                                 ConditionType.GREATER_OR_EQUALS,
+                                                                 ConditionType.GREATER_THAN,
+                                                                 ConditionType.LESS_OR_EQUALS,
+                                                                 ConditionType.LESS_THAN);
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        cEq = new SimpleSearchCondition<SingleAttr>(ConditionType.EQUALS, attr);
+        cGt = new SimpleSearchCondition<SingleAttr>(ConditionType.GREATER_THAN, attr);
+        cGeq = new SimpleSearchCondition<SingleAttr>(ConditionType.GREATER_OR_EQUALS, attr);
+        cLt = new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_THAN, attr);
+        cLeq = new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_OR_EQUALS, attr);
+
+        dc1Eq = new SimpleSearchCondition<DoubleAttr>(ConditionType.EQUALS, attr1Val);
+        dc1Gt = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_THAN, attr1Val);
+        dc1Geq = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_OR_EQUALS, attr1Val);
+        dc1Lt = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_THAN, attr1Val);
+        dc1Leq = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_OR_EQUALS, attr1Val);
+
+        dc2Eq = new SimpleSearchCondition<DoubleAttr>(ConditionType.EQUALS, attr2Vals);
+        dc2Gt = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_THAN, attr2Vals);
+        dc2Geq = new SimpleSearchCondition<DoubleAttr>(ConditionType.GREATER_OR_EQUALS, attr2Vals);
+        dc2Lt = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_THAN, attr2Vals);
+        dc2Leq = new SimpleSearchCondition<DoubleAttr>(ConditionType.LESS_OR_EQUALS, attr2Vals);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCtorNull1() {
+        new SimpleSearchCondition<SingleAttr>((ConditionType)null, attr);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCtorNull2() {
+        new SimpleSearchCondition<SingleAttr>(ConditionType.LESS_THAN, null);
+    }
+
+    @Test
+    public void testCtorCondSupported() {
+        for (ConditionType ct : ConditionType.values()) {
+            try {
+                new SimpleSearchCondition<SingleAttr>(ct, attr);
+                if (!supported.contains(ct)) {
+                    fail(String.format("Not supported type %s should throw exception", ct.name()));
+                }
+            } catch (IllegalArgumentException e) {
+                if (supported.contains(ct)) {
+                    fail(String.format("Supported type %s should not throw exception", ct.name()));
+                }
+            }
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCtorMapNull() {
+        new SimpleSearchCondition<SingleAttr>((Map<String, ConditionType>)null, attr);
+    }
+
+    @Test
+    public void testCtorMapCondSupported() {
+        for (ConditionType ct : ConditionType.values()) {
+            try {
+                Map<String, ConditionType> map = new HashMap<String, ConditionType>();
+                map.put("foo", ct);
+                new SimpleSearchCondition<SingleAttr>(map, attr);
+                if (!supported.contains(ct)) {
+                    fail(String.format("Not supported type %s should throw exception", ct.name()));
+                }
+            } catch (IllegalArgumentException e) {
+                if (supported.contains(ct)) {
+                    fail(String.format("Supported type %s should not throw exception", ct.name()));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testGetCondition() {
+        assertEquals(cLeq.getCondition(), attr);
+    }
+
+    @Test
+    public void testGetConditionType() {
+        assertEquals(cEq.getConditionType(), ConditionType.EQUALS);
+        assertEquals(cLt.getConditionType(), ConditionType.LESS_THAN);
+    }
+
+    @Test
+    public void testGetConditions() {
+        assertEquals(cGt.getSearchConditions(), null);
+    }
+
+    @Test
+    public void testIsMetEq() {
+        assertTrue(cEq.isMet(attr));
+        assertFalse(cEq.isMet(attrGreater));
+    }
+
+    @Test
+    public void testIsMetGt() {
+        assertTrue(cGt.isMet(attrGreater));
+        assertFalse(cGt.isMet(attr));
+        assertFalse(cGt.isMet(attrLesser));
+    }
+
+    @Test
+    public void testIsMetGeq() {
+        assertTrue(cGeq.isMet(attrGreater));
+        assertTrue(cGeq.isMet(attr));
+        assertFalse(cGeq.isMet(attrLesser));
+    }
+
+    @Test
+    public void testIsMetLt() {
+        assertFalse(cLt.isMet(attrGreater));
+        assertFalse(cLt.isMet(attr));
+        assertTrue(cLt.isMet(attrLesser));
+    }
+
+    @Test
+    public void testIsMetLeq() {
+        assertFalse(cLeq.isMet(attrGreater));
+        assertTrue(cLeq.isMet(attr));
+        assertTrue(cLeq.isMet(attrLesser));
+    }
+
+    @Test
+    public void testIsMetEqPrimitive() {
+        assertTrue(new SimpleSearchCondition<String>(ConditionType.EQUALS, "foo").isMet("foo"));
+    }
+
+    @Test
+    public void testIsMetGtPrimitive() {
+        assertTrue(new SimpleSearchCondition<Float>(ConditionType.GREATER_THAN, 1.5f).isMet(2.5f));
+    }
+
+    @Test
+    public void testIsMetLtPrimitive() {
+        assertTrue(new SimpleSearchCondition<Integer>(ConditionType.LESS_THAN, 10).isMet(5));
+    }
+
+    @Test
+    public void testFindAll() {
+        List<SingleAttr> inputs = Arrays.asList(attr, attrGreater, attrLesser);
+        List<SingleAttr> found = Arrays.asList(attr, attrGreater);
+        assertEquals(found, cGeq.findAll(inputs));
+    }
+
+    @Test
+    public void testIsMetEqDouble1Val() {
+        assertFalse(dc1Eq.isMet(attr1ValGreater));
+        assertTrue(dc1Eq.isMet(attr1Val));
+        assertFalse(dc1Eq.isMet(attr1ValLesser));
+    }
+
+    @Test
+    public void testIsMetGtDouble1Val() {
+        assertTrue(dc1Gt.isMet(attr1ValGreater));
+        assertFalse(dc1Gt.isMet(attr1Val));
+        assertFalse(dc1Gt.isMet(attr1ValLesser));
+    }
+
+    @Test
+    public void testIsMetGeqDouble1Val() {
+        assertTrue(dc1Geq.isMet(attr1ValGreater));
+        assertTrue(dc1Geq.isMet(attr1Val));
+        assertFalse(dc1Geq.isMet(attr1ValLesser));
+    }
+
+    @Test
+    public void testIsMetLtDouble1Val() {
+        assertFalse(dc1Lt.isMet(attr1ValGreater));
+        assertFalse(dc1Lt.isMet(attr1Val));
+        assertTrue(dc1Lt.isMet(attr1ValLesser));
+    }
+
+    @Test
+    public void testIsMetLeqDouble1Val() {
+        assertFalse(dc1Leq.isMet(attr1ValGreater));
+        assertTrue(dc1Leq.isMet(attr1Val));
+        assertTrue(dc1Leq.isMet(attr1ValLesser));
+    }
+
+    @Test
+    public void testIsMetEqDouble2Vals() {
+        assertFalse(dc2Eq.isMet(attr2ValsGreater));
+        assertTrue(dc2Eq.isMet(attr2Vals));
+        assertFalse(dc2Eq.isMet(attr2ValsLesser));
+    }
+
+    @Test
+    public void testIsMetGtDouble2Vals() {
+        assertTrue(dc2Gt.isMet(attr2ValsGreater));
+        assertFalse(dc2Gt.isMet(attr2Vals));
+        assertFalse(dc2Gt.isMet(attr2ValsLesser));
+    }
+
+    @Test
+    public void testIsMetGeqDouble2Vals() {
+        assertTrue(dc2Geq.isMet(attr2ValsGreater));
+        assertTrue(dc2Geq.isMet(attr2Vals));
+        assertFalse(dc2Geq.isMet(attr2ValsLesser));
+    }
+
+    @Test
+    public void testIsMetLtDouble2Vals() {
+        assertFalse(dc2Lt.isMet(attr2ValsGreater));
+        assertFalse(dc2Lt.isMet(attr2Vals));
+        assertTrue(dc2Lt.isMet(attr2ValsLesser));
+    }
+
+    @Test
+    public void testIsMetLeqDouble2Vals() {
+        assertFalse(dc2Leq.isMet(attr2ValsGreater));
+        assertTrue(dc2Leq.isMet(attr2Vals));
+        assertTrue(dc2Leq.isMet(attr2ValsLesser));
+    }
+
+    @Test
+    public void testIsMetMappedOperators() {
+        Map<String, ConditionType> map = new HashMap<String, ConditionType>();
+        map.put("foo", ConditionType.LESS_THAN);
+        map.put("bar", ConditionType.GREATER_THAN);
+
+        // expression "template.getFoo() < pojo.getFoo() & template.getBar() > pojo.getBar()"
+        assertTrue(new SimpleSearchCondition<DoubleAttr>(map, new DoubleAttr("bbb", "ccc"))
+            .isMet(new DoubleAttr("aaa", "ddd")));
+
+        // expression "template.getBar() > pojo.getBar()"
+        assertTrue(new SimpleSearchCondition<DoubleAttr>(map, new DoubleAttr(null, "ccc"))
+            .isMet(new DoubleAttr("!not-interpreted!", "ddd")));
+    }
+
+    @Test
+    public void testIsMetWildcardEnds() {
+        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "bar*");
+        assertTrue(ssc.isMet("bar"));
+        assertTrue(ssc.isMet("barbaz"));
+        assertFalse(ssc.isMet("foobar"));
+    }
+
+    @Test
+    public void testIsMetWildcardStarts() {
+        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*bar");
+        assertTrue(ssc.isMet("bar"));
+        assertFalse(ssc.isMet("barbaz"));
+        assertTrue(ssc.isMet("foobar"));
+    }
+
+    @Test
+    public void testIsMetWildcardStartsEnds() {
+        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*bar*");
+        assertTrue(ssc.isMet("bar"));
+        assertTrue(ssc.isMet("barbaz"));
+        assertTrue(ssc.isMet("foobar"));
+    }
+
+    @Test
+    public void testIsMetWildcardMultiAsterisk() {
+        SimpleSearchCondition<String> ssc = new SimpleSearchCondition<String>(ConditionType.EQUALS, "*ba*r*");
+        assertFalse(ssc.isMet("bar"));
+        assertTrue(ssc.isMet("ba*r"));
+        assertTrue(ssc.isMet("fooba*r"));
+        assertTrue(ssc.isMet("fooba*rbaz"));
+        assertFalse(ssc.isMet("foobarbaz"));
+    }
+
+    static class SingleAttr {
+        private String foo;
+
+        public SingleAttr(String foo) {
+            this.foo = foo;
+        }
+
+        public String getFoo() {
+            return foo;
+        }
+
+        // this should not be used by "isMet" (is not public)
+        @SuppressWarnings("unused")
+        private String getBar() {
+            return "it's private!";
+        }
+    }
+
+    static class DoubleAttr {
+        private String foo;
+        private String bar;
+
+        public DoubleAttr(String foo, String bar) {
+            this.foo = foo;
+            this.bar = bar;
+        }
+
+        public String getFoo() {
+            return foo;
+        }
+
+        public String getBar() {
+            return bar;
+        }
+    }
+}

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/NoNamespaceAegisElementProvider.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/NoNamespaceJava5TypeCreator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/NoNamespaceTypeCreator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/bus-dispatch.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/HelloServiceProxyFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/DefaultMessageIdCache.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/org/apache/cxf/ws/policy/PolicyEngineImplInitTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/example-sts-issued-saml-assertion.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/example-sts-issued-saml-assertion.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_Basic256Sha256_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_Basic256Sha256_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_with_sst_issued_token_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_elements_with_sst_issued_token_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/transport_binding_policy.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/transport_binding_policy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/wss-242.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/wss-242.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisWSDLNSTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/databinding/src/test/resources/aegisWSDLNSBeans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithHugeResponseTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/HugeResponseInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/HugeResponseInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespBreakThreshold.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestMustUnderstandHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TestMustUnderstandHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd?rev=1057397&r1=1057396&r2=1057397&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd Mon Jan 10 22:18:02 2011
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!--
-                * Licensed to the Apache Software Foundation (ASF) under one * or more
-                contributor license agreements. See the NOTICE file * distributed with
-                this work for additional information * regarding copyright ownership.
-                The ASF licenses this file * to you under the Apache License, Version
-                2.0 (the * "License"); you may not use this file except in compliance
-                * with the License. You may obtain a copy of the License at * *
-                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-                applicable law or agreed to in writing, * software distributed under
-                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-                OR CONDITIONS OF ANY * KIND, either express or implied. See the
-                License for the * specific language governing permissions and
-                limitations * under the License.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	<xsd:element name="ckRequete" type="ckRequeteType">
-	</xsd:element>
-	<xsd:complexType name="requeteIdType">
-		<xsd:attribute name="id" type="GUIDType" use="required">
-		</xsd:attribute>
-	</xsd:complexType>
-	<xsd:simpleType name="GUIDType">
-		<xsd:restriction base="xsd:string">
-		     <xsd:maxLength value="10" />
-                </xsd:restriction>
-	</xsd:simpleType>
-	
-	<xsd:complexType name="ckRequeteType">
-		<xsd:sequence>
-			<xsd:element name="requete" type="requeteIdType">
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+                * Licensed to the Apache Software Foundation (ASF) under one * or more
+                contributor license agreements. See the NOTICE file * distributed with
+                this work for additional information * regarding copyright ownership.
+                The ASF licenses this file * to you under the Apache License, Version
+                2.0 (the * "License"); you may not use this file except in compliance
+                * with the License. You may obtain a copy of the License at * *
+                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+                applicable law or agreed to in writing, * software distributed under
+                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+                OR CONDITIONS OF ANY * KIND, either express or implied. See the
+                License for the * specific language governing permissions and
+                limitations * under the License.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	<xsd:element name="ckRequete" type="ckRequeteType">
+	</xsd:element>
+	<xsd:complexType name="requeteIdType">
+		<xsd:attribute name="id" type="GUIDType" use="required">
+		</xsd:attribute>
+	</xsd:complexType>
+	<xsd:simpleType name="GUIDType">
+		<xsd:restriction base="xsd:string">
+		     <xsd:maxLength value="10" />
+                </xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:complexType name="ckRequeteType">
+		<xsd:sequence>
+			<xsd:element name="requete" type="requeteIdType">
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+</xsd:schema>

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd?rev=1057397&r1=1057396&r2=1057397&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd Mon Jan 10 22:18:02 2011
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!--
-                * Licensed to the Apache Software Foundation (ASF) under one * or more
-                contributor license agreements. See the NOTICE file * distributed with
-                this work for additional information * regarding copyright ownership.
-                The ASF licenses this file * to you under the Apache License, Version
-                2.0 (the * "License"); you may not use this file except in compliance
-                * with the License. You may obtain a copy of the License at * *
-                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-                applicable law or agreed to in writing, * software distributed under
-                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-                OR CONDITIONS OF ANY * KIND, either express or implied. See the
-                License for the * specific language governing permissions and
-                limitations * under the License.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	
-	<xsd:complexType name="ckReponseType">
-		<xsd:sequence>
-			<xsd:element name="produit" type="produitPosteActionType" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="produitPosteActionType">
-		<xsd:sequence>
-			<xsd:element name="action" type="actionCheckMajType"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="actionCheckMajType">
-		<xsd:attribute name="status" type="statusType" use="required"/>
-	</xsd:complexType>
-	<xsd:simpleType name="statusType">
-		<xsd:restriction base="xsd:int">
-			<xsd:enumeration value="0">
-				<xsd:annotation>
-					<xsd:documentation>Aucune</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="1">
-				<xsd:annotation>
-					<xsd:documentation>Installation</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="2">
-				<xsd:annotation>
-					<xsd:documentation>mis a jour</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="3">
-				<xsd:annotation>
-					<xsd:documentation>inconnu</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-			<xsd:enumeration value="4">
-				<xsd:annotation>
-					<xsd:documentation>Erreur</xsd:documentation>
-				</xsd:annotation>
-			</xsd:enumeration>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+                * Licensed to the Apache Software Foundation (ASF) under one * or more
+                contributor license agreements. See the NOTICE file * distributed with
+                this work for additional information * regarding copyright ownership.
+                The ASF licenses this file * to you under the Apache License, Version
+                2.0 (the * "License"); you may not use this file except in compliance
+                * with the License. You may obtain a copy of the License at * *
+                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+                applicable law or agreed to in writing, * software distributed under
+                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+                OR CONDITIONS OF ANY * KIND, either express or implied. See the
+                License for the * specific language governing permissions and
+                limitations * under the License.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	
+	<xsd:complexType name="ckReponseType">
+		<xsd:sequence>
+			<xsd:element name="produit" type="produitPosteActionType" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="produitPosteActionType">
+		<xsd:sequence>
+			<xsd:element name="action" type="actionCheckMajType"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="actionCheckMajType">
+		<xsd:attribute name="status" type="statusType" use="required"/>
+	</xsd:complexType>
+	<xsd:simpleType name="statusType">
+		<xsd:restriction base="xsd:int">
+			<xsd:enumeration value="0">
+				<xsd:annotation>
+					<xsd:documentation>Aucune</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="1">
+				<xsd:annotation>
+					<xsd:documentation>Installation</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="2">
+				<xsd:annotation>
+					<xsd:documentation>mis a jour</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="3">
+				<xsd:annotation>
+					<xsd:documentation>inconnu</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="4">
+				<xsd:annotation>
+					<xsd:documentation>Erreur</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd?rev=1057397&r1=1057396&r2=1057397&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd Mon Jan 10 22:18:02 2011
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!--
-                * Licensed to the Apache Software Foundation (ASF) under one * or more
-                contributor license agreements. See the NOTICE file * distributed with
-                this work for additional information * regarding copyright ownership.
-                The ASF licenses this file * to you under the Apache License, Version
-                2.0 (the * "License"); you may not use this file except in compliance
-                * with the License. You may obtain a copy of the License at * *
-                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-                applicable law or agreed to in writing, * software distributed under
-                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
-                OR CONDITIONS OF ANY * KIND, either express or implied. See the
-                License for the * specific language governing permissions and
-                limitations * under the License.
-        -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
-	<xsd:include schemaLocation="response-in.xsd"/>
-	<xsd:element name="ckReponse" type="ckReponseType">
-	</xsd:element>
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+                * Licensed to the Apache Software Foundation (ASF) under one * or more
+                contributor license agreements. See the NOTICE file * distributed with
+                this work for additional information * regarding copyright ownership.
+                The ASF licenses this file * to you under the Apache License, Version
+                2.0 (the * "License"); you may not use this file except in compliance
+                * with the License. You may obtain a copy of the License at * *
+                http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+                applicable law or agreed to in writing, * software distributed under
+                the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+                OR CONDITIONS OF ANY * KIND, either express or implied. See the
+                License for the * specific language governing permissions and
+                limitations * under the License.
+        -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache.org/jaxws/schemavalidation" targetNamespace="http://cxf.apache.org/jaxws/schemavalidation" elementFormDefault="qualified">
+	<xsd:include schemaLocation="response-in.xsd"/>
+	<xsd:element name="ckReponse" type="ckReponseType">
+	</xsd:element>
+</xsd:schema>

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message