You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/03/05 11:56:24 UTC
svn commit: r919371 - in /felix/trunk/sigil/common: osgi.test/
osgi.test/src/ osgi.test/src/org/ osgi.test/src/org/apache/
osgi.test/src/org/apache/felix/ osgi.test/src/org/apache/felix/sigil/
osgi.test/src/org/apache/felix/sigil/common/ osgi.test/src/...
Author: dsavage
Date: Fri Mar 5 10:56:23 2010
New Revision: 919371
URL: http://svn.apache.org/viewvc?rev=919371&view=rev
Log:
refactored junk main test into junit test
Added:
felix/trunk/sigil/common/osgi.test/ (with props)
felix/trunk/sigil/common/osgi.test/.classpath
felix/trunk/sigil/common/osgi.test/.project
felix/trunk/sigil/common/osgi.test/sigil.properties
felix/trunk/sigil/common/osgi.test/src/
felix/trunk/sigil/common/osgi.test/src/org/
felix/trunk/sigil/common/osgi.test/src/org/apache/
felix/trunk/sigil/common/osgi.test/src/org/apache/felix/
felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/
felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/
felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/
felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/LDAPParserTest.java
Modified:
felix/trunk/sigil/common/osgi/src/org/apache/felix/sigil/common/osgi/LDAPParser.java
Propchange: felix/trunk/sigil/common/osgi.test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 5 10:56:23 2010
@@ -0,0 +1 @@
+build
Added: felix/trunk/sigil/common/osgi.test/.classpath
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/osgi.test/.classpath?rev=919371&view=auto
==============================================================================
--- felix/trunk/sigil/common/osgi.test/.classpath (added)
+++ felix/trunk/sigil/common/osgi.test/.classpath Fri Mar 5 10:56:23 2010
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: felix/trunk/sigil/common/osgi.test/.project
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/osgi.test/.project?rev=919371&view=auto
==============================================================================
--- felix/trunk/sigil/common/osgi.test/.project (added)
+++ felix/trunk/sigil/common/osgi.test/.project Fri Mar 5 10:56:23 2010
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.apache.felix.sigil.common.osgi.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.apache.felix.sigil.eclipse.core.sigilBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.apache.felix.sigil.sigilnature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: felix/trunk/sigil/common/osgi.test/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/osgi.test/sigil.properties?rev=919371&view=auto
==============================================================================
--- felix/trunk/sigil/common/osgi.test/sigil.properties (added)
+++ felix/trunk/sigil/common/osgi.test/sigil.properties Fri Mar 5 10:56:23 2010
@@ -0,0 +1,16 @@
+
+# sigil project file, saved by plugin.
+
+-bundles: \
+ org.apache.felix.sigil.common.osgi.test, \
+
+-sourcedirs: \
+ src, \
+
+-fragment: \
+ org.apache.felix.sigil.common.osgi;version=0.9.0, \
+
+-imports: \
+ junit.framework;version=3.8.2, \
+
+# end
Added: felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/LDAPParserTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/LDAPParserTest.java?rev=919371&view=auto
==============================================================================
--- felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/LDAPParserTest.java (added)
+++ felix/trunk/sigil/common/osgi.test/src/org/apache/felix/sigil/common/osgi/LDAPParserTest.java Fri Mar 5 10:56:23 2010
@@ -0,0 +1,63 @@
+/*
+ * 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.felix.sigil.common.osgi;
+
+import junit.framework.TestCase;
+
+public class LDAPParserTest extends TestCase
+{
+ private static final SimpleTerm A_B = new SimpleTerm( "a", Ops.EQ, "b" );
+ private static final SimpleTerm C_D = new SimpleTerm( "c", Ops.EQ, "d" );
+
+ public void testSimple() {
+ LDAPExpr expr = LDAPParser.parseExpression( "(a=b)" );
+ assertEquals( expr, A_B );
+ }
+
+ public void testSimpleWhiteSpace() {
+ LDAPExpr expr = LDAPParser.parseExpression( " ( a = b ) " );
+ assertEquals( expr, A_B );
+ }
+
+ public void testNot() {
+ LDAPExpr expr = LDAPParser.parseExpression( "(!(a=b))" );
+ assertEquals( expr, Not.apply(A_B));
+ }
+
+ public void testAnd() {
+ LDAPExpr expr = LDAPParser.parseExpression( "(&(a=b)(c=d))" );
+ assertEquals( expr, And.apply(A_B, C_D) );
+ }
+
+ public void testOr() {
+ LDAPExpr expr = LDAPParser.parseExpression( "(|(a=b)(c=d))" );
+ assertEquals( expr, Or.apply(A_B, C_D) );
+ }
+
+ public void testParseException() {
+ try {
+ LDAPExpr expr = LDAPParser.parseExpression( ".(a=b)" );
+ fail( "Unexpectedly parsed invalid ldap expr " + expr);
+ }
+ catch (LDAPParseException e) {
+ // expected
+ }
+ }
+}
Modified: felix/trunk/sigil/common/osgi/src/org/apache/felix/sigil/common/osgi/LDAPParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/osgi/src/org/apache/felix/sigil/common/osgi/LDAPParser.java?rev=919371&r1=919370&r2=919371&view=diff
==============================================================================
--- felix/trunk/sigil/common/osgi/src/org/apache/felix/sigil/common/osgi/LDAPParser.java (original)
+++ felix/trunk/sigil/common/osgi/src/org/apache/felix/sigil/common/osgi/LDAPParser.java Fri Mar 5 10:56:23 2010
@@ -45,24 +45,6 @@
return parser.parse( strExpr );
}
-
- public static void main( String[] args )
- {
- for ( String arg : args )
- {
- try
- {
- System.out.println( parseExpression( arg ) );
- }
- catch ( LDAPParseException e )
- {
- System.out.println( "Failed to parse " + arg );
- e.printStackTrace();
- }
- }
- }
-
-
public LDAPExpr parse( String strExpr ) throws LDAPParseException
{