svn commit: r614572 - in /directory/studio/trunk/studio-schemaeditor/src: main/java/org/apache/directory/studio/schemaeditor/model/alias/ test/java/org/apache/directory/studio/schemaeditor/model/alias/

[pa...@apache.org]

Author: pamarcelot
Date: Wed Jan 23 07:56:23 2008
New Revision: 614572

URL: http://svn.apache.org/viewvc?rev=614572&view=rev
Log:
Fixed a reset bug in the parser.
Added basic tests.

Added:
    directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/
    directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java
Modified:
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParser.java

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParser.java?rev=614572&r1=614571&r2=614572&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParser.java (original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParser.java Wed Jan 23 07:56:23 2008
@@ -68,6 +68,7 @@
     public void parse( String str )
     {
         // reset state
+        aliases.clear();
         scanner.reset( str );
 
         // handle error tokens before filter

Added: directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java?rev=614572&view=auto
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java (added)
+++ directory/studio/trunk/studio-schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java Wed Jan 23 07:56:23 2008
@@ -0,0 +1,187 @@
+/*
+ *  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.directory.studio.schemaeditor.model.alias;
+
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+
+/**
+ * This class tests the {@link AliasesStringParser} class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class AliasesStringParserTest extends TestCase
+{
+    public void testNoAlias() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 0, aliases.size() );
+    }
+
+
+    public void testOneAlias() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "test" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 1, aliases.size() );
+        assertEquals( "test", aliases.get( 0 ).getAlias() );
+    }
+
+
+    public void testTwoAliases() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "test1, test2" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 2, aliases.size() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() );
+        assertEquals( "test2", aliases.get( 1 ).getAlias() );
+    }
+
+
+    public void testThreeAliases() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "test1, test2, test3" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 3, aliases.size() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() );
+        assertEquals( "test2", aliases.get( 1 ).getAlias() );
+        assertEquals( "test3", aliases.get( 2 ).getAlias() );
+    }
+
+
+    public void testMultipleCommasNoAlias() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( ",,,,,,,,,,,," );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 0, aliases.size() );
+    }
+
+
+    public void testMultipleCommasAndWhiteSpacesNoAlias() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( ", ,   ,    ,  , ,,,," );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 0, aliases.size() );
+    }
+
+
+    public void testTwoAliasesMultipleCommas() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( ",,test1,,,,,,test2,,,," );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 2, aliases.size() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() );
+        assertEquals( "test2", aliases.get( 1 ).getAlias() );
+    }
+
+
+    public void testOneAliasWithStartError() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "1test" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 1, aliases.size() );
+        assertEquals( "1test", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithStartError.class, aliases.get( 0 ).getClass() );
+    }
+    
+    public void testOneAliasWithStartError2() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "1" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 1, aliases.size() );
+        assertEquals( "1", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithStartError.class, aliases.get( 0 ).getClass() );
+    }
+
+
+    public void testOneAliasWithPartError() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "tes/t" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 1, aliases.size() );
+        assertEquals( "tes/t", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
+    }
+
+
+    public void testOneAliasWithPartError2() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "tes/" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 1, aliases.size() );
+        assertEquals( "tes/", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
+    }
+    
+    public void testOneAliasWithPartErrorAndOneAliasWithStartError() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "tes/t, 1test" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 2, aliases.size() );
+        assertEquals( "tes/t", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
+        assertEquals( "1test", aliases.get( 1 ).getAlias() );
+        assertEquals( AliasWithStartError.class, aliases.get( 1 ).getClass() );
+    }
+
+
+    
+    public void testOneAliasWithPartErrorAndOneAliasWithStartError2() throws Exception
+    {
+        AliasesStringParser parser = new AliasesStringParser();
+
+        parser.parse( "tes/, 1" );
+        List<Alias> aliases = parser.getAliases();
+        assertEquals( 2, aliases.size() );
+        assertEquals( "tes/", aliases.get( 0 ).getAlias() );
+        assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
+        assertEquals( "1", aliases.get( 1 ).getAlias() );
+        assertEquals( AliasWithStartError.class, aliases.get( 1 ).getClass() );
+    }
+}