You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by ad...@apache.org on 2009/11/08 16:59:08 UTC
svn commit: r833889 - in /labs/dungeon/trunk: ./ asn1-compiler/
asn1-compiler/src/main/antlr/
asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/
asn1-compiler/src/test/java/org/apache/asn1/compiler/
asn1-compiler/src/test/java/org/apac...
Author: adc
Date: Sun Nov 8 15:59:07 2009
New Revision: 833889
URL: http://svn.apache.org/viewvc?rev=833889&view=rev
Log:
Cleanup and dustoff
Added:
labs/dungeon/trunk/perl/
labs/dungeon/trunk/perl/pom.xml (with props)
labs/dungeon/trunk/perl/src/
labs/dungeon/trunk/perl/src/main/
labs/dungeon/trunk/perl/src/main/java/
labs/dungeon/trunk/perl/src/main/resources/
labs/dungeon/trunk/perl/src/test/
labs/dungeon/trunk/perl/src/test/java/
labs/dungeon/trunk/perl/src/test/resources/
labs/dungeon/trunk/python/
labs/dungeon/trunk/python/pom.xml (with props)
labs/dungeon/trunk/python/src/
labs/dungeon/trunk/python/src/main/
labs/dungeon/trunk/python/src/main/java/
labs/dungeon/trunk/python/src/main/resources/
labs/dungeon/trunk/python/src/test/
labs/dungeon/trunk/python/src/test/java/
labs/dungeon/trunk/python/src/test/resources/
labs/dungeon/trunk/ruby/
labs/dungeon/trunk/ruby/pom.xml (with props)
labs/dungeon/trunk/ruby/src/
labs/dungeon/trunk/ruby/src/main/
labs/dungeon/trunk/ruby/src/main/java/
labs/dungeon/trunk/ruby/src/main/resources/
labs/dungeon/trunk/ruby/src/test/
labs/dungeon/trunk/ruby/src/test/java/
labs/dungeon/trunk/ruby/src/test/resources/
Modified:
labs/dungeon/trunk/asn1-compiler/pom.xml
labs/dungeon/trunk/asn1-compiler/src/main/antlr/asn1.g
labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/Environment.java
labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/ParseStage.java
labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/CompilerTest.java
labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/stages/parser/ASN1SyntaxTest.java
labs/dungeon/trunk/asn1-gen-c/pom.xml
labs/dungeon/trunk/asn1-gen-cplus/pom.xml
labs/dungeon/trunk/asn1-gen-csharp/pom.xml
labs/dungeon/trunk/asn1-gen-java/pom.xml
labs/dungeon/trunk/asn1-runtime/pom.xml
labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/encoding/EncodingFactoryTest.java
labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/runtime/ASN1ObjectIdentifierTest.java
labs/dungeon/trunk/pom.xml
Modified: labs/dungeon/trunk/asn1-compiler/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/pom.xml (original)
+++ labs/dungeon/trunk/asn1-compiler/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,13 +9,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-compiler</artifactId>
- <name>Apache ASN1 Compiler :: compiler</name>
+ <name>Apache ASN1 Compiler :: Compiler</name>
<packaging>jar</packaging>
<build>
-
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antlr-plugin</artifactId>
@@ -31,20 +29,7 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <includes>
- <include implementation="java.lang.String">**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
-
</plugins>
-
</build>
<dependencies>
@@ -66,25 +51,4 @@
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: labs/dungeon/trunk/asn1-compiler/src/main/antlr/asn1.g
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/src/main/antlr/asn1.g?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/src/main/antlr/asn1.g (original)
+++ labs/dungeon/trunk/asn1-compiler/src/main/antlr/asn1.g Sun Nov 8 15:59:07 2009
@@ -1,6 +1,5 @@
header {
/**
- *
* 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.
Modified: labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/Environment.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/Environment.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/Environment.java (original)
+++ labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/Environment.java Sun Nov 8 15:59:07 2009
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.apache.asn1.compiler.stages.parser.x680.Module;
@@ -29,7 +30,7 @@
public class Environment
{
- private ArrayList modules = new ArrayList();
+ private List<Module> modules = new ArrayList<Module>();
public void addModule( Module module )
{
Modified: labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/ParseStage.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/ParseStage.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/ParseStage.java (original)
+++ labs/dungeon/trunk/asn1-compiler/src/main/java/org/apache/asn1/compiler/stages/parser/ParseStage.java Sun Nov 8 15:59:07 2009
@@ -37,15 +37,15 @@
*/
public class ParseStage implements Stage
{
- private final static String className = ParseStage.class.toString();
- private final static Logger log = Logger.getLogger( className );
+ private final static String CLASS_NAME = ParseStage.class.toString();
+ private final static Logger LOGGER = Logger.getLogger( CLASS_NAME );
public static final String SRC_URI = "org.apache.asn1.compiler.stages.parser.SRC_URI";
public static final String ENVIRONMENT = "org.apache.asn1.compiler.stages.parser.ENVIRONMENT";
public void process( Map environment ) throws ProcessException
{
- log.entering( className, "process", environment );
+ LOGGER.entering( CLASS_NAME, "process", environment );
try
{
@@ -75,7 +75,7 @@
}
finally
{
- log.exiting( className, "process" );
+ LOGGER.exiting( CLASS_NAME, "process" );
}
}
}
Modified: labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/CompilerTest.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/CompilerTest.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/CompilerTest.java (original)
+++ labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/CompilerTest.java Sun Nov 8 15:59:07 2009
@@ -20,7 +20,9 @@
import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.apache.asn1.compiler.stages.codegen.CodeGeneratorStage;
import org.apache.asn1.compiler.stages.parser.ParseStage;
@@ -29,10 +31,11 @@
/**
* @version $Revision: 531147 $ $Date: $
*/
-public class CompilerTest extends TestCase
+public class CompilerTest
{
- private String basedir;
+ private static String basedir;
+ @Test
public void testLDAP() throws Exception
{
Compiler compiler = new Compiler();
@@ -46,6 +49,7 @@
compiler.compile( environment );
}
+ @Test
public void testSPNEGO() throws Exception
{
Compiler compiler = new Compiler();
@@ -58,6 +62,7 @@
compiler.compile( environment );
}
+ @Test
public void testNBAP() throws Exception
{
Compiler compiler = new Compiler();
@@ -70,7 +75,8 @@
compiler.compile( environment );
}
- public void setUp() throws Exception
+ @BeforeClass
+ public static void setUp() throws Exception
{
File file = new File( System.getProperty( "basedir" ), "./target/test-code" );
file.mkdirs();
Modified: labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/stages/parser/ASN1SyntaxTest.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/stages/parser/ASN1SyntaxTest.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/stages/parser/ASN1SyntaxTest.java (original)
+++ labs/dungeon/trunk/asn1-compiler/src/test/java/org/apache/asn1/compiler/stages/parser/ASN1SyntaxTest.java Sun Nov 8 15:59:07 2009
@@ -20,7 +20,8 @@
import java.io.File;
import java.io.FileReader;
import java.io.StringReader;
-import junit.framework.TestCase;
+
+import org.junit.Test;
import org.apache.asn1.compiler.parser.ASN1Lexer;
import org.apache.asn1.compiler.parser.ASN1Parser;
@@ -29,9 +30,9 @@
/**
* @version $Revision: 531142 $ $Date: $
*/
-public class ASN1SyntaxTest extends TestCase
+public class ASN1SyntaxTest
{
-
+ @Test
public void testModules() throws Exception
{
Environment env = getParser( "FOOBAR DEFINITIONS ::= BEGIN BSTRING ::= BIT STRING END" ).compile();
@@ -40,9 +41,10 @@
getParser( "FOOBAR { dOOBAR dd(2) 2 } DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::= BEGIN BSTRING ::= BIT STRING END" ).module_definition();
- env = getParser( new File( Thread.currentThread().getContextClassLoader().getResource( "./ldap.asn1" ).getFile() ) ).compile();
+ getParser( new File( Thread.currentThread().getContextClassLoader().getResource( "./ldap.asn1" ).getFile() ) ).compile();
}
+ @Test
public void testTypeAssignment() throws Exception
{
getParser( "BSTRING ::= BIT STRING" ).type_assignment_test();
@@ -50,6 +52,7 @@
getParser( "BSTRING ::= BOOLEAN" ).type_assignment_test();
}
+ @Test
public void testModuleReference() throws Exception
{
getParser( "FOOBAR" ).module_reference();
@@ -57,6 +60,7 @@
getParser( "D-C" ).module_reference();
}
+ @Test
public void testNumber() throws Exception
{
getParser( "1.0" ).number();
Modified: labs/dungeon/trunk/asn1-gen-c/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-gen-c/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-gen-c/pom.xml (original)
+++ labs/dungeon/trunk/asn1-gen-c/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-gen-c</artifactId>
- <name>Apache ASN1 Compiler :: C generator</name>
+ <name>Apache ASN1 Compiler :: C Generator</name>
<packaging>jar</packaging>
@@ -22,25 +22,4 @@
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: labs/dungeon/trunk/asn1-gen-cplus/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-gen-cplus/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-gen-cplus/pom.xml (original)
+++ labs/dungeon/trunk/asn1-gen-cplus/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-gen-cplus</artifactId>
- <name>Apache ASN1 Compiler :: C++ generator</name>
+ <name>Apache ASN1 Compiler :: C++ Generator</name>
<packaging>jar</packaging>
@@ -21,24 +21,5 @@
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
+
</project>
Modified: labs/dungeon/trunk/asn1-gen-csharp/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-gen-csharp/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-gen-csharp/pom.xml (original)
+++ labs/dungeon/trunk/asn1-gen-csharp/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-gen-csharp</artifactId>
- <name>Apache ASN1 Compiler :: C# generator</name>
+ <name>Apache ASN1 Compiler :: C# Generator</name>
<packaging>jar</packaging>
@@ -22,25 +22,4 @@
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: labs/dungeon/trunk/asn1-gen-java/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-gen-java/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-gen-java/pom.xml (original)
+++ labs/dungeon/trunk/asn1-gen-java/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-gen-java</artifactId>
- <name>Apache ASN1 Compiler :: Java generator</name>
+ <name>Apache ASN1 Compiler :: Java Generator</name>
<packaging>jar</packaging>
@@ -22,25 +22,4 @@
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: labs/dungeon/trunk/asn1-runtime/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-runtime/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-runtime/pom.xml (original)
+++ labs/dungeon/trunk/asn1-runtime/pom.xml Sun Nov 8 15:59:07 2009
@@ -9,50 +9,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-runtime</artifactId>
- <name>Apache ASN1 Compiler :: runtime</name>
+ <name>Apache ASN1 Compiler :: Runtime</name>
<packaging>jar</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgument>-Xlint:all,-serial,-unchecked</compilerArgument>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- </plugins>
- </reporting>
+ <build/>
</project>
Modified: labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/encoding/EncodingFactoryTest.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/encoding/EncodingFactoryTest.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/encoding/EncodingFactoryTest.java (original)
+++ labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/encoding/EncodingFactoryTest.java Sun Nov 8 15:59:07 2009
@@ -19,11 +19,15 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+
import com.acme.spnego.MechType;
import com.acme.spnego.MechTypeList;
import com.acme.spnego.NegTokenInit;
import com.acme.spnego.NegotiationToken;
-import junit.framework.TestCase;
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.apache.asn1.encoding.Decoder;
import org.apache.asn1.encoding.Encoder;
@@ -37,19 +41,20 @@
/**
* @version $Revision: 531147 $ $Date: $
*/
-public class EncodingFactoryTest extends TestCase
+public class EncodingFactoryTest
{
public final static TestOID KERBEROS_V5_LEGACY = new TestOID( "1.2.840.48018.1.2.2" );
- public final static byte[] header = new byte[]{(byte) 0xa0, (byte) 0x82, (byte) 0x05, (byte) 0xd8,
- (byte) 0x30, (byte) 0x82, (byte) 0x05, (byte) 0xd4,
- (byte) 0xA0, (byte) 0x18,
- (byte) 0x30, (byte) 0x16,
- (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x82, (byte) 0xf7, (byte) 0x12, (byte) 0x01, (byte) 0x02, (byte) 0x02,
- (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x12, (byte) 0x01, (byte) 0x02, (byte) 0x02,
- (byte) 0xA2, (byte) 0x82, (byte) 0x05, (byte) 0xb6,
- (byte) 0x04, (byte) 0x82, (byte) 0x05, (byte) 0xb2};
+ public final static byte[] header = new byte[]{(byte)0xa0, (byte)0x82, (byte)0x05, (byte)0xd8,
+ (byte)0x30, (byte)0x82, (byte)0x05, (byte)0xd4,
+ (byte)0xA0, (byte)0x18,
+ (byte)0x30, (byte)0x16,
+ (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86, (byte)0x48, (byte)0x82, (byte)0xf7, (byte)0x12, (byte)0x01, (byte)0x02, (byte)0x02,
+ (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7, (byte)0x12, (byte)0x01, (byte)0x02, (byte)0x02,
+ (byte)0xA2, (byte)0x82, (byte)0x05, (byte)0xb6,
+ (byte)0x04, (byte)0x82, (byte)0x05, (byte)0xb2};
+ @Test
public void testGetEncoder() throws Exception
{
Encoder encoder = EncodingFactory.getEncoder( "ber", NegotiationToken.class );
@@ -58,6 +63,7 @@
assertSame( encoder, encoderCopy );
}
+ @Test
public void testNegotiationTokenEncoding() throws Exception
{
Encoder encoder = EncodingFactory.getEncoder( "ber", NegotiationToken.class );
@@ -89,6 +95,7 @@
}
}
+ @Test
public void testGetDecoder() throws Exception
{
Decoder decoder = EncodingFactory.getDecoder( "ber", NegotiationToken.class );
@@ -98,6 +105,7 @@
assertSame( decoder, decoderCopy );
}
+ @Test
public void testNegotiationTokenDecoding() throws Exception
{
Decoder decoder = EncodingFactory.getDecoder( "ber", NegotiationToken.class );
@@ -107,7 +115,8 @@
ASN1Type result = decoder.decode( new ByteArrayInputStream( message ) );
}
- public void setUp()
+ @BeforeClass
+ public static void setUp()
{
EncodingFactory.register( new EncodingFactoryDefault( "ber" ) );
}
Modified: labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/runtime/ASN1ObjectIdentifierTest.java
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/runtime/ASN1ObjectIdentifierTest.java?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/runtime/ASN1ObjectIdentifierTest.java (original)
+++ labs/dungeon/trunk/asn1-runtime/src/test/java/org/apache/asn1/test/runtime/ASN1ObjectIdentifierTest.java Sun Nov 8 15:59:07 2009
@@ -17,7 +17,10 @@
*/
package org.apache.asn1.test.runtime;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Test;
import org.apache.asn1.runtime.ASN1ObjectIdentifier;
@@ -25,9 +28,9 @@
/**
* @version $Revision: 531147 $ $Date: $
*/
-public class ASN1ObjectIdentifierTest extends TestCase
+public class ASN1ObjectIdentifierTest
{
-
+ @Test
public void testStringConstructor() throws Exception
{
ASN1ObjectIdentifier oid = new ASN1ObjectIdentifier( "1.3.6.1.5.5.2" );
@@ -44,14 +47,15 @@
try
{
- oid = new ASN1ObjectIdentifier( "1.34e.42.5" );
+ new ASN1ObjectIdentifier( "1.34e.42.5" );
fail( "Misformated OID should have caused a NumberFormatException" );
}
- catch ( NumberFormatException nfe )
+ catch (NumberFormatException nfe)
{
}
}
+ @Test
public void testArrayConstructor() throws Exception
{
ASN1ObjectIdentifier oid = new ASN1ObjectIdentifier( new int[]{1, 3, 6, 1, 5, 5, 2} );
@@ -67,6 +71,7 @@
assertEquals( 2, oid.getId( 6 ) );
}
+ @Test
public void testCopyConstructor() throws Exception
{
ASN1ObjectIdentifier oid1 = new ASN1ObjectIdentifier( new int[]{1, 3, 6, 1, 5, 5, 2} );
@@ -83,6 +88,7 @@
assertEquals( 2, oid2.getId( 6 ) );
}
+ @Test
public void testCopyArrayConstructor() throws Exception
{
ASN1ObjectIdentifier oid1 = new ASN1ObjectIdentifier( new int[]{1, 3, 6, 1, 5, 5, 2} );
Added: labs/dungeon/trunk/perl/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/perl/pom.xml?rev=833889&view=auto
==============================================================================
--- labs/dungeon/trunk/perl/pom.xml (added)
+++ labs/dungeon/trunk/perl/pom.xml Sun Nov 8 15:59:07 2009
@@ -0,0 +1,25 @@
+<project>
+
+ <parent>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-gen-perl</artifactId>
+ <name>Apache ASN1 Compiler :: Perl Generator</name>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-compiler</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: labs/dungeon/trunk/perl/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: labs/dungeon/trunk/perl/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: labs/dungeon/trunk/perl/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: labs/dungeon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/pom.xml?rev=833889&r1=833888&r2=833889&view=diff
==============================================================================
--- labs/dungeon/trunk/pom.xml (original)
+++ labs/dungeon/trunk/pom.xml Sun Nov 8 15:59:07 2009
@@ -105,6 +105,9 @@
<module>asn1-gen-cplus</module>
<module>asn1-gen-csharp</module>
<module>asn1-gen-java</module>
+ <module>perl</module>
+ <module>python</module>
+ <module>ruby</module>
<module>asn1-maven-plugin</module>
</modules>
@@ -147,7 +150,8 @@
</organization>
<properties>
- <mavenVersion>2.0.6</mavenVersion>
+ <asn1Version>1.0-SNAPSHOT</asn1Version>
+ <mavenVersion>2.2.0</mavenVersion>
</properties>
<dependencyManagement>
@@ -156,19 +160,19 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-runtime</artifactId>
- <version>${version}</version>
+ <version>${asn1Version}</version>
</dependency>
<dependency>
<groupId>org.apache.asn1</groupId>
<artifactId>asn1-compiler</artifactId>
- <version>${version}</version>
+ <version>${asn1Version}</version>
</dependency>
<dependency>
@@ -184,12 +188,6 @@
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
<version>1.5.3</version>
@@ -219,7 +217,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
Added: labs/dungeon/trunk/python/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/python/pom.xml?rev=833889&view=auto
==============================================================================
--- labs/dungeon/trunk/python/pom.xml (added)
+++ labs/dungeon/trunk/python/pom.xml Sun Nov 8 15:59:07 2009
@@ -0,0 +1,25 @@
+<project>
+
+ <parent>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-gen-python</artifactId>
+ <name>Apache ASN1 Compiler :: Python Generator</name>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-compiler</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: labs/dungeon/trunk/python/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: labs/dungeon/trunk/python/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: labs/dungeon/trunk/python/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: labs/dungeon/trunk/ruby/pom.xml
URL: http://svn.apache.org/viewvc/labs/dungeon/trunk/ruby/pom.xml?rev=833889&view=auto
==============================================================================
--- labs/dungeon/trunk/ruby/pom.xml (added)
+++ labs/dungeon/trunk/ruby/pom.xml Sun Nov 8 15:59:07 2009
@@ -0,0 +1,25 @@
+<project>
+
+ <parent>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-gen-ruby</artifactId>
+ <name>Apache ASN1 Compiler :: Ruby Generator</name>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.asn1</groupId>
+ <artifactId>asn1-compiler</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: labs/dungeon/trunk/ruby/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: labs/dungeon/trunk/ruby/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: labs/dungeon/trunk/ruby/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org