aceunit-commit Mailing List for AceUnit (Page 5)
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
aceunit-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 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) |
|
From: <chr...@us...> - 2008-12-03 09:08:51
|
Revision: 483
http://aceunit.svn.sourceforge.net/aceunit/?rev=483&view=rev
Author: christianhujer
Date: 2008-12-03 09:08:48 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Protect generated suites from causing footprint without ACEUNIT_SUITES being enabled.
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/Pckg.java
Modified: trunk/src/java/src/prj/net/sf/aceunit/Pckg.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/Pckg.java 2008-12-03 08:54:00 UTC (rev 482)
+++ trunk/src/java/src/prj/net/sf/aceunit/Pckg.java 2008-12-03 09:08:48 UTC (rev 483)
@@ -81,12 +81,10 @@
out.format(" * @file %s.h%n", basename);
out.format(" */%n");
out.format("%n");
- out.format("#ifdef ACEUNIT_CONFIG_FILE%n");
- out.format("#include ACEUNIT_CONFIG_FILE%n");
- out.format("#endif%n");
- out.format("%n");
out.format("#include \"AceUnit.h\"%n");
out.format("%n");
+ out.format("#ifdef ACEUNIT_SUITES%n");
+ out.format("%n");
for (final Suite suite : suites) {
out.format("extern TestSuite_t %s;%n", suite.getGlobalVariablename());
}
@@ -108,6 +106,8 @@
out.format("#endif%n");
out.format(" suitesOf%d%n", getId());
out.format("};%n");
+ out.format("%n");
+ out.format("#endif%n");
return out.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:54:01
|
Revision: 482
http://aceunit.svn.sourceforge.net/aceunit/?rev=482&view=rev
Author: christianhujer
Date: 2008-12-03 08:54:00 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Fixed bug: Clean didn't clean everything.
Modified Paths:
--------------
trunk/src/native/test/common.mak
Modified: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak 2008-12-03 08:49:03 UTC (rev 481)
+++ trunk/src/native/test/common.mak 2008-12-03 08:54:00 UTC (rev 482)
@@ -12,7 +12,7 @@
GENERATED:=$(shell java -jar $(ACEUNIT_JAVA_PATH)/AceUnit.jar --print=generated .)
SUITES=$(filter *.c,$(GENERATED))
SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS)) $(addsuffix .o,$(MAIN))
DEPENDS=$(OBJECTS:.o=.d)
LINTOUTS=$(OBJECTS:.o=.ln)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:49:07
|
Revision: 481
http://aceunit.svn.sourceforge.net/aceunit/?rev=481&view=rev
Author: christianhujer
Date: 2008-12-03 08:49:03 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Protect AceUnitMain.c against being used without ACEUNIT_SUITES.
Modified Paths:
--------------
trunk/src/native/AceUnitMain.c
Modified: trunk/src/native/AceUnitMain.c
===================================================================
--- trunk/src/native/AceUnitMain.c 2008-12-03 08:46:41 UTC (rev 480)
+++ trunk/src/native/AceUnitMain.c 2008-12-03 08:49:03 UTC (rev 481)
@@ -29,6 +29,10 @@
#include "AceUnitData.h"
#include <stdio.h>
+#ifndef ACEUNIT_SUITES
+#error Requires ACEUNIT_SUITES
+#endif
+
/** Main program for running AceUnit tests.
* Invokes the runner.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:46:50
|
Revision: 480
http://aceunit.svn.sourceforge.net/aceunit/?rev=480&view=rev
Author: christianhujer
Date: 2008-12-03 08:46:41 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Change recursive to use AceUnitMain.c instead of its own RunTests.c.
Modified Paths:
--------------
trunk/src/native/test/recursive/Makefile
Removed Paths:
-------------
trunk/src/native/test/recursive/RunTests.c
Modified: trunk/src/native/test/recursive/Makefile
===================================================================
--- trunk/src/native/test/recursive/Makefile 2008-12-03 08:43:40 UTC (rev 479)
+++ trunk/src/native/test/recursive/Makefile 2008-12-03 08:46:41 UTC (rev 480)
@@ -1 +1,2 @@
+MAIN=AceUnitMain
include ../common.mak
Deleted: trunk/src/native/test/recursive/RunTests.c
===================================================================
--- trunk/src/native/test/recursive/RunTests.c 2008-12-03 08:43:40 UTC (rev 479)
+++ trunk/src/native/test/recursive/RunTests.c 2008-12-03 08:46:41 UTC (rev 480)
@@ -1,68 +0,0 @@
-/* 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.
- */
-
-/** Main program for testing AceUnit's recursive behaviour.
- * @file TestMain.c
- */
-
-#include "AceUnit.h"
-#include "AceUnitData.h"
-#include <stdio.h>
-
-/** The number of test cases contained in this fixture.
- * This is used to verify that the number of executed test cases is correct.
- */
-#define TEST_CASES_FOR_VERIFICATION 8
-
-/** The number of failed test cases. */
-extern uint16_t testCaseFailureCount;
-
-/** Prototype for running a suite.
- * @param suite Suite to run.
- */
-extern void runSuite(const TestSuite_t *const suite);
-
-extern TestSuite_t suite1;
-
-/** Main program.
- * @return Exit status.
- * @retval 0 if all tests ran successfully.
- * @retval 1 if there were test errors or failures.
- */
-int main(void) {
- int retVal = 0;
- runSuite(&suite1);
- if (runnerData->testCaseFailureCount != 0) {
- fprintf(stderr, "Error: %d test cases failed.\n", (int) runnerData->testCaseFailureCount);
- retVal = 1;
- }
- if (runnerData->testCaseCount != TEST_CASES_FOR_VERIFICATION) {
- fprintf(stderr, "Test Cases: %d but expected %d\n", runnerData->testCaseCount, TEST_CASES_FOR_VERIFICATION);
- retVal = 1;
- }
- return retVal;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:43:43
|
Revision: 479
http://aceunit.svn.sourceforge.net/aceunit/?rev=479&view=rev
Author: christianhujer
Date: 2008-12-03 08:43:40 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Allow tests to specify their own main.
Modified Paths:
--------------
trunk/src/native/test/common.mak
Modified: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak 2008-12-03 08:41:55 UTC (rev 478)
+++ trunk/src/native/test/common.mak 2008-12-03 08:43:40 UTC (rev 479)
@@ -1,5 +1,6 @@
LOGGER?=FullPlainLogger
CVERSION?=c89
+MAIN?=RunTests
ACEUNIT_NATIVE_PATH=../..
ACEUNIT_JAVA_PATH=../../../java
@@ -27,7 +28,7 @@
all: test
-RunTests: $(OBJECTS)
+$(MAIN): $(OBJECTS)
$(ACEUNIT_JAVA_PATH)/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
ant -f $(ACEUNIT_JAVA_PATH)/build.xml
@@ -38,11 +39,11 @@
coverage: test
gcov *.c
-test: RunTests
- ./RunTests
+test: $(MAIN)
+ ./$(MAIN)
clean:
- rm -f $(OBJECTS) $(GENERATED) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda)
+ rm -f $(OBJECTS) $(GENERATED) $(DEPENDS) $(MAIN) $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda)
lint: $(LINTOUTS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:42:00
|
Revision: 478
http://aceunit.svn.sourceforge.net/aceunit/?rev=478&view=rev
Author: christianhujer
Date: 2008-12-03 08:41:55 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Added generic main program.
Added Paths:
-----------
trunk/src/native/AceUnitMain.c
Added: trunk/src/native/AceUnitMain.c
===================================================================
--- trunk/src/native/AceUnitMain.c (rev 0)
+++ trunk/src/native/AceUnitMain.c 2008-12-03 08:41:55 UTC (rev 478)
@@ -0,0 +1,79 @@
+/* Copyright (c) 2008, 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.
+ */
+
+#include "AceUnit.h"
+#include "AceUnitData.h"
+#include <stdio.h>
+
+/** Main program for running AceUnit tests.
+ * Invokes the runner.
+ *
+ * It supports two configuration parameters:
+ * <dl>
+ * <dt><code>TEST_FAILURES_FOR_VERIFICATION</code> (optional, default: 0)</dt>
+ * <dd>The number of test cases expected to fail. Defaults to 0.</dd>
+ * <dt><code>TEST_CASES_FOR_VERIFICATION</code> (optional, default: undef)</dt>
+ * <dd>The number of test cases expected to be executed.</dd>
+ * </dl>
+ *
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @file AceUnitMain.c
+ */
+
+#ifndef TEST_FAILURES_FOR_VERIFICATION
+/** The number of test cases expected to fail.
+ * Defaults to 0.
+ */
+#define TEST_FAILURES_FOR_VERIFICATION 0
+#endif
+
+/** Prototype for running a suite.
+ * @param suite Suite to run.
+ */
+extern void runSuite(const TestSuite_t *const suite);
+
+/** This always is the first suite. */
+extern TestSuite_t suite1;
+
+/** Main program.
+ * @return 0 in case all tests ran successfully, otherwise 1.
+ */
+int main(void) {
+ int retVal = 0;
+ runSuite(&suite1);
+ if (runnerData->testCaseFailureCount != TEST_FAILURES_FOR_VERIFICATION) {
+ fprintf(stderr, "Error: %d test cases failed, expected %d test cases to fail.\n", (int) runnerData->testCaseFailureCount, (int) TEST_FAILURES_FOR_VERIFICATION);
+ retVal = 1;
+ }
+#ifdef TEST_CASES_FOR_VERIFICATION
+ if (runnerData->testCaseCount != TEST_CASES_FOR_VERIFICATION) {
+ fprintf(stderr, "Test Cases: %d but expected %d\n", runnerData->testCaseCount, TEST_CASES_FOR_VERIFICATION);
+ retVal = 1;
+ }
+#endif
+ return retVal;
+}
Property changes on: trunk/src/native/AceUnitMain.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-03 08:39:09
|
Revision: 477
http://aceunit.svn.sourceforge.net/aceunit/?rev=477&view=rev
Author: christianhujer
Date: 2008-12-03 08:39:04 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
[2377345] If ACEUNIT_SUITES is disabled, runSuite(s) should not work
Modified Paths:
--------------
trunk/src/native/AceUnit.c
Modified: trunk/src/native/AceUnit.c
===================================================================
--- trunk/src/native/AceUnit.c 2008-11-30 21:58:36 UTC (rev 476)
+++ trunk/src/native/AceUnit.c 2008-12-03 08:39:04 UTC (rev 477)
@@ -208,6 +208,7 @@
}
}
+#ifdef ACEUNIT_SUITES
/** Runs all test cases from the supplied suite.
* @param suite Test suite to run.
* @param group Group to run.
@@ -247,7 +248,9 @@
#endif
#undef globalLog
}
+#endif
+#ifdef ACEUNIT_SUITES
/** Runs all test cases from the supplied test suites.
* @param suites Test suites to run (NULL terminated).
*/
@@ -265,6 +268,7 @@
suites++;
}
}
+#endif
/** Runs the specified tests.
* All tests (test cases and suites - fixtures as well as packages) share the same number space.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-30 21:58:38
|
Revision: 476
http://aceunit.svn.sourceforge.net/aceunit/?rev=476&view=rev
Author: christianhujer
Date: 2008-11-30 21:58:36 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Improved macros - added do { } while (false).
Improved documentation about assertEquals() and assertNotEquals() in case of ACEUNIT_EXPLICIT_MESSAGES.
Modified Paths:
--------------
trunk/src/native/AceUnitAssert.h
Modified: trunk/src/native/AceUnitAssert.h
===================================================================
--- trunk/src/native/AceUnitAssert.h 2008-11-30 16:39:39 UTC (rev 475)
+++ trunk/src/native/AceUnitAssert.h 2008-11-30 21:58:36 UTC (rev 476)
@@ -45,54 +45,59 @@
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param condition Condition to assert.
*/
-#define assertTrue(message, condition) if (!(condition)) { fail(message); }
+#define assertTrue(message, condition) do { if (!(condition)) { fail(message); } } while (false)
/** Asserts that the specified condition is false.
* If the condition is not false, the test case fails and raises an Assertion Error that will be logged.
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param condition Condition to assert for false.
*/
-#define assertFalse(message, condition) if (condition) { fail(message); }
+#define assertFalse(message, condition) do { if (condition) { fail(message); } } while (false)
/** Asserts that two values are equal.
* If the values are not equal, the test case fails and raises an Assertion Error that will be logged.
* @note If ACEUNIT_EXPLICIT_MESSAGES is set, expected and actual are converted to int32_t.
+ * @warning The underlying implementation simply compares expected and actual using !=.
+ * It is the responsibility of the user to care about the types of \p expected and \p actual.
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param expected Expected value.
* @param actual Actual value.
*/
#ifdef ACEUNIT_EXPLICIT_MESSAGES
#define assertEquals(message, expected, actual) \
- { \
+ do { \
int32_t lexpected = (expected); \
int32_t lactual = (actual); \
if (lexpected != lactual) { \
snprintf(runnerData->explicitMsgBuf, ACEUNIT_EXPLICIT_MSG_BUF_SIZE, "%s (expected: %d, actual: %d)", message, lexpected, lactual); \
fail(runnerData->explicitMsgBuf); \
} \
- }
+ } while (false)
#else
-#define assertEquals(message, expected, actual) if (!((expected) == (actual))) { fail(message); }
+#define assertEquals(message, expected, actual) do { if (!((expected) == (actual))) { fail(message); } } while (false)
#endif
/** Asserts that two values are not equal.
* If the values are equal, the test case fails and raises an {@link AssertionError_t} that will be logged.
+ * @note If ACEUNIT_EXPLICIT_MESSAGES is set, expected and actual are converted to int32_t.
+ * @warning The underlying implementation simply compares expected and actual using ==.
+ * It is the responsibility of the user to care about the types of \p expected and \p actual.
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param unexpected Not expected value.
* @param actual Actual value.
*/
#ifdef ACEUNIT_EXPLICIT_MESSAGES
#define assertNotEquals(message, unexpected, actual) \
- { \
+ do { \
int32_t lunexpected = unexpected; \
int32_t lactual = actual; \
if (lunexpected == lactual) { \
snprintf(runnerData->explicitMsgBuf, ACEUNIT_EXPLICIT_MSG_BUF_SIZE, "%s (unexpected: %d, actual: %d)", message, lunexpected, lactual); \
fail(runnerData->explicitMsgBuf); \
} \
- }
+ } while (false)
#else
-#define assertNotEquals(message, unexpected, actual) if ((unexpected) == (actual)) { fail(message); }
+#define assertNotEquals(message, unexpected, actual) do { if ((unexpected) == (actual)) { fail(message); } } while (false)
#endif
/** Asserts that a pointer is not NULL.
@@ -100,13 +105,13 @@
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param ptr Pointer expected to be not NULL.
*/
-#define assertNotNull(message, ptr) if (NULL == (ptr)) { fail(message); }
+#define assertNotNull(message, ptr) do { if (NULL == (ptr)) { fail(message); } } while (false)
/** Asserts that a pointer is NULL.
* If the pointer is not NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param ptr Pointer expected to be NULL.
*/
-#define assertNull(message, ptr) if (NULL != (ptr)) { fail(message); }
+#define assertNull(message, ptr) do { if (NULL != (ptr)) { fail(message); } } while (false)
#endif /* ACEUNITASSERT_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-30 16:39:49
|
Revision: 475
http://aceunit.svn.sourceforge.net/aceunit/?rev=475&view=rev
Author: christianhujer
Date: 2008-11-30 16:39:39 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
[2164755] Assertions shall be more verbose (e.g. include values)
Modified Paths:
--------------
trunk/src/native/AceUnit.h
trunk/src/native/AceUnitAssert.h
trunk/src/native/AceUnitData.h
trunk/src/native/test/Makefile
trunk/src/native/test/explicitMsg/AceUnitConfig.h
trunk/src/native/test/explicitMsg/AceUnitTest.c
trunk/src/native/test/explicitMsg/Makefile
trunk/src/native/test/explicitMsg/RunTests.c
Added Paths:
-----------
trunk/src/native/test/explicitMsg/
Modified: trunk/src/native/AceUnit.h
===================================================================
--- trunk/src/native/AceUnit.h 2008-11-29 21:25:39 UTC (rev 474)
+++ trunk/src/native/AceUnit.h 2008-11-30 16:39:39 UTC (rev 475)
@@ -179,6 +179,19 @@
* <code>A_Loop</code> support is independent of the generator.
* You may turn <code>A_Loop</code> support on and off during compile time without having to rerun the generator.
* </dd>
+ * <dt><code>ACEUNIT_EXPLICIT_MESSAGES</code></dt>
+ * <dd>
+ * This feature enables explicit message support.
+ * That means assertions which have an expected and an actual value will report those values.
+ * For this feature to work, a message buffer which can be used by snprintf is required.
+ * Currently, only snprintf is supported.
+ * sprintf and _snprintf are not yet supported.
+ * </dd>
+ * <dt><code>ACEUNIT_EXPLICIT_MESSAGES_INLINE_BUFFER</code></dt>
+ * <dd>
+ * This means that the structure #AceUnitRunnerData_t directly contains the buffer for message formatting.
+ * Otherwise the structure only contains a pointer which has to be initialized by the user.
+ * </dd>
* </dl>
*
* @warning AceUnit can define types foritself for exotic compilation environments where standard includes are not available or shall not be used.
Modified: trunk/src/native/AceUnitAssert.h
===================================================================
--- trunk/src/native/AceUnitAssert.h 2008-11-29 21:25:39 UTC (rev 474)
+++ trunk/src/native/AceUnitAssert.h 2008-11-30 16:39:39 UTC (rev 475)
@@ -31,6 +31,10 @@
#include "AceUnit.h"
+#ifdef ACEUNIT_EXPLICIT_MESSAGES
+#include <stdio.h> /* for snprintf(). */
+#endif
+
/** Let a test case fail.
* @param message Message, usually with the reason why the test case failed.
*/
@@ -52,11 +56,24 @@
/** Asserts that two values are equal.
* If the values are not equal, the test case fails and raises an Assertion Error that will be logged.
+ * @note If ACEUNIT_EXPLICIT_MESSAGES is set, expected and actual are converted to int32_t.
* @param message Message, usually with the positive description of why the assertion should not fail.
* @param expected Expected value.
* @param actual Actual value.
*/
-#define assertEquals(message, expected, actual) if (!((expected) == (actual))) { fail(message); } /* TODO: expected vs. actual in message */
+#ifdef ACEUNIT_EXPLICIT_MESSAGES
+#define assertEquals(message, expected, actual) \
+ { \
+ int32_t lexpected = (expected); \
+ int32_t lactual = (actual); \
+ if (lexpected != lactual) { \
+ snprintf(runnerData->explicitMsgBuf, ACEUNIT_EXPLICIT_MSG_BUF_SIZE, "%s (expected: %d, actual: %d)", message, lexpected, lactual); \
+ fail(runnerData->explicitMsgBuf); \
+ } \
+ }
+#else
+#define assertEquals(message, expected, actual) if (!((expected) == (actual))) { fail(message); }
+#endif
/** Asserts that two values are not equal.
* If the values are equal, the test case fails and raises an {@link AssertionError_t} that will be logged.
@@ -64,7 +81,19 @@
* @param unexpected Not expected value.
* @param actual Actual value.
*/
-#define assertNotEquals(message, unexpected, actual) if ((unexpected) == (actual)) { fail(message); } /* TODO: expected vs. actual in message */
+#ifdef ACEUNIT_EXPLICIT_MESSAGES
+#define assertNotEquals(message, unexpected, actual) \
+ { \
+ int32_t lunexpected = unexpected; \
+ int32_t lactual = actual; \
+ if (lunexpected == lactual) { \
+ snprintf(runnerData->explicitMsgBuf, ACEUNIT_EXPLICIT_MSG_BUF_SIZE, "%s (unexpected: %d, actual: %d)", message, lunexpected, lactual); \
+ fail(runnerData->explicitMsgBuf); \
+ } \
+ }
+#else
+#define assertNotEquals(message, unexpected, actual) if ((unexpected) == (actual)) { fail(message); }
+#endif
/** Asserts that a pointer is not NULL.
* If the pointer is NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
Modified: trunk/src/native/AceUnitData.h
===================================================================
--- trunk/src/native/AceUnitData.h 2008-11-29 21:25:39 UTC (rev 474)
+++ trunk/src/native/AceUnitData.h 2008-11-30 16:39:39 UTC (rev 475)
@@ -61,6 +61,15 @@
/** The number of test cases that failed. */
uint16_t testCaseFailureCount;
+#ifdef ACEUNIT_EXPLICIT_MESSAGES
+ /** The temporary buffer for message formatting. */
+#ifdef ACEUNIT_EXPLICIT_MESSAGES_INLINE_BUFFER
+ char explicitMsgBuf[ACEUNIT_EXPLICIT_MSG_BUF_SIZE];
+#else
+ char *explicitMsgBuf;
+#endif
+#endif
+
#ifdef ACEUNIT_RUNNERDATA_EXTENSION
// Extension hook to add your own fields to AceUnitRunnerData_t.
ACEUNIT_RUNNERDATA_EXTENSION
Modified: trunk/src/native/test/Makefile
===================================================================
--- trunk/src/native/test/Makefile 2008-11-29 21:25:39 UTC (rev 474)
+++ trunk/src/native/test/Makefile 2008-11-30 16:39:39 UTC (rev 475)
@@ -4,6 +4,7 @@
comment \
cplusplus \
exhand \
+ explicitMsg/ \
group \
longjmp \
loop \
Property changes on: trunk/src/native/test/explicitMsg
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/src/native/test/explicitMsg/AceUnitConfig.h
===================================================================
--- trunk/src/native/test/basic/AceUnitConfig.h 2008-11-27 00:20:10 UTC (rev 473)
+++ trunk/src/native/test/explicitMsg/AceUnitConfig.h 2008-11-30 16:39:39 UTC (rev 475)
@@ -1,2 +1,6 @@
/** Use return to exit a test case with a failed assertion. */
#define ACEUNIT_ASSERTION_STYLE ACEUNIT_ASSERTION_STYLE_RETURN
+
+#define ACEUNIT_EXPLICIT_MESSAGES
+#define ACEUNIT_EXPLICIT_MESSAGES_INLINE_BUFFER
+#define ACEUNIT_EXPLICIT_MSG_BUF_SIZE 512
Modified: trunk/src/native/test/explicitMsg/AceUnitTest.c
===================================================================
--- trunk/src/native/test/basic/AceUnitTest.c 2008-11-27 00:20:10 UTC (rev 473)
+++ trunk/src/native/test/explicitMsg/AceUnitTest.c 2008-11-30 16:39:39 UTC (rev 475)
@@ -37,218 +37,10 @@
#include "AceUnitData.h"
#include "AceUnitTest.h"
-/** The number of test cases that were executed.
- * This looks redundant with runnerData->testCaseCount but actually it is not.
- * It might be the case that the runner mistakenly executes the wrong methods, e.g. when the generator finds the wrong methods.
- */
-int myTestCaseCount = 0;
-
-/** Clears the current recent error. */
-void clearRecentError() {
- if (runnerData->recentError != NULL) {
- runnerData->recentError = NULL;
- }
+A_Test void testAssertEquals(void) {
+ assertEquals("Expected failure.", 10, 20);
}
-/** Holds whether or not the code continued after an assertion. */
-static bool assertionContinued = false;
-
-/** Helper method that asserts something that's then verified by a test case.
- * @param c Assertion case.
- */
-void helper(int c) {
- assertionContinued = false;
- switch (c) {
- case 0:
- assertTrue("assertTrue(msg, true) MUST NOT set recentError.", true);
- break;
- case 1:
- assertTrue("Test assertion, expected to fail.", false);
- break;
- case 2:
- assertTrue("Test assertion, expected to fail.", false);
- break;
- case 3:
- assertFalse("assertFalse(msg, false) MUST continue the test case.", false);
- break;
- case 4:
- assertFalse("Test assertion, expected to fail.", true);
- break;
- case 5:
- assertFalse("Test assertion, expected to fail.", true);
- break;
- case 6:
- {
- int val1 = 10;
- int val2 = val1;
- assertEquals("assertEquals(msg, val, val) MUST continue the test case.", val1, val2);
- }
- break;
- case 7:
- {
- int val1 = 10;
- int val2 = 20;
- assertEquals("assertEquals(msg, val1, val2) MUST NOT continue the test case.", val1, val2);
- }
- break;
- case 8:
- {
- int val1 = 10;
- int val2 = 20;
- assertEquals("Test assertion, expected to fail.", val1, val2);
- }
- break;
- }
- assertionContinued = true;
+A_Test void testAssertNotEquals(void) {
+ assertNotEquals("Expected failure.", 10, 10);
}
-
-/** Tests that {@link #assertTrue()} with a true condition continues a test case. */
-A_Test void testAssertTrueWithTrueContinues() {
- myTestCaseCount++;
- helper(0);
- clearRecentError();
- if (!assertionContinued) {
- fail("Expected assertTrue(msg, true) to continue.");
- }
-}
-
-/** Tests that {@link #assertTrue()} with a false condition does not continue a test case. */
-A_Test void testAssertTrueWithFalseReturns() {
- myTestCaseCount++;
- helper(1);
- clearRecentError();
- if (assertionContinued) {
- fail("Expected assertTrue(msg, false) to not continue.");
- }
-}
-
-/** Tests that {@link #assertTrue()} with a true condition does not set recentError. */
-A_Test void testAssertTrueWithTrueNoRecentError() {
- myTestCaseCount++;
- clearRecentError();
- assertTrue("assertTrue(msg, true) MUST NOT set recentError.", true);
- if (runnerData->recentError != NULL) {
- clearRecentError();
- fail("Expected assertTrue(msg, true) to not set recentError.");
- }
-}
-
-/** Tests that {@link #assertTrue()} with a false condition sets recentError. */
-A_Test void testAssertTrueWithFalseSetsRecentError() {
- bool recentErrorSet = false;
-
- myTestCaseCount++;
- clearRecentError();
- helper(2);
- if (runnerData->recentError != NULL) {
- recentErrorSet = true;
- }
- clearRecentError();
- if (!recentErrorSet) {
- fail("Expected assertTrue(msg, false) to set recentError.");
- }
-}
-
-/** Tests that {@link #assertFalse()} with a true condition continues a test case. */
-A_Test void testAssertFalseWithFalseContinues() {
- myTestCaseCount++;
- helper(3);
- clearRecentError();
- if (!assertionContinued) {
- fail("Expected assertion to continue.");
- }
-}
-
-/** Tests that {@link #assertFalse()} with a false condition does not continue a test case. */
-A_Test void testAssertFalseWithTrueReturns() {
- myTestCaseCount++;
- helper(4);
- clearRecentError();
- if (assertionContinued) {
- fail("Expected assertion to not continue.");
- }
-}
-
-/** Tests that {@link #assertFalse()} with a true condition does not set recentError. */
-A_Test void testAssertFalseWithFalseNoRecentError() {
- myTestCaseCount++;
- clearRecentError();
- assertFalse("assertFalse(msg, false) MUST NOT set recentError.", false);
- if (runnerData->recentError != NULL) {
- clearRecentError();
- fail("Expected recentError to be NULL.");
- }
-}
-
-/** Tests that {@link #assertFalse()} with a false condition sets recentError. */
-A_Test void testAssertFalseWithTrueSetsRecentError() {
- bool recentErrorSet = false;
-
- myTestCaseCount++;
- clearRecentError();
- helper(5);
- if (runnerData->recentError != NULL) {
- recentErrorSet = true;
- }
- clearRecentError();
- if (!recentErrorSet) {
- fail("Expected recentError to be set.");
- }
-}
-
-/** Tests that {@link #assertEquals()} with equal values continues a test case. */
-A_Test void testAssertEqualsWithEqualContinues() {
- myTestCaseCount++;
- helper(6);
- clearRecentError();
- if (!assertionContinued) {
- fail("Expected assertion to continue.");
- }
-}
-
-/** Tests that {@link #assertEquals()} with unequal values does not continue a test case. */
-A_Test void testAssertEqualsWithUnequalReturns() {
- myTestCaseCount++;
- helper(7);
- clearRecentError();
- if (assertionContinued) {
- fail("Expected assertion to not continue.");
- }
-}
-
-/** Tests that {@link #assertEquals()} with equal values does not set recentError. */
-A_Test void testAssertEqualsWithEqualNoRecentError() {
- int val1 = 10;
- int val2 = val1;
-
- myTestCaseCount++;
- clearRecentError();
- assertEquals("assertEquals(msg, val1, val2) MUST NOT set recentError.", val1, val2);
- if (runnerData->recentError != NULL) {
- clearRecentError();
- fail("Expected recentError to be NULL.");
- }
-}
-
-/** Tests that {@link #assertEquals()} with unequal values sets recentError.
- * The strange formatting is intentional for <a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1887942&group_id=207094&atid=1000227">[ 1887942 ] Java Generator does not detect wrongly formatted test source</a>
- */
-A_Test
-void
-testAssertEqualsWithUnequalSetsRecentError
-
-
-() {
- bool recentErrorSet = false;
-
- myTestCaseCount++;
- clearRecentError();
- helper(8);
- if (runnerData->recentError != NULL) {
- recentErrorSet = true;
- }
- clearRecentError();
- if (!recentErrorSet) {
- fail("Expected recentError to be set.");
- }
-}
Modified: trunk/src/native/test/explicitMsg/Makefile
===================================================================
--- trunk/src/native/test/basic/Makefile 2008-11-27 00:20:10 UTC (rev 473)
+++ trunk/src/native/test/explicitMsg/Makefile 2008-11-30 16:39:39 UTC (rev 475)
@@ -1 +1,2 @@
+CVERSION=c99
include ../common.mak
Modified: trunk/src/native/test/explicitMsg/RunTests.c
===================================================================
--- trunk/src/native/test/basic/RunTests.c 2008-11-27 00:20:10 UTC (rev 473)
+++ trunk/src/native/test/explicitMsg/RunTests.c 2008-11-30 16:39:39 UTC (rev 475)
@@ -40,13 +40,12 @@
/** The number of test cases contained in this fixture.
* This is used to verify that the number of executed test cases is correct.
*/
-#define TEST_CASES_FOR_VERIFICATION 12
+#define TEST_CASES_FOR_VERIFICATION 2
-/** The number of test cases that were executed.
- * This looks redundant with runnerData->testCaseCount but actually it is not.
- * It might be the case that the runner mistakenly executes the wrong methods, e.g. when the generator finds the wrong methods.
+/** The number of test cases expected to fail.
+ * This is used to verify that the number of failed test cases is correct.
*/
-extern int myTestCaseCount;
+#define TEST_FAILURES_FOR_VERIFICATION 2
/** Run the tests.
* @note This is only here temporarily.
@@ -59,7 +58,7 @@
int main(void) {
int retVal = 0;
runFixture(&AceUnitTestFixture);
- if (runnerData->testCaseFailureCount != 0) {
+ if (runnerData->testCaseFailureCount != TEST_FAILURES_FOR_VERIFICATION) {
fprintf(stderr, "Test Cases: %d Errors: %d\n", runnerData->testCaseCount, runnerData->testCaseFailureCount);
retVal = 1;
}
@@ -67,9 +66,5 @@
fprintf(stderr, "Test Cases: %d but expected %d\n", runnerData->testCaseCount, TEST_CASES_FOR_VERIFICATION);
retVal = 1;
}
- if (myTestCaseCount != TEST_CASES_FOR_VERIFICATION) {
- fprintf(stderr, "Test Cases really executed: %d but expected %d\n", myTestCaseCount, TEST_CASES_FOR_VERIFICATION);
- retVal = 1;
- }
return retVal;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-29 21:25:45
|
Revision: 474
http://aceunit.svn.sourceforge.net/aceunit/?rev=474&view=rev
Author: christianhujer
Date: 2008-11-29 21:25:39 +0000 (Sat, 29 Nov 2008)
Log Message:
-----------
Improved path names.
Modified Paths:
--------------
trunk/src/native/test/common.mak
Modified: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak 2008-11-27 00:20:10 UTC (rev 473)
+++ trunk/src/native/test/common.mak 2008-11-29 21:25:39 UTC (rev 474)
@@ -1,13 +1,14 @@
LOGGER?=FullPlainLogger
CVERSION?=c89
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_NATIVE_PATH=../..
+ACEUNIT_JAVA_PATH=../../../java
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_JAVA_PATH)/src -name "*.java")
ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-VPATH=$(ACEUNIT_PATH)/native
+VPATH=$(ACEUNIT_NATIVE_PATH)
-GENERATED:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar --print=generated .)
+GENERATED:=$(shell java -jar $(ACEUNIT_JAVA_PATH)/AceUnit.jar --print=generated .)
SUITES=$(filter *.c,$(GENERATED))
SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
@@ -16,7 +17,7 @@
LINT=splint
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_NATIVE_PATH)
C_and_LD_FLAGS=-fprofile-arcs
CFLAGS?=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
LDFLAGS=$(C_and_LD_FLAGS)
@@ -28,8 +29,8 @@
RunTests: $(OBJECTS)
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
+$(ACEUNIT_JAVA_PATH)/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_JAVA_PATH)/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-27 00:20:14
|
Revision: 473
http://aceunit.svn.sourceforge.net/aceunit/?rev=473&view=rev
Author: christianhujer
Date: 2008-11-27 00:20:10 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Creating release tag 0.10.0 for branch 0.10.
Added Paths:
-----------
tags/0.10.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-27 00:19:48
|
Revision: 472
http://aceunit.svn.sourceforge.net/aceunit/?rev=472&view=rev
Author: christianhujer
Date: 2008-11-27 00:19:44 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
Creating branch for 0.10.
Added Paths:
-----------
branches/0.10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-27 00:17:49
|
Revision: 471
http://aceunit.svn.sourceforge.net/aceunit/?rev=471&view=rev
Author: christianhujer
Date: 2008-11-27 00:17:45 +0000 (Thu, 27 Nov 2008)
Log Message:
-----------
[2350641] AceUnit should create a list of found fixtures for make
Modified Paths:
--------------
trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
trunk/src/java/src/prj/net/sf/aceunit/GenTest_de.properties
trunk/src/native/test/common.mak
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.java
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2008-11-23 12:02:13 UTC (rev 470)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.java 2008-11-27 00:17:45 UTC (rev 471)
@@ -30,6 +30,7 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
+import java.util.EnumSet;
import net.sf.japi.io.args.ArgParser;
import net.sf.japi.io.args.BasicCommand;
@@ -60,6 +61,10 @@
/** Whether to overwrite write-protected files. */
private boolean force;
+ /** What to print. */
+ private EnumSet<Print> printSet = EnumSet.noneOf(Print.class);
+
+
/**
* The IdGenerator which is used for generating unique ids for Suites.
* It is used for all {@link Suite}s ({@link Pckg}s and {@link Fixture}s).
@@ -76,7 +81,7 @@
}
/**
- * Sets whether overwriting of existing files should be enforced.
+ * Sets whether overwriting of existing files should be enforced or not.
*
* @param force Whether overwriting of existing files should be enforced.
*/
@@ -86,6 +91,18 @@
}
/**
+ * Sets which names to print.
+ * @param print Which filenames to print.
+ */
+ @Option({"print"})
+ public void setPrint(@NotNull final String print) {
+ printSet.clear();
+ for (final String element : print.split(",")) {
+ printSet.add(Print.valueOf(element));
+ }
+ }
+
+ /**
* Performs the generation of tests.
*
* @param basename Base name to generate tests for.
@@ -147,10 +164,12 @@
containedFixture |= performFixture(base, pckg, fixtureFile);
}
if (containedFixture) {
- final File hFile = new File(pckgDir, "Suite" + pckg.getId() + ".c");
- System.out.println(hFile);
+ final File cFile = new File(pckgDir, "Suite" + pckg.getId() + ".c");
+ if (printSet.contains(Print.sources) || printSet.contains(Print.suites) || printSet.contains(Print.generated)) {
+ System.out.println(cFile);
+ }
final String hSource = pckg.getCode("foo");
- SourceFiles.writeIfChanged(hFile, hSource, force);
+ SourceFiles.writeIfChanged(cFile, hSource, force);
}
if (containedFixture && parent != null) {
parent.addSuite(pckg);
@@ -176,6 +195,12 @@
final boolean containedFixture = fixture.containsTests();
if (containedFixture) {
final File hFile = new File(fixtureFile.getParent(), fixtureName + ".h");
+ if (printSet.contains(Print.sources) || printSet.contains(Print.fixtures)) {
+ System.out.println(fixtureFile);
+ }
+ if (printSet.contains(Print.headers) || printSet.contains(Print.generated)) {
+ System.out.println(hFile);
+ }
final String hSource = fixture.getCode(fixtureName);
SourceFiles.writeIfChanged(hFile, hSource, force);
pckg.addSuite(fixture);
@@ -196,4 +221,24 @@
return okay ? 0 : 1;
}
+ /** Enum that describes what to print.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+ static enum Print {
+
+ /** Print suite names. */
+ suites,
+
+ /** Print fixture sources. */
+ fixtures,
+
+ /** Print generated files. */
+ generated,
+
+ /** Print header files. */
+ headers,
+
+ /** Print source files. */
+ sources,
+ }
} // class GenTest
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2008-11-23 12:02:13 UTC (rev 470)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest.properties 2008-11-27 00:17:45 UTC (rev 471)
@@ -25,5 +25,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
helpHeader=Usage: java -jar AceUnit.jar [OPTION]... [BASENAME]...\nCreate AceUnit unit test headers for one or more suites with the specified BASENAME(s) (omit .c suffix for fixtures).\n
-helpFooter=Examples:\n java -jar AceUnit.jar sortTest\n
+helpFooter=Examples:\n java -jar AceUnit.jar sortTest\n java -jar AceUnit.jar --print=generated src/test/\n
setForce=Overwrite write-protected files.
+setPrint=Specifies what to print. Comman separated enum set.\n suites: Print suite file names.\n fixtures: Print fixture file names.\n generated: Print generated file names.\n headers: Print header file names.\n sources: Print source file names.
Modified: trunk/src/java/src/prj/net/sf/aceunit/GenTest_de.properties
===================================================================
--- trunk/src/java/src/prj/net/sf/aceunit/GenTest_de.properties 2008-11-23 12:02:13 UTC (rev 470)
+++ trunk/src/java/src/prj/net/sf/aceunit/GenTest_de.properties 2008-11-27 00:17:45 UTC (rev 471)
@@ -25,5 +25,5 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
helpHeader=Verwendung: java -jar AceUnit.jar [OPTION]... [BASENAME]...\nErzeuge AceUnit Unit Test Header-Dateien f\xFCr ein oder mehrere Test-Suiten mit den angegebenen BASENAME(s) (.c-Suffix bei Fixtures weglassen).\n
-helpFooter=Beispiele:\n java -jar AceUnit.jar sortTest\n
+helpFooter=Beispiele:\n java -jar AceUnit.jar sortTest\n java -jar AceUnit.jar src/test/\n
setForce=Schreibgesch\xFCtzte Dateien \xFCberschreiben.
Modified: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak 2008-11-23 12:02:13 UTC (rev 470)
+++ trunk/src/native/test/common.mak 2008-11-27 00:17:45 UTC (rev 471)
@@ -7,10 +7,10 @@
VPATH=$(ACEUNIT_PATH)/native
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+GENERATED:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar --print=generated .)
+SUITES=$(filter *.c,$(GENERATED))
SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
DEPENDS=$(OBJECTS:.o=.d)
LINTOUTS=$(OBJECTS:.o=.ln)
@@ -41,7 +41,7 @@
./RunTests
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
+ rm -f $(OBJECTS) $(GENERATED) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda)
lint: $(LINTOUTS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 12:02:16
|
Revision: 470
http://aceunit.svn.sourceforge.net/aceunit/?rev=470&view=rev
Author: christianhujer
Date: 2008-11-23 12:02:13 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Added missing Doxygen documentation.
Modified Paths:
--------------
trunk/src/native/AceUnit.h
Modified: trunk/src/native/AceUnit.h
===================================================================
--- trunk/src/native/AceUnit.h 2008-11-23 11:41:25 UTC (rev 469)
+++ trunk/src/native/AceUnit.h 2008-11-23 12:02:13 UTC (rev 470)
@@ -240,17 +240,22 @@
#endif
#ifndef _SIZE_T_DEFINED
#ifndef _SIZE_T_DEFINED_
+/** Replacement for stddef.h size_t in case stddef.h is not available. */
typedef long unsigned int size_t;
#endif
#endif
#ifndef __bool_true_false_are_defined
+/** Replacement for stdbool.h bool in case stdbool.h is not available. */
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
#define bool _Bool
#else
#define bool int
#endif
+/** Replacement for stdbool.h true in case stdbool.h is not available. */
#define true 1
+/** Replacement for stdbool.h false in case stdbool.h is not available. */
#define false 0
+/** Replacement for stdbool.h __bool_true_false_are_defined in case stdbool.h is not available. */
#define __bool_true_false_are_defined 1
#endif
#ifndef NULL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 11:41:32
|
Revision: 469
http://aceunit.svn.sourceforge.net/aceunit/?rev=469&view=rev
Author: christianhujer
Date: 2008-11-23 11:41:25 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Added XMI file for the design.
Added Paths:
-----------
trunk/src/doc/AceUnitDesign.xmi
Added: trunk/src/doc/AceUnitDesign.xmi
===================================================================
--- trunk/src/doc/AceUnitDesign.xmi (rev 0)
+++ trunk/src/doc/AceUnitDesign.xmi 2008-11-23 11:41:25 UTC (rev 469)
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2008-11-22T15:34:03" xmi.version="1.2" >
+ <XMI.header>
+ <XMI.documentation>
+ <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
+ <XMI.exporterVersion>1.5.8</XMI.exporterVersion>
+ <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
+ </XMI.documentation>
+ <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
+ </XMI.header>
+ <XMI.content>
+ <UML:Model isSpecification="false" isLeaf="false" isRoot="false" xmi.id="m1" isAbstract="false" name="UML-Modell" >
+ <UML:Namespace.ownedElement>
+ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="folder" isRoot="false" isAbstract="false" name="folder" />
+ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="datatype" isRoot="false" isAbstract="false" name="datatype" />
+ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="annotation" isRoot="false" isAbstract="false" name="annotation" />
+ <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Logical View" isRoot="false" isAbstract="false" name="Logical View" >
+ <UML:Namespace.ownedElement>
+ <UML:Package stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Datatypes" isRoot="false" isAbstract="false" name="Datatypes" >
+ <UML:Namespace.ownedElement>
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="opTv6MYtJHVR" isRoot="false" isAbstract="false" name="int" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="CsAqwErDnHnz" isRoot="false" isAbstract="false" name="char" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="g89XzsCohfhl" isRoot="false" isAbstract="false" name="bool" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="zFdGU8ge0oUu" isRoot="false" isAbstract="false" name="float" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="3L6octoHzvoy" isRoot="false" isAbstract="false" name="double" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="lykQbPCYcpo7" isRoot="false" isAbstract="false" name="short" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="vUlvJGnKZt8A" isRoot="false" isAbstract="false" name="long" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="kwPhqBgb9O2i" isRoot="false" isAbstract="false" name="unsigned int" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="oCGQ12VwVHpm" isRoot="false" isAbstract="false" name="unsigned short" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="Va62SECA9Zsz" isRoot="false" isAbstract="false" name="unsigned long" />
+ <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="kYYruaZimn7l" isRoot="false" isAbstract="false" name="string" />
+ </UML:Namespace.ownedElement>
+ </UML:Package>
+ <UML:Generalization isSpecification="false" child="rqG9aRIlhkw8" visibility="public" namespace="Logical View" xmi.id="srBg2yXn8if4" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="hmNho4ZPK9kO" visibility="public" namespace="Logical View" xmi.id="R4aZmFb1bO5p" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="bbvypETW0oBp" visibility="public" namespace="Logical View" xmi.id="fUHGsM4JiEsI" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="CGUDRreoOGLV" visibility="public" namespace="Logical View" xmi.id="D8DtM69tZEOJ" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="aIaN4h6uKkD9" visibility="public" namespace="Logical View" xmi.id="qAONPnhkgvdx" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="PXbW7TTrz2ju" visibility="public" namespace="Logical View" xmi.id="38wj3ZfARkEH" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="F84xty3SXwQM" visibility="public" namespace="Logical View" xmi.id="IrQhaczq4fhj" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="skCDuwZjkqsJ" visibility="public" namespace="Logical View" xmi.id="L1HPhw641fiB" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="IP6J2mSVdYuI" visibility="public" namespace="Logical View" xmi.id="xYGMmzop8iTq" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="PXbW7TTrz2ju" visibility="public" namespace="Logical View" xmi.id="cbrkJKapiGso" parent="IP6J2mSVdYuI" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="F84xty3SXwQM" visibility="public" namespace="Logical View" xmi.id="HGcxWSlOJlyB" parent="IP6J2mSVdYuI" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="skCDuwZjkqsJ" visibility="public" namespace="Logical View" xmi.id="Ab1RK0aXeWnN" parent="IP6J2mSVdYuI" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="bbvypETW0oBp" visibility="public" namespace="Logical View" xmi.id="mkpOGcm1Kfiz" parent="IP6J2mSVdYuI" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="rqG9aRIlhkw8" visibility="public" namespace="Logical View" xmi.id="yQoI3WFDAiXz" parent="IP6J2mSVdYuI" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="aIaN4h6uKkD9" visibility="public" namespace="Logical View" xmi.id="D5cOl7NlhB11" parent="Akm7QN7AHRmr" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="CGUDRreoOGLV" visibility="public" namespace="Logical View" xmi.id="I210E2zD7Wjv" parent="Akm7QN7AHRmr" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="hmNho4ZPK9kO" visibility="public" namespace="Logical View" xmi.id="8QhFuQ9djQpx" parent="Akm7QN7AHRmr" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="Akm7QN7AHRmr" visibility="public" namespace="Logical View" xmi.id="HORfVbAqsASF" parent="qcfLrS5M1BNT" discriminator="" name="" />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="9nhHFwqmiC5F" isRoot="false" isAbstract="true" name="Test" />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="IZgfuPC5et9j" isRoot="false" isAbstract="true" name="TestMethod" />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="hTBxR8mYvRo8" isRoot="false" isAbstract="false" name="TestCase" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="wRdNL3dESLxq" />
+ <UML:Generalization xmi.idref="FQDgVhy3fata" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="ct4oyJ4XxkRM" isRoot="false" isAbstract="false" name="Before" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="QKU5uNfoWbWw" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="wUzneiU5rQWz" isRoot="false" isAbstract="false" name="After" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="pTZJ24DUtHV7" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="C3serzyRs2Gq" isRoot="false" isAbstract="false" name="BeforeClass" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="FVX6k0DUiIFO" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="JILE2kbyEYlq" isRoot="false" isAbstract="false" name="AfterClass" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="O6Q4PdQp630z" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="GEv6eQ3oTwSI" isRoot="false" isAbstract="false" name="TestFixture" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="m6JgJxuxF0ZS" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="tOhlQvZhEswG" isRoot="false" isAbstract="false" name="TestPackage" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="w6nC4KenR7VK" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="aVDm3wdHAWNo" isRoot="false" isAbstract="true" name="TestSuite" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="QfZsyUgDwCdE" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Generalization isSpecification="false" child="hTBxR8mYvRo8" visibility="public" namespace="Logical View" xmi.id="wRdNL3dESLxq" parent="9nhHFwqmiC5F" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="aVDm3wdHAWNo" visibility="public" namespace="Logical View" xmi.id="QfZsyUgDwCdE" parent="9nhHFwqmiC5F" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="GEv6eQ3oTwSI" visibility="public" namespace="Logical View" xmi.id="m6JgJxuxF0ZS" parent="aVDm3wdHAWNo" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="tOhlQvZhEswG" visibility="public" namespace="Logical View" xmi.id="w6nC4KenR7VK" parent="aVDm3wdHAWNo" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="hTBxR8mYvRo8" visibility="public" namespace="Logical View" xmi.id="FQDgVhy3fata" parent="IZgfuPC5et9j" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="ct4oyJ4XxkRM" visibility="public" namespace="Logical View" xmi.id="QKU5uNfoWbWw" parent="IZgfuPC5et9j" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="wUzneiU5rQWz" visibility="public" namespace="Logical View" xmi.id="pTZJ24DUtHV7" parent="IZgfuPC5et9j" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="C3serzyRs2Gq" visibility="public" namespace="Logical View" xmi.id="FVX6k0DUiIFO" parent="IZgfuPC5et9j" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="JILE2kbyEYlq" visibility="public" namespace="Logical View" xmi.id="O6Q4PdQp630z" parent="IZgfuPC5et9j" discriminator="" name="" />
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="2BL7eEkrxAH2" name="annotatedWith" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ReVoQ1Zmy8Ex" aggregation="none" type="F84xty3SXwQM" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="gdNZxUnzd94H" aggregation="none" type="C3serzyRs2Gq" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Nm6IuOKL2p8Q" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="rfApnOkS081x" aggregation="none" type="bbvypETW0oBp" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="amxDtzSEkZWe" aggregation="none" type="ct4oyJ4XxkRM" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="voyxe4LTjWGU" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="syws6xqgilrZ" aggregation="none" type="PXbW7TTrz2ju" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="kIoUrI7m73hj" aggregation="none" type="hTBxR8mYvRo8" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="72AqYOKRMHJR" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="C75ssxSbFE34" aggregation="none" type="rqG9aRIlhkw8" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="W8obBVIIVQ82" aggregation="none" type="wUzneiU5rQWz" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="oRRBiiasqfli" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cDHpRLtvTfVd" aggregation="none" type="skCDuwZjkqsJ" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="8lveC2eyT579" aggregation="none" type="JILE2kbyEYlq" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="nh1bNmIzxZnM" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="seIKKlxQWq2g" aggregation="none" type="IZgfuPC5et9j" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="sgfJlkSXSS8p" aggregation="none" type="IP6J2mSVdYuI" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="EQmAyZWqEm8W" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="V5w2wzgmdJ6N" aggregation="aggregate" type="GEv6eQ3oTwSI" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4YuW00JDP5LN" aggregation="none" type="hTBxR8mYvRo8" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="drBpcKL7NF7J" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Co6q5AB9i3dh" aggregation="aggregate" type="tOhlQvZhEswG" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="3wsQ2Dnf2xSc" aggregation="none" type="aVDm3wdHAWNo" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="gaVYXRgOY6wk" isRoot="false" isAbstract="false" name="Directory" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="3ZJj1oppDDO8" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="vpxAnLvdeTtN" isRoot="false" isAbstract="true" name="File" />
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="xxs2He8xEbTl" isRoot="false" isAbstract="false" name="RegularFile" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="1hEFIhzIq5q2" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="298YD2I7rDFc" isRoot="false" isAbstract="false" name="SourceFile" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="32Ou7EuDIzAb" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="YADAb6VY2NZJ" isRoot="false" isAbstract="false" name="HeaderFile" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="FSqWR05kfUX8" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Generalization isSpecification="false" child="xxs2He8xEbTl" visibility="public" namespace="Logical View" xmi.id="1hEFIhzIq5q2" parent="vpxAnLvdeTtN" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="298YD2I7rDFc" visibility="public" namespace="Logical View" xmi.id="32Ou7EuDIzAb" parent="xxs2He8xEbTl" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="YADAb6VY2NZJ" visibility="public" namespace="Logical View" xmi.id="FSqWR05kfUX8" parent="xxs2He8xEbTl" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="gaVYXRgOY6wk" visibility="public" namespace="Logical View" xmi.id="3ZJj1oppDDO8" parent="vpxAnLvdeTtN" discriminator="" name="" />
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="SiygvKoetT8z" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="H2Fj43wm86cH" aggregation="none" type="tOhlQvZhEswG" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="jzUsdN3560lz" aggregation="none" type="gaVYXRgOY6wk" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="KYbB1jBGlOyn" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RuZZ09pj8Hbj" aggregation="none" type="GEv6eQ3oTwSI" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="edpidYiv4H74" aggregation="none" type="298YD2I7rDFc" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="1GIkeGY5A7cA" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="HPsNgR7J4uzf" aggregation="none" type="GEv6eQ3oTwSI" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="QfZVxgZywrgY" aggregation="none" type="YADAb6VY2NZJ" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="8EbIKBRZbJuF" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="k1YntYQKBzn8" aggregation="none" type="tOhlQvZhEswG" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dM4XBl5HxeYH" aggregation="none" type="298YD2I7rDFc" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="qzoPIje0iDla" isRoot="false" isAbstract="false" name="PckgSource" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="MdzLjIWXcyJa" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="jCuu9h1l15IA" isRoot="false" isAbstract="false" name="FixtureSource" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="pagPYz0SILJP" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="qMSm001oxqDD" isRoot="false" isAbstract="false" name="FixtureHeader" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="wVPFqjek6i4j" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Generalization isSpecification="false" child="qzoPIje0iDla" visibility="public" namespace="Logical View" xmi.id="MdzLjIWXcyJa" parent="298YD2I7rDFc" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="jCuu9h1l15IA" visibility="public" namespace="Logical View" xmi.id="pagPYz0SILJP" parent="298YD2I7rDFc" discriminator="" name="" />
+ <UML:Generalization isSpecification="false" child="qMSm001oxqDD" visibility="public" namespace="Logical View" xmi.id="wVPFqjek6i4j" parent="YADAb6VY2NZJ" discriminator="" name="" />
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="PgZTObD3OmM7" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="YfY5kAwf3uzx" aggregation="none" type="GEv6eQ3oTwSI" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="NHmNxpCKVjor" aggregation="none" type="jCuu9h1l15IA" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="KzujlEoJsMMa" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="VIGYAFUXUGtQ" aggregation="none" type="GEv6eQ3oTwSI" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="33kZnWQ7TJoE" aggregation="none" type="qMSm001oxqDD" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="VaVNvryO8CwG" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="POmredHig2FT" aggregation="none" type="tOhlQvZhEswG" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="WfZ0wLCSwgnp" aggregation="none" type="qzoPIje0iDla" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Xh3K34FdUz9N" isRoot="false" isAbstract="false" name="AceUnitAnnotations" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="n2FJn2Rowdwf" />
+ </UML:GeneralizableElement.generalization>
+ <UML:Namespace.ownedElement>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="rqG9aRIlhkw8" isRoot="false" isAbstract="false" name="A_After" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="srBg2yXn8if4" />
+ <UML:Generalization xmi.idref="yQoI3WFDAiXz" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="skCDuwZjkqsJ" isRoot="false" isAbstract="false" name="A_AfterClass" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="L1HPhw641fiB" />
+ <UML:Generalization xmi.idref="Ab1RK0aXeWnN" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="bbvypETW0oBp" isRoot="false" isAbstract="false" name="A_Before" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="fUHGsM4JiEsI" />
+ <UML:Generalization xmi.idref="mkpOGcm1Kfiz" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="F84xty3SXwQM" isRoot="false" isAbstract="false" name="A_BeforeClass" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="IrQhaczq4fhj" />
+ <UML:Generalization xmi.idref="HGcxWSlOJlyB" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="CGUDRreoOGLV" isRoot="false" isAbstract="false" name="A_Group" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="D8DtM69tZEOJ" />
+ <UML:Generalization xmi.idref="I210E2zD7Wjv" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="hmNho4ZPK9kO" isRoot="false" isAbstract="false" name="A_Ignore" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="R4aZmFb1bO5p" />
+ <UML:Generalization xmi.idref="8QhFuQ9djQpx" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="aIaN4h6uKkD9" isRoot="false" isAbstract="false" name="A_Loop" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="qAONPnhkgvdx" />
+ <UML:Generalization xmi.idref="D5cOl7NlhB11" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="PXbW7TTrz2ju" isRoot="false" isAbstract="false" name="A_Test" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="38wj3ZfARkEH" />
+ <UML:Generalization xmi.idref="cbrkJKapiGso" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="qcfLrS5M1BNT" isRoot="false" isAbstract="true" name="Annotation" />
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="IP6J2mSVdYuI" isRoot="false" isAbstract="true" name="DirectAnnotation" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="xYGMmzop8iTq" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ <UML:Class stereotype="annotation" isSpecification="false" isLeaf="false" visibility="public" namespace="Xh3K34FdUz9N" xmi.id="Akm7QN7AHRmr" isRoot="false" isAbstract="true" name="MetaAnnotation" >
+ <UML:GeneralizableElement.generalization>
+ <UML:Generalization xmi.idref="HORfVbAqsASF" />
+ </UML:GeneralizableElement.generalization>
+ </UML:Class>
+ </UML:Namespace.ownedElement>
+ </UML:Class>
+ <UML:Generalization isSpecification="false" child="Xh3K34FdUz9N" visibility="public" namespace="Logical View" xmi.id="n2FJn2Rowdwf" parent="YADAb6VY2NZJ" discriminator="" name="" />
+ <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="anSqq2pDsN8T" name="" >
+ <UML:Association.connection>
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Dc8Mh6RrLdUd" aggregation="none" type="C3serzyRs2Gq" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xkI7gfxGSP4I" aggregation="none" type="F84xty3SXwQM" name="" />
+ </UML:Association.connection>
+ </UML:Association>
+ </UML:Namespace.ownedElement>
+ <XMI.extension xmi.extender="umbrello" >
+ <diagrams>
+ <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1128" snapy="10" showatts="1" xmi.id="JZSZEPLAstif" documentation="" type="1" showops="1" showpackage="0" name="Klassendiagramm" localid="" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="904" >
+ <widgets>
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="410" fillcolor="#ffffc0" y="13" drawascircle="0" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="qcfLrS5M1BNT" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="690" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="PXbW7TTrz2ju" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="57" fillcolor="#ffffc0" y="210" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="aIaN4h6uKkD9" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="206" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="CGUDRreoOGLV" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="324" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="hmNho4ZPK9kO" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="808" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="rqG9aRIlhkw8" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="572" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="bbvypETW0oBp" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="104" showattsigs="601" x="926" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="skCDuwZjkqsJ" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="116" showattsigs="601" x="442" fillcolor="#ffffc0" y="203" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="F84xty3SXwQM" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="131" showattsigs="601" x="574" fillcolor="#ffffc0" y="105" drawascircle="0" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="IP6J2mSVdYuI" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="122" showattsigs="601" x="346" fillcolor="#ffffc0" y="108" drawascircle="0" showopsigs="601" linewidth="none" height="50" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="Akm7QN7AHRmr" showoperations="1" showpackage="0" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="44" showattsigs="601" x="257" fillcolor="#ffffc0" y="367" drawascircle="0" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="9nhHFwqmiC5F" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="0" width="93" showattsigs="601" x="627" fillcolor="#ffffc0" y="411" drawascircle="0" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="IZgfuPC5et9j" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="390" fillcolor="none" y="510" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="hTBxR8mYvRo8" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="61" showattsigs="601" x="572" fillcolor="none" y="308" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="ct4oyJ4XxkRM" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="47" showattsigs="601" x="785" fillcolor="none" y="328" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="wUzneiU5rQWz" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="99" showattsigs="601" x="439" fillcolor="none" y="308" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="C3serzyRs2Gq" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="85" showattsigs="601" x="888" fillcolor="none" y="315" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="JILE2kbyEYlq" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="93" showattsigs="601" x="241" fillcolor="none" y="510" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="GEv6eQ3oTwSI" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="102" showattsigs="601" x="86" fillcolor="none" y="509" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tOhlQvZhEswG" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="0" width="79" showattsigs="601" x="185" fillcolor="#ffffc0" y="430" drawascircle="0" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="aVDm3wdHAWNo" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="1" width="77" showattsigs="601" x="94" fillcolor="none" y="703" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="gaVYXRgOY6wk" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="0" width="39" showattsigs="601" x="211" fillcolor="#ffffc0" y="867" drawascircle="0" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="vpxAnLvdeTtN" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
+ <classwidget usesdiagramfillcolor="1" width="94" showattsigs="601" x="299" fillcolor="none" y="793" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="xxs2He8xEbTl" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="89" showattsigs="601" x="257" fillcolor="none" y="716" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="298YD2I7rDFc" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="90" showattsigs="601" x="390" fillcolor="none" y="716" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="YADAb6VY2NZJ" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="97" showattsigs="601" x="180" fillcolor="none" y="623" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="qzoPIje0iDla" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="113" showattsigs="601" x="300" fillcolor="none" y="624" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="jCuu9h1l15IA" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="114" showattsigs="601" x="432" fillcolor="none" y="625" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="qMSm001oxqDD" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="151" showattsigs="601" x="780" fillcolor="none" y="603" showopsigs="601" linewidth="none" height="33" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="Xh3K34FdUz9N" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
+ </widgets>
+ <messages/>
+ <associations>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" linewidth="none" widgetbid="qcfLrS5M1BNT" widgetaid="IP6J2mSVdYuI" xmi.id="xYGMmzop8iTq" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="639" starty="105" />
+ <endpoint endx="488" endy="63" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="7" indexb="5" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="PXbW7TTrz2ju" xmi.id="cbrkJKapiGso" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="742" starty="203" />
+ <endpoint endx="667" endy="155" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="7" indexb="1" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="F84xty3SXwQM" xmi.id="HGcxWSlOJlyB" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="500" starty="203" />
+ <endpoint endx="592" endy="155" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="skCDuwZjkqsJ" xmi.id="Ab1RK0aXeWnN" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="926" starty="228" />
+ <endpoint endx="705" endy="130" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="7" indexb="2" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="bbvypETW0oBp" xmi.id="mkpOGcm1Kfiz" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="624" starty="203" />
+ <endpoint endx="611" endy="155" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="7" indexb="6" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="rqG9aRIlhkw8" xmi.id="yQoI3WFDAiXz" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="808" starty="228" />
+ <endpoint endx="686" endy="155" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="Akm7QN7AHRmr" widgetaid="aIaN4h6uKkD9" xmi.id="D5cOl7NlhB11" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="161" starty="235" />
+ <endpoint endx="346" endy="133" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" linewidth="none" widgetbid="Akm7QN7AHRmr" widgetaid="CGUDRreoOGLV" xmi.id="I210E2zD7Wjv" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="258" starty="203" />
+ <endpoint endx="376" endy="158" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" linewidth="none" widgetbid="Akm7QN7AHRmr" widgetaid="hmNho4ZPK9kO" xmi.id="8QhFuQ9djQpx" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="376" starty="203" />
+ <endpoint endx="407" endy="158" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" linewidth="none" widgetbid="qcfLrS5M1BNT" widgetaid="Akm7QN7AHRmr" xmi.id="HORfVbAqsASF" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="407" starty="108" />
+ <endpoint endx="436" endy="63" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="9nhHFwqmiC5F" widgetaid="hTBxR8mYvRo8" xmi.id="wRdNL3dESLxq" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="416" starty="510" />
+ <endpoint endx="286" endy="400" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="9nhHFwqmiC5F" widgetaid="aVDm3wdHAWNo" xmi.id="QfZsyUgDwCdE" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="224" starty="430" />
+ <endpoint endx="271" endy="400" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" linewidth="none" widgetbid="aVDm3wdHAWNo" widgetaid="GEv6eQ3oTwSI" xmi.id="m6JgJxuxF0ZS" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="287" starty="510" />
+ <endpoint endx="244" endy="463" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="4" indexb="1" linewidth="none" widgetbid="aVDm3wdHAWNo" widgetaid="tOhlQvZhEswG" xmi.id="w6nC4KenR7VK" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="120" starty="509" />
+ <endpoint endx="204" endy="463" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="IZgfuPC5et9j" widgetaid="hTBxR8mYvRo8" xmi.id="FQDgVhy3fata" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="468" starty="526" />
+ <endpoint endx="673" endy="444" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="6" indexb="2" linewidth="none" widgetbid="IZgfuPC5et9j" widgetaid="ct4oyJ4XxkRM" xmi.id="QKU5uNfoWbWw" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="602" starty="341" />
+ <endpoint endx="658" endy="411" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="6" indexb="4" linewidth="none" widgetbid="IZgfuPC5et9j" widgetaid="wUzneiU5rQWz" xmi.id="pTZJ24DUtHV7" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="785" starty="344" />
+ <endpoint endx="689" endy="411" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="6" indexb="1" linewidth="none" widgetbid="IZgfuPC5et9j" widgetaid="C3serzyRs2Gq" xmi.id="FVX6k0DUiIFO" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="488" starty="341" />
+ <endpoint endx="642" endy="411" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="6" indexb="5" linewidth="none" widgetbid="IZgfuPC5et9j" widgetaid="JILE2kbyEYlq" xmi.id="O6Q4PdQp630z" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="888" starty="331" />
+ <endpoint endx="704" endy="411" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="ct4oyJ4XxkRM" widgetaid="bbvypETW0oBp" xmi.id="Nm6IuOKL2p8Q" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="606" starty="253" />
+ <endpoint endx="602" endy="308" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="hTBxR8mYvRo8" widgetaid="PXbW7TTrz2ju" xmi.id="voyxe4LTjWGU" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="724" starty="253" />
+ <endpoint endx="442" endy="510" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="wUzneiU5rQWz" widgetaid="rqG9aRIlhkw8" xmi.id="72AqYOKRMHJR" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="842" starty="253" />
+ <endpoint endx="808" endy="328" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="JILE2kbyEYlq" widgetaid="skCDuwZjkqsJ" xmi.id="oRRBiiasqfli" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="960" starty="253" />
+ <endpoint endx="930" endy="315" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="6" indexa="3" totalcountb="7" indexb="3" linewidth="none" widgetbid="IP6J2mSVdYuI" widgetaid="IZgfuPC5et9j" xmi.id="nh1bNmIzxZnM" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="673" starty="411" />
+ <endpoint endx="630" endy="155" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="hTBxR8mYvRo8" widgetaid="GEv6eQ3oTwSI" xmi.id="EQmAyZWqEm8W" type="501" linecolor="none" >
+ <linepath>
+ <startpoint startx="334" starty="526" />
+ <endpoint endx="390" endy="526" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="2" totalcountb="4" indexb="2" linewidth="none" widgetbid="aVDm3wdHAWNo" widgetaid="tOhlQvZhEswG" xmi.id="drBpcKL7NF7J" type="501" linecolor="none" >
+ <linepath>
+ <startpoint startx="154" starty="509" />
+ <endpoint endx="224" endy="463" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="vpxAnLvdeTtN" widgetaid="xxs2He8xEbTl" xmi.id="1hEFIhzIq5q2" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="346" starty="826" />
+ <endpoint endx="250" endy="883" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="xxs2He8xEbTl" widgetaid="298YD2I7rDFc" xmi.id="32Ou7EuDIzAb" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="301" starty="749" />
+ <endpoint endx="330" endy="793" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="xxs2He8xEbTl" widgetaid="YADAb6VY2NZJ" xmi.id="FSqWR05kfUX8" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="435" starty="749" />
+ <endpoint endx="361" endy="793" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="vpxAnLvdeTtN" widgetaid="gaVYXRgOY6wk" xmi.id="3ZJj1oppDDO8" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="132" starty="736" />
+ <endpoint endx="230" endy="867" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="gaVYXRgOY6wk" widgetaid="tOhlQvZhEswG" xmi.id="SiygvKoetT8z" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="120" starty="542" />
+ <endpoint endx="132" endy="703" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="298YD2I7rDFc" widgetaid="qzoPIje0iDla" xmi.id="MdzLjIWXcyJa" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="228" starty="656" />
+ <endpoint endx="286" endy="716" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="298YD2I7rDFc" widgetaid="jCuu9h1l15IA" xmi.id="pagPYz0SILJP" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="356" starty="657" />
+ <endpoint endx="316" endy="716" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="YADAb6VY2NZJ" widgetaid="qMSm001oxqDD" xmi.id="wVPFqjek6i4j" type="500" linecolor="none" >
+ <linepath>
+ <startpoint startx="489" starty="658" />
+ <endpoint endx="435" endy="716" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="jCuu9h1l15IA" widgetaid="GEv6eQ3oTwSI" xmi.id="PgZTObD3OmM7" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="272" starty="543" />
+ <endpoint endx="356" endy="624" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="qMSm001oxqDD" widgetaid="GEv6eQ3oTwSI" xmi.id="KzujlEoJsMMa" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="303" starty="543" />
+ <endpoint endx="489" endy="625" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="qzoPIje0iDla" widgetaid="tOhlQvZhEswG" xmi.id="VaVNvryO8CwG" type="503" linecolor="none" >
+ <linepath>
+ <startpoint startx="154" starty="542" />
+ <endpoint endx="228" endy="623" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="10" visibilityB="200" totalcountb="3" indexb="2" linewidth="none" widgetbid="rqG9aRIlhkw8" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="905" starty="603" />
+ <endpoint endx="877" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="11" visibilityB="200" totalcountb="3" indexb="2" linewidth="none" widgetbid="skCDuwZjkqsJ" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="918" starty="603" />
+ <endpoint endx="995" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="7" visibilityB="200" totalcountb="3" indexb="2" linewidth="none" widgetbid="bbvypETW0oBp" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="868" starty="603" />
+ <endpoint endx="641" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="4" visibilityB="200" totalcountb="3" indexb="2" linewidth="none" widgetbid="F84xty3SXwQM" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="830" starty="603" />
+ <endpoint endx="519" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="2" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="CGUDRreoOGLV" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="805" starty="603" />
+ <endpoint endx="258" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="3" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="hmNho4ZPK9kO" widgetaid="Xh3K34FdUz9N" roleBdoc="" documentation="" roleAdoc="" type="509" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+ <linepath>
+ <startpoint startx="817" starty="603" />
+ <endpoint endx="376" endy="253" />
+ </linepath>
+ </assocwidget>
+ <assocwidget totalcounta="12" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widge...
[truncated message content] |
|
From: <chr...@us...> - 2008-11-23 11:40:15
|
Revision: 468
http://aceunit.svn.sourceforge.net/aceunit/?rev=468&view=rev
Author: christianhujer
Date: 2008-11-23 11:40:10 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Added Makefile for java (simply invokes ant if necessary).
Added Paths:
-----------
trunk/src/java/Makefile
Added: trunk/src/java/Makefile
===================================================================
--- trunk/src/java/Makefile (rev 0)
+++ trunk/src/java/Makefile 2008-11-23 11:40:10 UTC (rev 468)
@@ -0,0 +1,4 @@
+SOURCES=$(sort $(shell find . -name "*.java"))
+
+AceUnit.jar: $(SOURCES)
+ ant
Property changes on: trunk/src/java/Makefile
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 11:37:43
|
Revision: 467
http://aceunit.svn.sourceforge.net/aceunit/?rev=467&view=rev
Author: christianhujer
Date: 2008-11-23 11:37:40 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Added quickstart documentation.
Added Paths:
-----------
trunk/QUICKSTART
Added: trunk/QUICKSTART
===================================================================
--- trunk/QUICKSTART (rev 0)
+++ trunk/QUICKSTART 2008-11-23 11:37:40 UTC (rev 467)
@@ -0,0 +1,37 @@
+QUICKSTART
+==========
+
+This is a quick start guide to AceUnit.
+
+AceUnit is easy, so this only 3 steps.
+
+
+Step 1: Read the documentation.
+AceUnit consists of more comment lines than code lines.
+The developers took a lot of care that AceUnit is well-documented.
+If you have a question, try to find the answer in the documentation.
+Basically everything is there.
+And especially look at the tests.
+The tests are perfect examples of how to use and integrate AceUnit.
+
+Step 2: Never modify AceUnit.
+Do not modify AceUnit.
+Don't do that.
+AceUnit is designed to be easy yet flexible and extensible without modifying it.
+If you modify AceUnit, you will increase your own effort of upgrading to a newer version of AceUnit.
+If you think you need to modify AceUnit, you should rather contact the AceUnit developers.
+They can support you.
+They can change AceUnit in a way that your extension becomes possible without modifying AceUnit.
+Or, if your extension is useful, they can implement your idea in AceUnit.
+
+Step 3: Use AceUnit.
+How to use it should be clear from Step 1.
+Again, take a look at the tests.
+The tests are perfect examples of how to use and integrate AceUnit.
+
+
+Hints:
+* Make your build find the AceUnit sources.
+* You need to compile AceUnit.c and AceUnitData.c plus a Logger of your choice.
+* Don't forget to add AceUnit to the include path.
+* Invoke the AceUnit generator (AceUnit*.jar).
Property changes on: trunk/QUICKSTART
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 11:37:03
|
Revision: 466
http://aceunit.svn.sourceforge.net/aceunit/?rev=466&view=rev
Author: christianhujer
Date: 2008-11-23 11:36:58 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Fixed bug in AceUnitPrintf.c: va_end() was missing.
Modified Paths:
--------------
trunk/src/native/AceUnitPrintf.c
Modified: trunk/src/native/AceUnitPrintf.c
===================================================================
--- trunk/src/native/AceUnitPrintf.c 2008-11-23 11:33:55 UTC (rev 465)
+++ trunk/src/native/AceUnitPrintf.c 2008-11-23 11:36:58 UTC (rev 466)
@@ -138,4 +138,5 @@
}
}
}
+ va_end(args);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 11:34:37
|
Revision: 465
http://aceunit.svn.sourceforge.net/aceunit/?rev=465&view=rev
Author: christianhujer
Date: 2008-11-23 11:33:55 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Extracted common parts of the Makefiles into a separate file.
Modified Paths:
--------------
trunk/src/native/test/basic/Makefile
trunk/src/native/test/basicEmbedded/Makefile
trunk/src/native/test/comment/Makefile
trunk/src/native/test/cplusplus/Makefile
trunk/src/native/test/group/Makefile
trunk/src/native/test/longjmp/Makefile
trunk/src/native/test/loop/Makefile
trunk/src/native/test/recursive/Makefile
trunk/src/native/test/twoFixtures/Makefile
trunk/src/native/test/xmlLog/Makefile
Added Paths:
-----------
trunk/src/native/test/common.mak
Modified: trunk/src/native/test/basic/Makefile
===================================================================
--- trunk/src/native/test/basic/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/basic/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/basicEmbedded/Makefile
===================================================================
--- trunk/src/native/test/basicEmbedded/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/basicEmbedded/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1,3 @@
LOGGER=MiniRamLogger
CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/comment/Makefile
===================================================================
--- trunk/src/native/test/comment/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/comment/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1,2 @@
-LOGGER=FullPlainLogger
CVERSION=c99
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Added: trunk/src/native/test/common.mak
===================================================================
--- trunk/src/native/test/common.mak (rev 0)
+++ trunk/src/native/test/common.mak 2008-11-23 11:33:55 UTC (rev 465)
@@ -0,0 +1,52 @@
+LOGGER?=FullPlainLogger
+CVERSION?=c89
+
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
+
+VPATH=$(ACEUNIT_PATH)/native
+
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
+
+LINT=splint
+
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
+C_and_LD_FLAGS=-fprofile-arcs
+CFLAGS?=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
+LDFLAGS=$(C_and_LD_FLAGS)
+LINTFLAGS=-badflag -weak
+
+.PHONY : all clean coverage lint test
+
+all: test
+
+RunTests: $(OBJECTS)
+
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
+
+%.d: %.c
+ $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
+
+coverage: test
+ gcov *.c
+
+test: RunTests
+ ./RunTests
+
+clean:
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
+
+lint: $(LINTOUTS)
+
+$(OBJECTS) $(DEPENDS): Makefile
+
+ifneq ($(MAKECMDGOALS),clean)
+-include $(DEPENDS)
+endif
Property changes on: trunk/src/native/test/common.mak
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/native/test/cplusplus/Makefile
===================================================================
--- trunk/src/native/test/cplusplus/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/cplusplus/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,54 +1,5 @@
-LOGGER=FullPlainLogger
# It looks strange defining CC to a C++ compiler, but that's intentional:
# This testcase tests if AceUnit also works fine if somebody uses a C++ compiler to compile AceUnit C code.
CC=$(CXX)
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
CFLAGS=-fdiagnostics-show-option -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/group/Makefile
===================================================================
--- trunk/src/native/test/group/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/group/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/longjmp/Makefile
===================================================================
--- trunk/src/native/test/longjmp/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/longjmp/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/loop/Makefile
===================================================================
--- trunk/src/native/test/loop/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/loop/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/recursive/Makefile
===================================================================
--- trunk/src/native/test/recursive/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/recursive/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/twoFixtures/Makefile
===================================================================
--- trunk/src/native/test/twoFixtures/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/twoFixtures/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1 @@
-LOGGER=FullPlainLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
Modified: trunk/src/native/test/xmlLog/Makefile
===================================================================
--- trunk/src/native/test/xmlLog/Makefile 2008-11-23 11:22:01 UTC (rev 464)
+++ trunk/src/native/test/xmlLog/Makefile 2008-11-23 11:33:55 UTC (rev 465)
@@ -1,52 +1,2 @@
LOGGER=JUnitXmlLogger
-CVERSION=c89
-
-ACEUNIT_PATH=../../..
-ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
-ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-
-VPATH=$(ACEUNIT_PATH)/native
-
-SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
-SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
-OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(OBJECTS:.o=.d)
-LINTOUTS=$(OBJECTS:.o=.ln)
-
-LINT=splint
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
-C_and_LD_FLAGS=-fprofile-arcs
-CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-LDFLAGS=$(C_and_LD_FLAGS)
-LINTFLAGS=-badflag -weak
-
-.PHONY : all clean coverage lint test
-
-all: test
-
-RunTests: $(OBJECTS)
-
-$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
- ant -f $(ACEUNIT_PATH)/java/build.xml
-
-%.d: %.c
- $(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
-
-coverage: test
- gcov *.c
-
-test: RunTests
- ./RunTests
-
-clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-
-lint: $(LINTOUTS)
-
-$(OBJECTS) $(DEPENDS): Makefile
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(DEPENDS)
-endif
+include ../common.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 11:22:06
|
Revision: 464
http://aceunit.svn.sourceforge.net/aceunit/?rev=464&view=rev
Author: christianhujer
Date: 2008-11-23 11:22:01 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Improved Makefiles for tests.
Modified Paths:
--------------
trunk/src/native/test/basic/Makefile
trunk/src/native/test/basicEmbedded/Makefile
trunk/src/native/test/comment/Makefile
trunk/src/native/test/cplusplus/Makefile
trunk/src/native/test/group/Makefile
trunk/src/native/test/longjmp/Makefile
trunk/src/native/test/loop/Makefile
trunk/src/native/test/recursive/Makefile
trunk/src/native/test/twoFixtures/Makefile
trunk/src/native/test/xmlLog/Makefile
Modified: trunk/src/native/test/basic/Makefile
===================================================================
--- trunk/src/native/test/basic/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/basic/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/basicEmbedded/Makefile
===================================================================
--- trunk/src/native/test/basicEmbedded/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/basicEmbedded/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=MiniRamLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/comment/Makefile
===================================================================
--- trunk/src/native/test/comment/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/comment/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c99
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/cplusplus/Makefile
===================================================================
--- trunk/src/native/test/cplusplus/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/cplusplus/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -3,49 +3,35 @@
# This testcase tests if AceUnit also works fine if somebody uses a C++ compiler to compile AceUnit C code.
CC=$(CXX)
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -56,15 +42,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/group/Makefile
===================================================================
--- trunk/src/native/test/group/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/group/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/longjmp/Makefile
===================================================================
--- trunk/src/native/test/longjmp/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/longjmp/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/loop/Makefile
===================================================================
--- trunk/src/native/test/loop/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/loop/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/recursive/Makefile
===================================================================
--- trunk/src/native/test/recursive/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/recursive/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/twoFixtures/Makefile
===================================================================
--- trunk/src/native/test/twoFixtures/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/twoFixtures/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=FullPlainLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
Modified: trunk/src/native/test/xmlLog/Makefile
===================================================================
--- trunk/src/native/test/xmlLog/Makefile 2008-11-23 01:09:53 UTC (rev 463)
+++ trunk/src/native/test/xmlLog/Makefile 2008-11-23 11:22:01 UTC (rev 464)
@@ -1,49 +1,35 @@
LOGGER=JUnitXmlLogger
CVERSION=c89
-ACE_UNIT_PATH=../../..
-ACE_UNIT_JAVA_SRC=$(shell find $(ACE_UNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PATH=../../..
+ACEUNIT_JAVA_SRC=$(shell find $(ACEUNIT_PATH)/java/src -name "*.java")
+ACEUNIT_PARTS=AceUnit AceUnitData $(LOGGER)
-LINT=splint
+VPATH=$(ACEUNIT_PATH)/native
-PARTS=\
- AceUnit \
- AceUnitData \
- $(LOGGER) \
+SUITES:=$(shell java -jar $(ACEUNIT_PATH)/java/AceUnit.jar .)
+SOURCES=$(sort $(shell find . -name "*.c")) $(SUITES)
+OBJECTS=$(SOURCES:.c=.o) $(addsuffix .o,$(ACEUNIT_PARTS))
+HEADERS=$(SOURCES:.c=.h)
+DEPENDS=$(OBJECTS:.o=.d)
+LINTOUTS=$(OBJECTS:.o=.ln)
-VPATH=$(ACE_UNIT_PATH)/native
+LINT=splint
-OBJECTS=$(addsuffix .o,$(PARTS))
-
-LINTOUTS=$(addsuffix .ln,$(PARTS))
-
-CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACE_UNIT_PATH)/native
-
+CPPFLAGS=-DACEUNIT_CONFIG_FILE=\"AceUnitConfig.h\" -I . -I $(ACEUNIT_PATH)/native
C_and_LD_FLAGS=-fprofile-arcs
-
CFLAGS=-fdiagnostics-show-option -std=$(CVERSION) -pedantic $(C_and_LD_FLAGS) -ftest-coverage -W -Wall -g
-
-SOURCES=$(sort $(shell find . -name "*.c"))
-SUITES:=$(shell java -jar $(ACE_UNIT_PATH)/java/AceUnit.jar .)
-SOURCES+=$(SUITES)
-OBJECTS+=$(patsubst %.c,%.o,$(SOURCES))
-HEADERS=$(SOURCES:.c=.h)
-DEPENDS=$(patsubst %.o,%.d,$(OBJECTS))
-GCOV=$(patsubst %.o,%.gcov,$(OBJECTS))
-GCNO=$(patsubst %.o,%.gcno,$(OBJECTS))
-GCDA=$(patsubst %.o,%.gcda,$(OBJECTS))
-
LDFLAGS=$(C_and_LD_FLAGS)
-
LINTFLAGS=-badflag -weak
-.PHONY : all
+.PHONY : all clean coverage lint test
+
all: test
RunTests: $(OBJECTS)
-$(ACE_UNIT_PATH)/java/AceUnit.jar: $(ACE_UNIT_JAVA_SRC)
- ant -f $(ACE_UNIT_PATH)/java/build.xml
+$(ACEUNIT_PATH)/java/AceUnit.jar: $(ACEUNIT_JAVA_SRC)
+ ant -f $(ACEUNIT_PATH)/java/build.xml
%.d: %.c
$(CPP) -M -MM -MG $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
@@ -54,15 +40,13 @@
test: RunTests
./RunTests
-.PHONY : clean
clean:
- rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(GCOV) $(GCNO) $(GCDA) $(SUITES)
+ rm -f $(OBJECTS) $(HEADERS) $(DEPENDS) RunTests $(OBJECTS:.o=.gcov) $(OBJECTS:.o=.gcno) $(OBJECTS:.o=.gcda) $(SUITES)
-.PHONY : lint
lint: $(LINTOUTS)
-$(OBJECTS) $(OBJECTS:.o=.d): Makefile
+$(OBJECTS) $(DEPENDS): Makefile
ifneq ($(MAKECMDGOALS),clean)
--include $(OBJECTS:.o=.d)
+-include $(DEPENDS)
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 01:10:01
|
Revision: 463
http://aceunit.svn.sourceforge.net/aceunit/?rev=463&view=rev
Author: christianhujer
Date: 2008-11-23 01:09:53 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
Added directory structure information about test directory.
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2008-11-22 12:47:47 UTC (rev 462)
+++ trunk/README 2008-11-23 01:09:53 UTC (rev 463)
@@ -37,3 +37,7 @@
The source code that you need for building programs with AceUnit.
This also contains tests which can be used to test AceUnit with itself.
Also, these tests are examples of how to use AceUnit.
+
+src/native/test
+ Several unit tests where AceUnit is tested with itself.
+ This is excellent examples of how to use AceUnit.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-22 12:47:54
|
Revision: 462
http://aceunit.svn.sourceforge.net/aceunit/?rev=462&view=rev
Author: christianhujer
Date: 2008-11-22 12:47:47 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Extracted assertions into a header file of their own.
Modified Paths:
--------------
trunk/src/native/AceUnit.h
Added Paths:
-----------
trunk/src/native/AceUnitAssert.h
Modified: trunk/src/native/AceUnit.h
===================================================================
--- trunk/src/native/AceUnit.h 2008-11-22 12:40:09 UTC (rev 461)
+++ trunk/src/native/AceUnit.h 2008-11-22 12:47:47 UTC (rev 462)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, Christian Hujer
+/* Copyright (c) 2007-2008, Christian Hujer
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -469,55 +469,8 @@
} AssertionError_t;
-/** Let a test case fail.
- * @param message Message, usually with the reason why the test case failed.
- */
-#define fail(message) newAssertionError(message)
+#include "AceUnitAssert.h"
-/** Asserts that the specified condition is true.
- * If the condition is not true, the test case fails and raises an Assertion Error that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param condition Condition to assert.
- */
-#define assertTrue(message, condition) if (!(condition)) { fail(message); }
-
-/** Asserts that the specified condition is false.
- * If the condition is not false, the test case fails and raises an Assertion Error that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param condition Condition to assert for false.
- */
-#define assertFalse(message, condition) if (condition) { fail(message); }
-
-/** Asserts that two values are equal.
- * If the values are not equal, the test case fails and raises an Assertion Error that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param expected Expected value.
- * @param actual Actual value.
- */
-#define assertEquals(message, expected, actual) if (!((expected) == (actual))) { fail(message); } /* TODO: expected vs. actual in message */
-
-/** Asserts that two values are not equal.
- * If the values are equal, the test case fails and raises an {@link AssertionError_t} that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param unexpected Not expected value.
- * @param actual Actual value.
- */
-#define assertNotEquals(message, unexpected, actual) if ((unexpected) == (actual)) { fail(message); } /* TODO: expected vs. actual in message */
-
-/** Asserts that a pointer is not NULL.
- * If the pointer is NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param ptr Pointer expected to be not NULL.
- */
-#define assertNotNull(message, ptr) if (NULL == (ptr)) { fail(message); }
-
-/** Asserts that a pointer is NULL.
- * If the pointer is not NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
- * @param message Message, usually with the positive description of why the assertion should not fail.
- * @param ptr Pointer expected to be NULL.
- */
-#define assertNull(message, ptr) if (NULL != (ptr)) { fail(message); }
-
/** Method signature for annotated test methods.
* @see #A_Test
* @see #A_Before
Added: trunk/src/native/AceUnitAssert.h
===================================================================
--- trunk/src/native/AceUnitAssert.h (rev 0)
+++ trunk/src/native/AceUnitAssert.h 2008-11-22 12:47:47 UTC (rev 462)
@@ -0,0 +1,83 @@
+/* Copyright (c) 2008, 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.
+ */
+
+#ifndef ACEUNITASSERT_H
+/** Include shield to protect the header file from being included more than once. */
+#define ACEUNITASSERT_H 1
+
+#include "AceUnit.h"
+
+/** Let a test case fail.
+ * @param message Message, usually with the reason why the test case failed.
+ */
+#define fail(message) newAssertionError(message)
+
+/** Asserts that the specified condition is true.
+ * If the condition is not true, the test case fails and raises an Assertion Error that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param condition Condition to assert.
+ */
+#define assertTrue(message, condition) if (!(condition)) { fail(message); }
+
+/** Asserts that the specified condition is false.
+ * If the condition is not false, the test case fails and raises an Assertion Error that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param condition Condition to assert for false.
+ */
+#define assertFalse(message, condition) if (condition) { fail(message); }
+
+/** Asserts that two values are equal.
+ * If the values are not equal, the test case fails and raises an Assertion Error that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param expected Expected value.
+ * @param actual Actual value.
+ */
+#define assertEquals(message, expected, actual) if (!((expected) == (actual))) { fail(message); } /* TODO: expected vs. actual in message */
+
+/** Asserts that two values are not equal.
+ * If the values are equal, the test case fails and raises an {@link AssertionError_t} that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param unexpected Not expected value.
+ * @param actual Actual value.
+ */
+#define assertNotEquals(message, unexpected, actual) if ((unexpected) == (actual)) { fail(message); } /* TODO: expected vs. actual in message */
+
+/** Asserts that a pointer is not NULL.
+ * If the pointer is NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param ptr Pointer expected to be not NULL.
+ */
+#define assertNotNull(message, ptr) if (NULL == (ptr)) { fail(message); }
+
+/** Asserts that a pointer is NULL.
+ * If the pointer is not NULL, the test case fails and raises an {@link AssertionError_t} that will be logged.
+ * @param message Message, usually with the positive description of why the assertion should not fail.
+ * @param ptr Pointer expected to be NULL.
+ */
+#define assertNull(message, ptr) if (NULL != (ptr)) { fail(message); }
+
+#endif /* ACEUNITASSERT_H */
Property changes on: trunk/src/native/AceUnitAssert.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-22 12:40:18
|
Revision: 461
http://aceunit.svn.sourceforge.net/aceunit/?rev=461&view=rev
Author: christianhujer
Date: 2008-11-22 12:40:09 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Clarified the static model of annotations by separating direct annotations and meta annotations.
Modified Paths:
--------------
trunk/src/native/AceUnitAnnotations.h
Modified: trunk/src/native/AceUnitAnnotations.h
===================================================================
--- trunk/src/native/AceUnitAnnotations.h 2008-11-22 09:53:26 UTC (rev 460)
+++ trunk/src/native/AceUnitAnnotations.h 2008-11-22 12:40:09 UTC (rev 461)
@@ -47,8 +47,19 @@
#define ACEUNIT_ANNOTATION
#endif
+/** A direct annotation is an annotation which turns an arbitrary method into a test fixture method.
+ * A method can have only zero or one direct annotations, not more.
+ * That means direct annotations cannot be combined.
+ */
+#define ACEUNIT_DIRECT_ANNOTATION ACEUNIT_ANNOTATION
+
+/** A meta annotation is an annotation which cannot be used standalone but only provides additional information for another annotation.
+ * A method can have multiple meta annotations, but only if it already was annotated with a direct annotation.
+ */
+#define ACEUNIT_META_ANNOTATION ACEUNIT_ANNOTATION
+
/** Test annotation, use for test cases. */
-#define A_Test ACEUNIT_ANNOTATION
+#define A_Test ACEUNIT_DIRECT_ANNOTATION
/** Loop annotation, use for looping test cases.
*
@@ -59,24 +70,24 @@
*
* @param times Number of times to loop.
*/
-#define A_Loop(times) ACEUNIT_ANNOTATION
+#define A_Loop(times) ACEUNIT_META_ANNOTATION
/** Before annotation, use for methods that should be invoked before each test case in a fixture. */
-#define A_Before ACEUNIT_ANNOTATION
+#define A_Before ACEUNIT_DIRECT_ANNOTATION
/** After annotation, use for methods that should be invoked after each test case in a fixture. */
-#define A_After ACEUNIT_ANNOTATION
+#define A_After ACEUNIT_DIRECT_ANNOTATION
/** BeforeClass annotation, use for methods that should be invoked once for the fixture before all of its test cases. */
-#define A_BeforeClass ACEUNIT_ANNOTATION
+#define A_BeforeClass ACEUNIT_DIRECT_ANNOTATION
/** AfterClass annotation, use for methods that should be invoked once for the fixture after all of its test cases. */
-#define A_AfterClass ACEUNIT_ANNOTATION
+#define A_AfterClass ACEUNIT_DIRECT_ANNOTATION
/** Ignore annotation, use for test cases to ignore.
* This annotation is only allowed for methods annotated as {@link #A_Test}.
*/
-#define A_Ignore ACEUNIT_ANNOTATION
+#define A_Ignore ACEUNIT_META_ANNOTATION
/** Puts a test in a specific group.
* This annotation is only allowed for methods annotated as {@link #A_Test}.
@@ -90,7 +101,7 @@
* The default group of a test is group 0 (zero).
*/
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && defined(ACEUNIT_C99)
-#define A_Group(...) ACEUNIT_ANNOTATION
+#define A_Group(...) ACEUNIT_META_ANNOTATION
#else
#define A_Group(group)
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-22 09:53:35
|
Revision: 460
http://aceunit.svn.sourceforge.net/aceunit/?rev=460&view=rev
Author: christianhujer
Date: 2008-11-22 09:53:26 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Creating release tag 0.9.1 for branch 0.9.
Added Paths:
-----------
tags/0.9.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-22 09:52:44
|
Revision: 459
http://aceunit.svn.sourceforge.net/aceunit/?rev=459&view=rev
Author: christianhujer
Date: 2008-11-22 09:52:38 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Updated release script to auto-delete uploads and auto-create branch.
Modified Paths:
--------------
release.sh
Modified: release.sh
===================================================================
--- release.sh 2008-11-22 09:42:47 UTC (rev 458)
+++ release.sh 2008-11-22 09:52:38 UTC (rev 459)
@@ -14,14 +14,12 @@
sfusername=$3
svnbaseurl=$(svn info | grep URL | sed 's/URL: //')
-echo $svnbaseurl
-svntrunkurl=$svnrepopath/trunk
-svnbranchurl=$svnrepopath/branches/$branchname
-svntagurl=$svnrepopath/tags/$releasename
+svntrunkurl=$svnbaseurl/trunk
+svnbranchurl=$svnbaseurl/branches/$branchname
+svntagurl=$svnbaseurl/tags/$releasename
if [ -d uploads ]
then
- echo deleting existing uploads
rm -rf uploads
fi
@@ -29,7 +27,6 @@
if [ ! -d branches/$branchname ]
then
- echo branch $branchname does not already exist
svn cp -m "Creating branch for $branchname." $svntrunkurl $svnbranchurl
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
