aceunit-commit Mailing List for AceUnit (Page 15)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 233
          http://aceunit.svn.sourceforge.net/aceunit/?rev=233&view=rev
Author:   christianhujer
Date:     2007-11-30 14:08:07 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
[ 1841588 ] More than 1 Fixture: Fixture elements cause linker conflicts

Modified Paths:
--------------
    trunk/src/java/src/prj/net/sf/aceunit/Fixture.java
    trunk/src/java/src/prj/net/sf/aceunit/MethodList.java

Added Paths:
-----------
    trunk/src/native/test/twoFixtures/
    trunk/src/native/test/twoFixtures/Fixture1.c
    trunk/src/native/test/twoFixtures/Fixture2.c
    trunk/src/native/test/twoFixtures/Makefile
    trunk/src/native/test/twoFixtures/RunTest.c

Modified: trunk/src/java/src/prj/net/sf/aceunit/Fixture.java
===================================================================

--- trunk/src/java/src/prj/net/sf/aceunit/Fixture.java	2007-11-26 22:56:51 UTC (rev 232)
+++ trunk/src/java/src/prj/net/sf/aceunit/Fixture.java	2007-11-30 22:08:07 UTC (rev 233)
@@ -159,7 +159,7 @@
     public String getTestMethodIds() {
         final Formatter out = new Formatter();
         out.format("/** The test case ids of this fixture. */%n");
-        out.format("TestCaseId_t testId[] = {%n");
+        out.format("static TestCaseId_t testId[] = {%n");
         out.format("#if defined(ACEUNIT_EMBEDDED)%n");
         int methodCount = 0;
         final String formatString = String.format("    %%%dd, //%%s%%n", (int) (Math.log10(testMethods.size()) + 1));

Modified: trunk/src/java/src/prj/net/sf/aceunit/MethodList.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/MethodList.java	2007-11-26 22:56:51 UTC (rev 232)
+++ trunk/src/java/src/prj/net/sf/aceunit/MethodList.java	2007-11-30 22:08:07 UTC (rev 233)
@@ -174,7 +174,7 @@
     public String getFunctionPointerList() {
         final Formatter out = new Formatter();
         out.format("/** The %s of this fixture. */%n", title);
-        out.format("testMethod_t %s[] = {%n", symName);
+        out.format("static testMethod_t %s[] = {%n", symName);
         for (final String method : this) {
             out.format("    &%s,%n", method);
         }

Added: trunk/src/native/test/twoFixtures/Fixture1.c
===================================================================
--- trunk/src/native/test/twoFixtures/Fixture1.c	                        (rev 0)
+++ trunk/src/native/test/twoFixtures/Fixture1.c	2007-11-30 22:08:07 UTC (rev 233)
@@ -0,0 +1,43 @@
+/* Copyright (c) 2007, Christian Hujer
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the AceUnit developers nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** Unit Test for AceUnit.
+ * Yes, AceUnit can be tested using itself.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @file AceUnitTest.c
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#define ACEUNIT_ASSERTION_STYLE ACEUNIT_ASSERTION_STYLE_RETURN
+
+#include "Fixture1.h"
+
+/** Empty Test Case. Just used for testing whether two fixtures work. */
+A_Test void testFromFixture1() {
+}


Property changes on: trunk/src/native/test/twoFixtures/Fixture1.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/src/native/test/twoFixtures/Fixture2.c
===================================================================
--- trunk/src/native/test/twoFixtures/Fixture2.c	                        (rev 0)
+++ trunk/src/native/test/twoFixtures/Fixture2.c	2007-11-30 22:08:07 UTC (rev 233)
@@ -0,0 +1,43 @@
+/* Copyright (c) 2007, Christian Hujer
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the AceUnit developers nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** Unit Test for AceUnit.
+ * Yes, AceUnit can be tested using itself.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @file AceUnitTest.c
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#define ACEUNIT_ASSERTION_STYLE ACEUNIT_ASSERTION_STYLE_RETURN
+
+#include "Fixture2.h"
+
+/** Empty Test Case. Just used for testing whether two fixtures work. */
+A_Test void testFromFixture2() {
+}


Property changes on: trunk/src/native/test/twoFixtures/Fixture2.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/src/native/test/twoFixtures/Makefile
===================================================================
--- trunk/src/native/test/twoFixtures/Makefile	                        (rev 0)
+++ trunk/src/native/test/twoFixtures/Makefile	2007-11-30 22:08:07 UTC (rev 233)
@@ -0,0 +1,62 @@
+LOGGER=FullPlainLogger
+#LOGGER=MiniRamLogger
+
+ACE_UNIT_FILES=AceUnit.c AceUnit.h AceUnitData.c AceUnitAnnotations.h AceUnitLogging.h $(LOGGER).c AceUnit.jar
+
+ACE_UNIT_PATH=../../../
+
+ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+
+FIXTURE_NAMES=Fixture1 Fixture2
+
+FIXTURE_HEADERS=$(addsuffix .h, $(FIXTURE_NAMES))
+FIXTURE_SOURCES=$(addsuffix .c, $(FIXTURE_NAMES))
+
+all: prepare compile test
+
+clean:
+	rm -f $(ACE_UNIT_FILES) $(FIXTURE_HEADERS) runTests *.gcov *.gcno *.gcda
+
+prepare: $(ACE_UNIT_FILES)
+
+AceUnit.c: $(ACE_UNIT_PATH)/native/AceUnit.c
+	cp $< $@
+
+AceUnit.h: $(ACE_UNIT_PATH)/native/AceUnit.h
+	cp $< $@
+
+AceUnitData.c: $(ACE_UNIT_PATH)/native/AceUnitData.c
+	cp $< $@
+
+AceUnitAnnotations.h: $(ACE_UNIT_PATH)/native/AceUnitAnnotations.h
+	cp $< $@
+
+AceUnitLogging.h: $(ACE_UNIT_PATH)/native/AceUnitLogging.h
+	cp $< $@
+
+$(LOGGER).c: $(ACE_UNIT_PATH)/native/$(LOGGER).c
+	cp $< $@
+
+AceUnit.jar: $(ACE_UNIT_PATH)/java/AceUnit.jar
+	cp $(ACE_UNIT_PATH)/java/AceUnit.jar $@
+
+$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
+	ant -f $(ACE_UNIT_PATH)/java/build.xml
+
+compile: runTests
+
+%.h: %.c AceUnit.jar
+	java -jar AceUnit.jar .
+
+runTests: $(FIXTURE_SOURCES) $(FIXTURE_HEADERS) $(ACE_UNIT_FILES)
+	$(CC) -std=c89 -pedantic -fprofile-arcs -ftest-coverage -Wall -g -o runTests *.c
+#	$(CC) -std=c89 -pedantic -fprofile-arcs -ftest-coverage -Wall -g -DACEUNIT_EMBEDDED -o runTests *.c
+
+test: runTests
+	./runTests
+
+doc: $(FIXTURE_SOURCES).c $(FIXTURE_HEADERS).h $(ACE_UNIT_FILES)
+	doxygen
+
+coverage: test
+	gcov *.c


Property changes on: trunk/src/native/test/twoFixtures/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF

Added: trunk/src/native/test/twoFixtures/RunTest.c
===================================================================
--- trunk/src/native/test/twoFixtures/RunTest.c	                        (rev 0)
+++ trunk/src/native/test/twoFixtures/RunTest.c	2007-11-30 22:08:07 UTC (rev 233)
@@ -0,0 +1,62 @@
+/* Copyright (c) 2007, Christian Hujer
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the AceUnit developers nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** Unit Test for AceUnit.
+ * Yes, AceUnit can be tested using itself.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @file AceUnitTest.c
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#define ACEUNIT_ASSERTION_STYLE ACEUNIT_ASSERTION_STYLE_RETURN
+
+#include "AceUnit.h"
+
+extern TestFixture_t Fixture1Fixture;
+extern TestFixture_t Fixture2Fixture;
+
+/** Run the tests.
+ * @note This is only here temporarily.
+ * @note Command line arguments currently are ignored.
+ * In future versions, this part will be auto-generated.
+ * @param argc Command line argument count.
+ * @param argv Command line argument values.
+ * @return Exit status (currently always 0).
+ */
+int main(int argc, char *argv[]) {
+    extern uint16_t testCaseCount;
+    extern uint16_t testCaseFailureCount;
+    runFixture(&Fixture1Fixture);
+    runFixture(&Fixture2Fixture);
+    if (testCaseFailureCount != 0) {
+        fprintf(stderr, "Test Cases: %d  Errors: %d\n", testCaseCount, testCaseFailureCount);
+        return 1;
+    }
+    return 0;
+}


Property changes on: trunk/src/native/test/twoFixtures/RunTest.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (139)	Nov (77)	Dec (32)
2008	Jan (55)	Feb (11)	Mar (3)	Apr	May	Jun	Jul	Aug	Sep (9)	Oct (75)	Nov (57)	Dec (21)
2009	Jan (14)	Feb (1)	Mar	Apr	May	Jun (1)	Jul	Aug (24)	Sep (11)	Oct (1)	Nov	Dec
2011	Jan	Feb (21)	Mar (10)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (3)

aceunit-commit Mailing List for AceUnit (Page 15)

aceunit-commit — svn commit digest list (high traffic)