Author: maurelio1234
Date: 2007-08-06 09:24:12-0700
New Revision: 13253
Added:
branches/gsoc2007/maurelio1234/tests/org/argouml/notation/TestNotationProvider.java
- copied unchanged from r13250, /trunk/tests/org/argouml/notation/TestNotationProvider.java
Removed:
branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/moduleloader/
branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProvider.java
Modified:
branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java
branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java
branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java
branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java
branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java
branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java
branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java
branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
Log:
merging tests with modifications in trunk
solving bugs on branch code
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java 2007-08-06 09:24:12-0700
@@ -94,10 +94,10 @@
"org.argouml.gefext",
"org.argouml.language.ui",
"org.argouml.moduleloader",
- "org.argouml.notation.providers",
+ //"org.argouml.notation.providers",//fails because sub-packages fail (?)
//"org.argouml.notation.providers.java",
//"org.argouml.notation.providers.uml",
- //"org.argouml.notation",
+ //"org.argouml.notation",//fails because sub-packages fail (?)
//"org.argouml.notation.ui",
"org.argouml.swingext",
"org.argouml.taskmgmt",
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProject.java 2007-08-06 09:24:12-0700
@@ -57,7 +57,7 @@
*/
public void testMakeUntitledProject() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
assertEquals(Translator.localize("misc.untitled-model"),
Model.getFacade().getName(p.getModel()));
// maybe next test is going to change in future
@@ -139,13 +139,13 @@
*/
public void testDeletePackageWithClassDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
assertEquals(Translator.localize("misc.untitled-model"),
Model.getFacade().getName(p.getModel()));
assertEquals(p.getRoot(), p.getModel());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a class and class diagram
Object package1 =
@@ -156,12 +156,12 @@
UMLClassDiagram cDiag = new UMLClassDiagram(package2);
p.addMember(cDiag);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(package2);
Model.getPump().flushModelEvents();
- assertEquals(sizeDiagrams, p.getDiagrams().size());
+ assertEquals(sizeDiagrams, p.getDiagramList().size());
assertEquals(sizeMembers, p.getMembers().size());
}
@@ -171,10 +171,10 @@
*/
public void testDeleteClassWithStateDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a class and class diagram
Object package1 =
@@ -191,7 +191,7 @@
machine);
p.addMember(d);
assertEquals("Diagram count incorrect", sizeDiagrams + 1,
- p.getDiagrams().size());
+ p.getDiagramList().size());
assertEquals("Member count incorrect", sizeMembers + 1,
p.getMembers().size());
p.moveToTrash(aClass);
@@ -200,7 +200,7 @@
assertTrue("Statemachine not in trash", p.isInTrash(machine));
assertTrue("Class not in trash", p.isInTrash(aClass));
assertEquals("Diagram count incorrect after trash", sizeDiagrams,
- p.getDiagrams().size());
+ p.getDiagramList().size());
assertEquals("Member count incorrect after trash", sizeMembers,
p.getMembers().size());
}
@@ -210,10 +210,10 @@
*/
public void testDeleteStateDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a class and class diagram
Object package1 =
@@ -229,13 +229,13 @@
Model.getFacade().getNamespace(machine),
machine);
p.addMember(d);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(d);
Model.getPump().flushModelEvents();
assertTrue("Statediagram not in trash", p.isInTrash(d));
- assertEquals(sizeDiagrams, p.getDiagrams().size());
+ assertEquals(sizeDiagrams, p.getDiagramList().size());
assertEquals(sizeMembers, p.getMembers().size());
}
@@ -245,7 +245,7 @@
*/
public void testDeleteClassWithInnerClass() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
// test with a class and an inner class
Object aClass = Model.getCoreFactory().buildClass("Test");
@@ -265,7 +265,7 @@
*/
public void testDeletePackageWithClass() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
// test with a class and class diagram
Object package1 =
@@ -286,10 +286,10 @@
*/
public void testDeletePackageWithStateDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a class and class diagram
Object package1 =
@@ -305,7 +305,7 @@
Model.getFacade().getNamespace(machine),
machine);
p.addMember(d);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(package1);
@@ -315,7 +315,7 @@
Model.getUmlFactory().isRemoved(aClass));
assertTrue("Statemachine not in trash",
Model.getUmlFactory().isRemoved(machine));
- assertEquals(sizeDiagrams, p.getDiagrams().size());
+ assertEquals(sizeDiagrams, p.getDiagramList().size());
assertEquals(sizeMembers, p.getMembers().size());
}
@@ -325,10 +325,10 @@
*/
public void testDeleteOperationWithStateDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a class and class diagram
Object package1 =
@@ -349,7 +349,7 @@
Model.getFacade().getNamespace(machine),
machine);
p.addMember(d);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(oper);
@@ -359,7 +359,7 @@
/* Changed by issue 4281: */
assertTrue("Statemachine in trash",
!Model.getUmlFactory().isRemoved(machine));
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
/* After issue 4284 will be solved, we
* may even delete the class, and the diagram
@@ -373,10 +373,10 @@
*/
public void testDeletePackageWithClassWithActivityDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a package and a class and activity diagram
Object package1 =
@@ -391,7 +391,7 @@
Model.getFacade().getNamespace(actgrph),
actgrph);
p.addMember(d);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(package1);
@@ -401,7 +401,7 @@
Model.getUmlFactory().isRemoved(aClass));
assertTrue("ActivityGraph not in trash",
Model.getUmlFactory().isRemoved(actgrph));
- assertEquals(sizeDiagrams, p.getDiagrams().size());
+ assertEquals(sizeDiagrams, p.getDiagramList().size());
assertEquals(sizeMembers, p.getMembers().size());
}
@@ -412,10 +412,10 @@
*/
public void testDeletePackageWithPackageWithActivityDiagram() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
int sizeMembers = p.getMembers().size();
- int sizeDiagrams = p.getDiagrams().size();
+ int sizeDiagrams = p.getDiagramList().size();
// test with a package and a class and activity diagram
Object package1 =
@@ -432,7 +432,7 @@
new UMLActivityDiagram(
Model.getFacade().getNamespace(actgrph), actgrph);
p.addMember(d);
- assertEquals(sizeDiagrams + 1, p.getDiagrams().size());
+ assertEquals(sizeDiagrams + 1, p.getDiagramList().size());
assertEquals(sizeMembers + 1, p.getMembers().size());
p.moveToTrash(package1);
@@ -442,7 +442,7 @@
Model.getUmlFactory().isRemoved(package2));
assertTrue("ActivityGraph not in trash",
Model.getUmlFactory().isRemoved(actgrph));
- assertEquals(sizeDiagrams, p.getDiagrams().size());
+ assertEquals(sizeDiagrams, p.getDiagramList().size());
assertEquals(sizeMembers, p.getMembers().size());
}
@@ -452,15 +452,15 @@
*/
public void testAddSearchPath() {
Project p = ProjectManager.getManager().getCurrentProject();
- assertNotNull(p.getSearchpath());
- assertTrue(p.getSearchpath().size() == 1);
+ assertNotNull(p.getSearchPathList());
+ assertTrue(p.getSearchPathList().size() == 1);
p.addSearchPath("PROJECT_DIR");
- assertTrue(p.getSearchpath().size() == 1);
+ assertTrue(p.getSearchPathList().size() == 1);
p.addSearchPath("foo");
p.addSearchPath("foo");
- assertTrue(p.getSearchpath().size() == 2);
+ assertTrue(p.getSearchPathList().size() == 2);
}
@@ -468,6 +468,7 @@
/*
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/kernel/TestProjectManager.java 2007-08-06 09:24:12-0700
@@ -58,7 +58,7 @@
*/
public void testMakeEmptyProject() {
Project p = ProjectManager.getManager().makeEmptyProject();
- assertEquals(2, p.getDiagrams().size());
+ assertEquals(2, p.getDiagramList().size());
assertEquals(Translator.localize("misc.untitled-model"),
Model.getFacade().getName(p.getModel()));
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/model/CheckUMLModelHelper.java 2007-08-06 09:24:12-0700
@@ -378,13 +378,13 @@
TestCase.assertTrue(
"Unexpected invalid stereotype",
Model.getExtensionMechanismsHelper()
- .isValidStereoType(base, stereo2));
+ .isValidStereotype(base, stereo2));
if (!(Model.getFacade().isAClass(base))) {
TestCase.assertTrue(
"Stereotype with base class of Class"
+ " incorrectly allowed for this metaclass",
!Model.getExtensionMechanismsHelper()
- .isValidStereoType(base, stereo1));
+ .isValidStereotype(base, stereo1));
} else {
Object inter =
Model.getCoreFactory().createInterface();
@@ -394,7 +394,7 @@
TestCase.assertTrue(
"Unexpected invalid stereotype",
!Model.getExtensionMechanismsHelper()
- .isValidStereoType(base, stereo3));
+ .isValidStereotype(base, stereo3));
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/model/GenericUmlObjectTestFixture.java 2007-08-06 09:24:12-0700
@@ -194,10 +194,12 @@
runTruthTest(Model.getFacade().isAObject(o),
Model.getMetaTypes().getObject());
-
+ runTruthTest(
+ Model.getFacade().isAPermission(o),
+ Model.getMetaTypes().getPermission());
runTruthTest(
- Model.getFacade().isAPermission(o),
- Model.getMetaTypes().getPermission());
+ Model.getFacade().isAPackageImport(o),
+ Model.getMetaTypes().getPackageImport());
runTruthTest(Model.getFacade().isAPackage(o),
Model.getMetaTypes().getPackage());
runTruthTest(
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java 2007-08-06 09:24:12-0700
@@ -25,10 +25,10 @@
package org.argouml.moduleloader;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import junit.framework.TestCase;
+
import org.argouml.model.InitializeModel;
/**
@@ -58,14 +58,13 @@
}
public void testAllModules() {
- Collection<String> all = ModuleLoader2.allModules();
- assertNotNull(all);
+ Collection<String> all = ModuleLoader2.allModules();
+ assertNotNull(all);
- Iterator<String> iter = all.iterator();
- while (iter.hasNext()) {
- assertNotNull(iter.next());
+ for (String module : all) {
+ assertNotNull(module);
+ }
}
- }
public void testIsSelected() {
assertFalse(ModuleLoader2.isSelected("some-module-that-do-not-exist"));
@@ -86,14 +85,13 @@
}
public void testGetExtensionLocations() {
- List<String> extensionLocations =
- ModuleLoader2.getInstance().getExtensionLocations();
- assertNotNull(extensionLocations);
- for (Iterator<String> iter = extensionLocations.iterator();
- iter.hasNext();) {
- assertNotNull(iter.next());
+ List<String> extensionLocations = ModuleLoader2.getInstance()
+ .getExtensionLocations();
+ assertNotNull(extensionLocations);
+ for (String extensionLocation : extensionLocations) {
+ assertNotNull(extensionLocation);
+ }
}
- }
public void testAddClassNegative() {
try {
Removed: branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProvider.java?view=auto&rev=13252
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java 2007-08-06 09:24:12-0700
@@ -34,6 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.notation.Notation;
import org.argouml.notation.NotationName;
+import org.argouml.notation.NotationProvider;
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java 2007-08-06 09:24:12-0700
@@ -37,7 +37,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
+import org.argouml.notation.providers.java.InitNotationJava;
/**
* @author michiel
@@ -116,6 +117,8 @@
*/
protected void setUp() {
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
}
/**
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java 2007-08-06 09:24:12-0700
@@ -32,7 +32,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
/**
* Test ParserDisplay: parsing transitions.
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/persistence/TestZargoFilePersister.java 2007-08-06 09:24:12-0700
@@ -34,6 +34,8 @@
import org.argouml.kernel.Project;
import org.argouml.model.InitializeModel;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
/**
* Testcase to load projects without exception.
@@ -44,6 +46,8 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
}
/**
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java 2007-08-06 09:24:12-0700
@@ -39,6 +39,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.persistence.PersistenceManager;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -96,6 +98,8 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
if (theDetailsPane == null) {
theDetailsPane =
@@ -122,6 +126,9 @@
public static Test suite() throws Exception {
InitializeModel.initializeDefault();
new InitNotation().init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
+
// constains instances of each modelelement
// used for testing so that we only use each modelelement
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/ui/targetmanager/TestTargetManager.java 2007-08-06 09:24:12-0700
@@ -37,6 +37,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagramImpl;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigNode;
import org.tigris.gef.presentation.FigRect;
@@ -452,7 +453,7 @@
final Object owner = new Object();
final Fig fig = new FigRect(0, 0, 12, 12); fig.setOwner(owner);
Object test = new Object();
- ArgoDiagram diag = new ArgoDiagram() {
+ ArgoDiagram diag = new ArgoDiagramImpl() {
public Fig getContainingFig(Object obj) {
if (obj == owner)
return fig;
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java 2007-08-06 09:24:12-0700
@@ -31,6 +31,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
@@ -58,6 +60,9 @@
public void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
+
InitializeModel.initializeDefault();
nodeTypes =
new Object[] {
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java 2007-08-06 09:24:12-0700
@@ -27,6 +27,8 @@
import junit.framework.TestCase;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
/**
@@ -52,6 +54,9 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
+
diagram = new UMLClassDiagram();
action = new ActionAddAllClassesFromModel("Add all classes from model",
diagram);
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration1.java 2007-08-06 09:24:12-0700
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectImpl;
import org.argouml.model.InitializeModel;
/**
@@ -55,30 +56,30 @@
}
/**
- * Tests whether the Java profile and formating strategy is set as the
+ * Tests whether the UML profile and formating strategy is set as the
* default ones
*/
- public void testJavaDefaultStrategyAndModel() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
-
- assertTrue("Java profile has not been set as the default one!", pc
- .getDefaultProfile() instanceof ProfileJava);
- assertTrue("Java formating strategy has not been "
- + "set as the default one!",
- pc.getFormatingStrategy() instanceof JavaFormatingStrategy);
- assertTrue("Java's defaulf profile formating strategy is not being "
- + "used as the default formating strategy!", pc
- .getFormatingStrategy() == pc.getDefaultProfile()
- .getFormatingStrategy());
- }
+ public void testUMLDefaultStrategyAndModel() {
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
+
+ assertTrue("UML profile has not been set as the default one!", pc
+ .getDefaultProfile() instanceof ProfileUML);
+ assertTrue("Java formating strategy has not been "
+ + "set as the default one!",
+ pc.getFormatingStrategy() instanceof JavaFormatingStrategy);
+ assertTrue("Java's defaulf profile formating strategy is not being "
+ + "used as the default formating strategy!", pc
+ .getFormatingStrategy() == pc.getDefaultProfile()
+ .getFormatingStrategy());
+ }
/**
* Tests whether a new profile can be successfully added
*/
public void testAddingNewProfile() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
Profile pr = new UserDefinedProfile(new File("someprofile"));
pc.addProfile(pr);
@@ -91,8 +92,8 @@
* from the configuration
*/
public void testRemovingProfile() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
Profile pr = new UserDefinedProfile(new File("someprofile"));
if (!pc.getProfiles().contains(pr)) {
@@ -109,28 +110,29 @@
* is being removed. It should not throw any exceptions.
*/
public void testRemovingUnknownProfile() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
- Profile pr = new UserDefinedProfile(new File("someprofile"));
-
- if (!pc.getProfiles().contains(pr)) {
- pc.removeProfile(pr);
- }
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
+ Profile pr = new UserDefinedProfile(new File("someprofile"));
+
+ if (!pc.getProfiles().contains(pr)) {
+ pc.removeProfile(pr);
+ }
}
/**
- * Tests whether the default profile cannot be removed
- */
+ * Tests whether the default profile cannot be removed
+ */
public void testRemovingDefaultProfile() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
- Profile dp = pc.getDefaultProfile();
-
- pc.removeProfile(dp);
- assertTrue("Default profile was removed from the configuration!",
- !pc.getProfiles().contains(dp));
- assertTrue("Default profile changed!",
- pc.getDefaultProfile() == dp);
+ Profile dp = pc.getDefaultProfile();
+ assertTrue("Default profile is not in the configuration!", pc
+ .getProfiles().contains(dp));
+
+ pc.removeProfile(dp);
+ assertTrue("Default profile was removed from the configuration!", pc
+ .getProfiles().contains(dp));
+ assertTrue("Default profile changed!", pc.getDefaultProfile() == dp);
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileConfiguration2.java 2007-08-06 09:24:12-0700
@@ -33,6 +33,7 @@
import junit.framework.TestCase;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectImpl;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
@@ -145,34 +146,34 @@
* Whether a formating strategy can be property activated
*/
public void testActivateFormatingStrategy() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
-
- Profile pr = new FakeProfile();
-
- pc.addProfile(pr);
- pc.activateFormatingStrategy(pr);
-
- assertTrue("FormatingStrategy was not properly activated!", pc
- .getFormatingStrategy() == pr.getFormatingStrategy());
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
+
+ Profile pr = new FakeProfile();
+
+ pc.addProfile(pr);
+ pc.activateFormatingStrategy(pr);
+
+ assertTrue("FormatingStrategy was not properly activated!", pc
+ .getFormatingStrategy() == pr.getFormatingStrategy());
}
/**
* When a profile is removed its formating strategy should also be removed
*/
public void testActivateFormatingStrategyAndRemoveProfile() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
-
- Profile pr = new FakeProfile();
-
- pc.addProfile(pr);
- pc.activateFormatingStrategy(pr);
- pc.removeProfile(pr);
-
- assertTrue("FormatingStrategy was not properly removed " +
- "when the profile was removed!", pc
- .getFormatingStrategy() != pr.getFormatingStrategy());
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
+
+ Profile pr = new FakeProfile();
+
+ pc.addProfile(pr);
+ pc.activateFormatingStrategy(pr);
+ pc.removeProfile(pr);
+
+ assertTrue("FormatingStrategy was not properly removed "
+ + "when the profile was removed!",
+ pc.getFormatingStrategy() != pr.getFormatingStrategy());
}
/**
@@ -180,38 +181,36 @@
* registered and provide one.
*/
public void testActivateInvalidFormatingStrategy() {
- Project p = new Project();
- ProfileConfiguration pc = new ProfileConfiguration(p);
-
- Profile pr1 = new FakeProfile();
- Profile pr2 = new FakeProfile();
- Profile pr3 = new FakeProfile();
-
- ((FakeProfile)pr2).setFormatStrategy(null);
-
- pc.addProfile(pr1);
- pc.addProfile(pr2);
-
- // this should not raise any exception
- pc.activateFormatingStrategy(null);
-
- pc.activateFormatingStrategy(pr1);
- pc.activateFormatingStrategy(pr2);
- assertTrue(
- "Activating the formating strategy of a profile that " +
- "does not provide one should not take any effect!",
- pc.getFormatingStrategy() == pr1.getFormatingStrategy());
-
- pc.removeProfile(pr1);
- assertTrue("FormatingStrategy was not properly removed " +
- "when the providing profile was removed!",
- pc.getFormatingStrategy() == null);
-
- FormatingStrategy before = pc.getFormatingStrategy();
- pc.activateFormatingStrategy(pr3);
- assertTrue(
- "Activating the formating strategy of a profile that " +
- "is has not been registered should not take any effect!",
- pc.getFormatingStrategy() == before);
+ Project p = new ProjectImpl();
+ ProfileConfiguration pc = new ProfileConfiguration(p);
+
+ Profile pr1 = new FakeProfile();
+ Profile pr2 = new FakeProfile();
+ Profile pr3 = new FakeProfile();
+
+ ((FakeProfile) pr2).setFormatStrategy(null);
+
+ pc.addProfile(pr1);
+ pc.addProfile(pr2);
+
+ // this should not raise any exception
+ pc.activateFormatingStrategy(null);
+
+ pc.activateFormatingStrategy(pr1);
+ pc.activateFormatingStrategy(pr2);
+ assertTrue("Activating the formating strategy of a profile that "
+ + "does not provide one should not take any effect!", pc
+ .getFormatingStrategy() == pr1.getFormatingStrategy());
+
+ pc.removeProfile(pr1);
+ assertTrue("FormatingStrategy was not properly removed "
+ + "when the providing profile was removed!", pc
+ .getFormatingStrategy() == null);
+
+ FormatingStrategy before = pc.getFormatingStrategy();
+ pc.activateFormatingStrategy(pr3);
+ assertTrue("Activating the formating strategy of a profile that "
+ + "is has not been registered should not take any effect!", pc
+ .getFormatingStrategy() == before);
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/TestProfileJava.java 2007-08-06 09:24:12-0700
@@ -62,7 +62,7 @@
* exist.
*/
public void testLoadProfileModel() {
- ProfileJava profile = ProfileJava.getInstance();
+ ProfileUML profile = ProfileUML.getInstance();
Object model = profile.getModel();
Collection stereos = Model.getModelManagementHelper()
.getAllModelElementsOfKind(model,
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java?view=diff&rev=13253&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&r1=13252&r2=13253
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2007-08-06 09:24:12-0700
@@ -33,6 +33,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -71,6 +73,9 @@
*/
protected void setUp() {
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
+
action = getAction();
ns = getNamespace();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.