Update the build script to ensure that checkstyle is run on the unit tests ...

neil_a_wilson

01.16.2006 58176910ab6c1b65631481f50a1ad31cc17c35e0

Update the build script to ensure that checkstyle is run on the unit tests and
functional/integration tests.  At the present time, this includes only ensuring
that the CDDL header is included at the top of the file.  It also updates three
integration test source files to add a missing line break in the CDDL header.

 opends/build.xml

@@ -56,6 +56,12 @@
  <property name="unittest.report.dir"
       location="${build.dir}/unit-tests/report"/>

  <!-- Properties for use in functional/integration testing.  -->
  <property name="functest.testng.dir"
       location="tests/integration-tests-testng" />
  <property name="functest.testng.src.dir"
    location="${functest.testng.dir}/src"/>

  <!-- Properties for use with the DSML component.                      -->
  <property name="dsml.dir"         location="resource/dsml"             />
  <property name="dsml.src.dir"     location="src/dsml"                  />
@@ -221,6 +227,18 @@
           includes="**/*.java" />
      <formatter type="plain" />
    </checkstyle>

    <checkstyle config="${checkstyle.dir}/opends-unittest-checkstyle.xml"
         failOnViolation="true">
      <fileset dir="${unittest.testng.src.dir}" includes="**/*.java" />
      <formatter type="plain" />
    </checkstyle>

    <checkstyle config="${checkstyle.dir}/opends-functest-checkstyle.xml"
         failOnViolation="true">
      <fileset dir="${functest.testng.src.dir}" includes="**/*.java" />
      <formatter type="plain" />
    </checkstyle>
  </target>


@@ -621,8 +639,7 @@
  
    <target name="integration-tests" 
        description="Builds the integration tests">
        <ant dir="${basedir}/tests/integration-tests-testng">
        </ant>
        <ant dir="${functest.testng.dir}" />
    </target>
        
</project>

 opends/ext/checkstyle/opends-functest-checkstyle.xml

New file
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">


<module name="Checker">
  <module name="TreeWalker">
    <!-- Ensure that each source file starts with the appropriate header -->
    <module name="Header">
      <property name="headerFile" value="${basedir}/ext/checkstyle/opends.sourceheader" />
    </module>
  </module>
</module>


 opends/ext/checkstyle/opends-unittest-checkstyle.xml

New file
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">


<module name="Checker">
  <module name="TreeWalker">
    <!-- Ensure that each source file starts with the appropriate header -->
    <module name="Header">
      <property name="headerFile" value="${basedir}/ext/checkstyle/opends.sourceheader" />
    </module>
  </module>
</module>


 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java

@@ -1,4 +1,5 @@
/* * CDDL HEADER START
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java

@@ -1,4 +1,5 @@
/* * CDDL HEADER START
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java

@@ -1,4 +1,5 @@
/* * CDDL HEADER START
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only