svn commit: r885957 - in /activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool: AmqCppGeneratorTask.java tests/AmqCppTestMarshallingClassesGenerator.java tests/AmqCppTestRegistryGenerator.java

[ta...@apache.org]

Author: tabish
Date: Tue Dec  1 21:52:38 2009
New Revision: 885957

URL: http://svn.apache.org/viewvc?rev=885957&view=rev
Log:
Create a utility class to generate the includes and macro calls to register the tests, these are pasted into the testRegistry.cpp when created.  Remove the addition of the registration macro from the marshaler tests source files.

Added:
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java   (with props)
Modified:
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java?rev=885957&r1=885956&r2=885957&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/AmqCppGeneratorTask.java Tue Dec  1 21:52:38 2009
@@ -25,6 +25,7 @@
 import org.apache.activemq.openwire.tool.marshallers.AmqCppMarshallingHeadersGenerator;
 import org.apache.activemq.openwire.tool.tests.AmqCppTestMarshallingClassesGenerator;
 import org.apache.activemq.openwire.tool.tests.AmqCppTestMarshallingHeadersGenerator;
+import org.apache.activemq.openwire.tool.tests.AmqCppTestRegistryGenerator;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java?rev=885957&r1=885956&r2=885957&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestMarshallingClassesGenerator.java Tue Dec  1 21:52:38 2009
@@ -38,8 +38,6 @@
 out.println("#include <activemq/wireformat/openwire/marshal/v"+getOpenwireVersion()+"/"+super.getTargetClassName(jclass)+".h>");
 out.println("#include <activemq/commands/"+jclass.getSimpleName()+".h>");
 out.println("");
-out.println("CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::v"+getOpenwireVersion()+"::"+className+" );");
-out.println("");
 out.println("#include <activemq/wireformat/openwire/OpenWireFormat.h>");
 out.println("#include <activemq/commands/DataStructure.h>");
 out.println("#include <activemq/commands/MessageId.h>");

Added: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java?rev=885957&view=auto
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java (added)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java Tue Dec  1 21:52:38 2009
@@ -0,0 +1,179 @@
+/**
+ *
+ * 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.activemq.openwire.tool.tests;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.FixCRLF;
+
+/**
+*
+* @version $Revision: 379734 $
+*/
+public class AmqCppTestRegistryGenerator {
+
+    protected String targetDir="./src/test";
+    protected String targetPath;
+
+    private ArrayList<String> headers = new ArrayList<String>();
+
+    private File destDir;
+    private File destFile;
+    private StringBuffer buffer;
+
+    public AmqCppTestRegistryGenerator( String targetPath ) {
+        this.targetPath = targetPath;
+    }
+
+    protected String getFilePostFix() {
+        return ".h";
+    }
+
+    protected String getFilePrefix() {
+        return "testRegistry";
+    }
+
+    public String getTargetDir() {
+        return targetDir;
+    }
+
+    public void setTargetDir( String targetDir ) {
+        this.targetDir = targetDir;
+    }
+
+    /**
+     * Derived classes provide the location of the Makefile.
+     */
+    protected File getDestDir() {
+        return new File( targetDir + "/" + targetPath );
+    }
+
+
+    private void processDirectory( File destDir ) {
+        if( destDir == null ) {
+            throw new IllegalArgumentException("No destDir defined!");
+        }
+
+        File[] files = destDir.listFiles();
+
+        for( File file : files ) {
+
+            if( file.getName().endsWith(".h") ) {
+
+                if( file.getName().startsWith("testRegistry") ) {
+                    continue;
+                }
+
+                headers.add( file.getName() );
+            }
+        }
+    }
+
+    public void run() {
+
+        destDir = getDestDir();
+
+        if( destDir == null ) {
+            throw new IllegalArgumentException("No destDir defined!");
+        }
+
+        // Get all the sources from the dir.
+        processDirectory( destDir );
+
+        System.out.println(getClass().getName() + " generating files in: " + destDir);
+        destDir.mkdirs();
+        buffer = new StringBuffer();
+
+        destFile = new File( destDir, getFilePrefix() + getFilePostFix() );
+
+        PrintWriter out = null;
+        try {
+            out = new PrintWriter(new FileWriter(destFile));
+            generateFile(out);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+        }
+
+        // Use the FixCRLF Ant Task to make sure the file has consistent
+        // newlines so that SVN does not complain on checkin.
+        Project project = new Project();
+        project.init();
+        FixCRLF fixCRLF = new FixCRLF();
+        fixCRLF.setProject(project);
+        fixCRLF.setSrcdir(destFile.getParentFile());
+        fixCRLF.setIncludes(destFile.getName());
+        fixCRLF.execute();
+    }
+
+    protected void generateLicence(PrintWriter out) {
+        out.println("/*");
+        out.println(" * Licensed to the Apache Software Foundation (ASF) under one or more");
+        out.println(" * contributor license agreements.  See the NOTICE file distributed with");
+        out.println(" * this work for additional information regarding copyright ownership.");
+        out.println(" * The ASF licenses this file to You under the Apache License, Version 2.0");
+        out.println(" * (the \"License\"); you may not use this file except in compliance with");
+        out.println(" * the License.  You may obtain a copy of the License at");
+        out.println(" *");
+        out.println(" * http://www.apache.org/licenses/LICENSE-2.0");
+        out.println(" *");
+        out.println(" * Unless required by applicable law or agreed to in writing, software");
+        out.println(" * distributed under the License is distributed on an \"AS IS\" BASIS,");
+        out.println(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.");
+        out.println(" * See the License for the specific language governing permissions and");
+        out.println(" * limitations under the License.");
+        out.println(" */");
+    }
+
+    protected void generateFile(PrintWriter out) {
+        generateLicence(out);
+
+        String ifdef = "_" + targetPath.replaceAll( File.separator, "_" ).toUpperCase() + "_TESTREGISTRY_H_";
+
+        out.println("");
+        out.println("#ifndef " + ifdef );
+        out.println("#define " + ifdef );
+
+        // Put the file lists in alphabetical order.
+        Collections.sort( headers );
+
+        out.println("");
+
+        for( String header : headers ) {
+
+            String fileName = targetPath + "/" + header;
+
+            out.println("#include <" + fileName + ">");
+
+            String testName = fileName.replaceAll( File.separator, "::" );
+
+            out.println("CPPUNIT_TEST_SUITE_REGISTRATION( " + testName.substring( 0, testName.length() - 2 ) + " );");
+        }
+
+        out.println("");
+        out.println("#endif // " + ifdef );
+    }
+}

Propchange: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/tests/AmqCppTestRegistryGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native