Copy 1.x trunk to branches for start of 1.6 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@892786 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 218 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java b/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java
new file mode 100644
index 0000000000..74c18beb52
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/DomainPathAnalyzerTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * 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.tuscany.sca.domain.search.impl;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.Tokenizer;
+
+public class DomainPathAnalyzerTestCase extends TestCase {
+
+	private Token reusableToken = new Token();
+
+	public void test() throws IOException {
+		
+		Tokenizer tokenizer = new DomainPathAnalyzer.DomainPathTokenizer(new StringReader(
+				Character.toString(DomainPathAnalyzer.PATH_START) + SearchFields.CONTRIBUTION_FIELD + DomainPathAnalyzer.TYPE_SEPARATOR + "123tuscany" + DomainPathAnalyzer.PATH_START + DomainPathAnalyzer.TYPE_SEPARATOR + "SCA" +
+				DomainPathAnalyzer.PATH_SEPARATOR + DomainPathAnalyzer.TYPE_SEPARATOR + "TuscanySCA" + DomainPathAnalyzer.TYPE_SEPARATOR + "321" + DomainPathAnalyzer.URI_SEPARATOR + "123"));
+
+		assertNextToken(Character.toString(DomainPathAnalyzer.PATH_START), tokenizer);
+		assertNextToken("123", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken(Character.toString(DomainPathAnalyzer.PATH_START), tokenizer);
+		assertNextToken("sca", tokenizer);
+		assertNextToken(Character.toString(DomainPathAnalyzer.PATH_SEPARATOR), tokenizer);
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("sca", tokenizer);
+		assertNextToken("123", tokenizer);
+
+	}
+	
+	private void assertNextToken(String expected, Tokenizer tokenizer)
+			throws IOException {
+		Token token = tokenizer.next(reusableToken);
+
+		assertNotNull(token);
+		assertEquals(expected, token.term());
+
+	}
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/NamingTokenizerTestCase.java b/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/NamingTokenizerTestCase.java
new file mode 100644
index 0000000000..5070202d88
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/modules/domain-search/src/test/java/org/apache/tuscany/sca/domain/search/impl/NamingTokenizerTestCase.java
@@ -0,0 +1,158 @@
+/*
+ * 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.tuscany.sca.domain.search.impl;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.Tokenizer;
+
+public class NamingTokenizerTestCase extends TestCase {
+
+	private Token reusableToken = new Token();
+
+	public void testDigits() throws IOException {
+		NamingTokenizer tokenizer = new NamingTokenizer(new StringReader(
+				"123tuscany"));
+
+		assertNextToken("123", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("tuscany123"));
+
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("123", tokenizer);
+
+		tokenizer.reset(new StringReader("TUSCANY123"));
+
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("123", tokenizer);
+
+		tokenizer.reset(new StringReader("123TUSCANY"));
+
+		assertNextToken("123", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("tuscany.123"));
+
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("123", tokenizer);
+
+		tokenizer.reset(new StringReader("123.tuscany"));
+
+		assertNextToken("123", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+	}
+
+	public void testUppercasedTokens() throws IOException {
+		NamingTokenizer tokenizer = new NamingTokenizer(new StringReader(
+				"SCATuscany"));
+
+		assertNextToken("sca", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("TuscanySCA"));
+
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("sca", tokenizer);
+
+		tokenizer.reset(new StringReader("Tuscany.SCA"));
+
+		assertNextToken("tuscany", tokenizer);
+		assertNextToken("sca", tokenizer);
+
+		tokenizer.reset(new StringReader("SCA.Tuscany"));
+
+		assertNextToken("sca", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("SCA"));
+
+		assertNextToken("sca", tokenizer);
+
+	}
+
+	public void testRegularTokens() throws IOException {
+		NamingTokenizer tokenizer = new NamingTokenizer(new StringReader(
+				"scaTuscany"));
+
+		assertNextToken("sca", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("ScaTuscany"));
+
+		assertNextToken("sca", tokenizer);
+		assertNextToken("tuscany", tokenizer);
+
+		tokenizer.reset(new StringReader("ScaTuscanY"));
+
+		assertNextToken("sca", tokenizer);
+		assertNextToken("tuscan", tokenizer);
+		assertNextToken("y", tokenizer);
+
+	}
+
+	public void testSingleCharTokens() throws IOException {
+
+		NamingTokenizer tokenizer = new NamingTokenizer(new StringReader("1"));
+
+		assertNextToken("1", tokenizer);
+
+		tokenizer.reset(new StringReader("a"));
+
+		assertNextToken("a", tokenizer);
+
+		tokenizer.reset(new StringReader("A"));
+
+		assertNextToken("a", tokenizer);
+
+	}
+
+	public void testNullTokens() throws IOException {
+		NamingTokenizer tokenizer = new NamingTokenizer(new StringReader("_"));
+		assertNull(tokenizer.next(this.reusableToken));
+
+		tokenizer.reset(new StringReader("."));
+		assertNull(tokenizer.next(this.reusableToken));
+
+		tokenizer.reset(new StringReader(" "));
+		assertNull(tokenizer.next(this.reusableToken));
+
+		tokenizer.reset(new StringReader(""));
+		assertNull(tokenizer.next(this.reusableToken));
+
+		tokenizer.reset(new StringReader(" )(%*%"));
+		assertNull(tokenizer.next(this.reusableToken));
+
+	}
+
+	private void assertNextToken(String expected, Tokenizer tokenizer)
+			throws IOException {
+		Token token = tokenizer.next(reusableToken);
+
+		assertNotNull(token);
+		assertEquals(expected, token.term());
+
+	}
+
+}