Author: closettop_nightlybuild Date: 2012-05-18 12:01:22-0700 New Revision: 19884
Modified: trunk/pom.xml trunk/src/argouml-app/.gitignore trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java trunk/tools/maven/parentpom.xml Log: Fixed build. Download testmodels using maven. Added extra clean-up after User-Defined Profile tests. Ignored the backup file for test.xml. Change-Id: I7fd49891cc5ed8d95620d7845aaf7c7135306c59 Submitted-by: Linus Tolke. Modified: trunk/pom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/pom.xml?view=diff&pathrev=19884&r1=19883&r2=19884 ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml 2012-05-18 12:01:22-0700 @@ -11,7 +11,7 @@ <parent> <groupId>org.argouml</groupId> <artifactId>parentpom</artifactId> - <version>0.35.1</version> + <version>0.35.2</version> <relativePath>tools/maven/parentpom.xml</relativePath> </parent> Modified: trunk/src/argouml-app/.gitignore Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/.gitignore?view=diff&pathrev=19884&r1=19883&r2=19884 ============================================================================== --- trunk/src/argouml-app/.gitignore (original) +++ trunk/src/argouml-app/.gitignore 2012-05-18 12:01:22-0700 @@ -3,6 +3,7 @@ /build-eclipse-tests /Alittlebitofeverything2.zargo /test.xmi +/test.xmi~ /testSaveProfileModel.xmi /target /argouml.log Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java?view=diff&pathrev=19884&r1=19883&r2=19884 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java (original) +++ trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java 2012-05-18 12:01:22-0700 @@ -83,6 +83,19 @@ @Override protected void tearDown() throws Exception { + // There seems to be cases where we don't erase the profile. + // Let's make sure it is deleted. + Collection rootElements = Model.getFacade().getRootElements(); + for (Object rootElement : rootElements) { + if (Model.getFacade().isAModel(rootElement)) { + String name = Model.getFacade().getName(rootElement); + if ("displayName".equals(name) + || "testLoadingConstructorProfile".equals(name)) { + Model.getUmlFactory().deleteExtent(rootElement); + } + } + } + ProfileFacade.reset(); FileHelper.delete(testDir); super.tearDown(); Modified: trunk/tools/maven/parentpom.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/maven/parentpom.xml?view=diff&pathrev=19884&r1=19883&r2=19884 ============================================================================== --- trunk/tools/maven/parentpom.xml (original) +++ trunk/tools/maven/parentpom.xml 2012-05-18 12:01:22-0700 @@ -18,7 +18,7 @@ included in the automatic updates of the version number. Until that is resolved references to this pom need to updated manually when this changes and no snapshot versions are possible. --> - <version>0.35.1</version> + <version>0.35.2</version> <packaging>pom</packaging> <name>parentpom</name> <description> @@ -133,6 +133,34 @@ <mainClass>org.argouml.application.Main</mainClass> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>unpack-testmodels</id> + <phase>process-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.argouml</groupId> + <artifactId>testmodels</artifactId> + <version>0.35.1</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/test-classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2961704 To unsubscribe from this discussion, e-mail: [[email protected]].
