Author: maurelio1234
Date: 2007-07-04 09:48:48-0700
New Revision: 12980
Modified:
branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs
branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java
branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java
branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java
branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java
branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java
branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java
branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java
Log:
merged r12975
Modified: branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs&p2=branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs (original)
+++ branches/gsoc2007/maurelio1234/tests/.settings/org.eclipse.jdt.core.prefs 2007-07-04 09:48:48-0700
@@ -1,4 +1,4 @@
-#Sun Apr 22 20:33:13 CEST 2007
+#Tue Jul 03 10:40:15 CEST 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -45,7 +45,7 @@
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
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=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/TestDependencies.java 2007-07-04 09:48:48-0700
@@ -27,9 +27,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import jdepend.framework.JDepend;
-import jdepend.framework.JavaClass;
import jdepend.framework.JavaPackage;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -93,7 +93,7 @@
"org.argouml.i18n",
"org.argouml.gefext",
"org.argouml.language.ui",
- //"org.argouml.moduleloader", //there is no cycle, but it fails...
+ "org.argouml.moduleloader",
"org.argouml.notation.providers",
//"org.argouml.notation.providers.java",
//"org.argouml.notation.providers.uml",
@@ -108,6 +108,10 @@
"org.argouml.util.osdep.win32",
"org.argouml.util.osdep",
"org.argouml.util",
+ // There was a comment saying that the below has no cycles, but
+ // Classycle thinks there's a cycle here too, so I believe there
+ // really is one - tfm 20070702
+// "org.argouml.uml.cognitive.critics",
};
for (int i = 0; i < clean.length; i++) {
suite.addTest(new CheckDependencyCycle(jdepend, clean[i]));
@@ -154,7 +158,7 @@
{"org.argouml.uml.diagram", "org.argouml.ui"},
{"org.argouml.ui", "org.argouml.notation.ui"},
{"org.argouml.util", "org.argouml.ui.cmd"},
- //{"org.argouml.moduleloader", "org.argouml.ui"},//Why does this fail?
+ {"org.argouml.moduleloader", "org.argouml.ui"},
//{"org.argouml.uml.reveng", "org.argouml.ui"},
//{"org.argouml.language.java.generator", "org.argouml.kernel"},
};
@@ -183,13 +187,33 @@
StringBuffer msg = new StringBuffer(
"JDepend indicates a dependency cycle in ");
msg.append(p.getName());
- msg.append("(" + p.getClassCount() + " classes: ");
- Collection<JavaClass> c = p.getClasses();
- for (JavaClass jc : c) {
- msg.append(jc.getName());
- msg.append(" ");
+ List<JavaPackage> firstCycle = new ArrayList<JavaPackage>();
+ p.collectCycle(firstCycle);
+ msg.append("(" + firstCycle.size());
+ msg.append(" packages in first cycle: ");
+ for (JavaPackage cp : firstCycle) {
+ msg.append(cp.getName()).append(" ");
+ }
+ msg.append(") -- ");
+ List<JavaPackage> otherCycles = new ArrayList<JavaPackage>();
+ p.collectAllCycles(otherCycles);
+ otherCycles.removeAll(firstCycle);
+ if (!otherCycles.isEmpty()) {
+ msg.append("(" + otherCycles.size());
+ msg.append(" packages in additional cycle(s): ");
+ for (JavaPackage cp : otherCycles) {
+ msg.append(cp.getName()).append(" ");
+ }
+ msg.append(") -- ");
}
- msg.append(")");
+
+// msg.append("(" + p.getClassCount() + " classes: ");
+// Collection<JavaClass> c = p.getClasses();
+// for (JavaClass jc : c) {
+// msg.append(jc.getName());
+// msg.append(" ");
+// }
+// msg.append(")");
assertTrue(msg.toString(), false);
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestCritic.java 2007-07-04 09:48:48-0700
@@ -24,10 +24,6 @@
package org.argouml.cognitive;
-import java.util.Hashtable;
-
-import org.argouml.cognitive.Critic;
-
import junit.framework.TestCase;
/**
@@ -46,12 +42,16 @@
cr = new Critic();
}
- public void testArgs() {
- Hashtable<String, Object> t = new Hashtable<String, Object>();
- t.put("threshold", new Integer(5));
- t.put("param1", "XYZ");
- cr.setArgs(t);
- assertSame(t, cr.getArgs());
+ /**
+ * Test some basic functions.
+ */
+ public void testBasics() {
+ assertFalse(cr.predicate(null, null));
+
+ assertTrue(cr.isActive());
+ cr.beInactive();
+ assertFalse(cr.isActive());
+ cr.beActive();
+ assertTrue(cr.isActive());
}
-
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestItemUID.java 2007-07-04 09:48:48-0700
@@ -26,9 +26,10 @@
// Diagrams
import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
+import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.activity.ui.FigActionState;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.FigClassifierRole;
@@ -125,6 +126,7 @@
*/
public void testAssignIDsToObjects() {
Object testmc = Model.getCoreFactory().buildClass();
+ CommentEdge commentedge = new CommentEdge();
UMLActivityDiagram actdiag = new UMLActivityDiagram();
UMLClassDiagram classdiag = new UMLClassDiagram();
UMLCollaborationDiagram colldiag = new UMLCollaborationDiagram();
@@ -170,6 +172,7 @@
FigUseCase figusecase = new FigUseCase();
checkAssignIDToObject(testmc, true, true);
+ checkAssignIDToObject(commentedge, false, true);
checkAssignIDToObject(actdiag, true, true);
checkAssignIDToObject(classdiag, true, true);
checkAssignIDToObject(colldiag, true, true);
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/cognitive/TestResolvedCritic.java 2007-07-04 09:48:48-0700
@@ -24,11 +24,12 @@
package org.argouml.cognitive;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
+import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
/**
@@ -43,14 +44,15 @@
* @param name the name of the test
*/
public TestResolvedCritic(String name) {
- super(name);
+ super(name);
}
/*
* @see junit.framework.TestCase#setUp()
*/
+ @Override
public void setUp() throws Exception {
- super.setUp();
+ super.setUp();
InitializeModel.initializeDefault();
}
@@ -62,25 +64,25 @@
Critic c = new Critic();
String crString = "class org.argouml.cognitive.Critic";
ResolvedCritic rc;
- Vector<String> vec = new Vector<String>();
+ List<String> list = new ArrayList<String>();
ListSet set = new ListSet();
/* ResolvedCritic(String, Vector) */
- rc = new ResolvedCritic("rc", null);
+ rc = new ResolvedCritic("rc", (List<String>) null);
assertTrue("getCritic simple", "rc".equals(rc.getCritic()));
assertTrue(
- "getOffenderList simple",
- (rc.getOffenderList() == null
- || rc.getOffenderList().size() == 0));
+ "getOffenderList simple",
+ (rc.getOffenderList() == null
+ || rc.getOffenderList().size() == 0));
- vec.add("str1");
- rc = new ResolvedCritic("rc2", vec);
+ list.add("str1");
+ rc = new ResolvedCritic("rc2", list);
assertTrue("getCritic 2nd", "rc2".equals(rc.getCritic()));
assertTrue(
- "getOffenderList 2nd",
- rc.getOffenderList() != null
- && "str1".equals(rc.getOffenderList().get(0)));
+ "getOffenderList 2nd",
+ rc.getOffenderList() != null
+ && "str1".equals(rc.getOffenderList().get(0)));
/* ResolvedCritic(Critic, VectorSet) */
@@ -89,26 +91,26 @@
System.out.println(rc.getCritic());
assertTrue("getCritic 1", crString.equals(rc.getCritic()));
assertTrue(
- "getOffenderList 1",
- rc.getOffenderList() == null
- || rc.getOffenderList().size() == 0);
+ "getOffenderList 1",
+ rc.getOffenderList() == null
+ || rc.getOffenderList().size() == 0);
} catch (UnresolvableException ure1) {
assertTrue("create 1 with MClass", false);
}
- set.addElement(testmc);
+ set.add(testmc);
try {
rc = new ResolvedCritic(c, set);
assertTrue("getCritic 2", crString.equals(rc.getCritic()));
assertTrue(
- "assigns id 2",
- ItemUID.getIDOfObject(testmc, false) != null);
+ "assigns id 2",
+ ItemUID.getIDOfObject(testmc, false) != null);
assertTrue(
- "getOffenderList 2",
- rc.getOffenderList() != null
- && (ItemUID.getIDOfObject(testmc, false).equals(
- rc.getOffenderList().get(0))));
+ "getOffenderList 2",
+ rc.getOffenderList() != null
+ && (ItemUID.getIDOfObject(testmc, false).equals(
+ rc.getOffenderList().get(0))));
} catch (UnresolvableException ure1) {
assertTrue("create 2 with MClass", false);
}
@@ -122,15 +124,15 @@
assertTrue("getCritic 3", crString.equals(rc.getCritic()));
assertTrue(
- "assigns id 3",
- ItemUID.getIDOfObject(testmc, false) != null);
+ "assigns id 3",
+ ItemUID.getIDOfObject(testmc, false) != null);
assertTrue(
- "getOffenderList 3",
- rc.getOffenderList() != null
- && (ItemUID.getIDOfObject(testmc, false).equals(
- rc.getOffenderList().get(0))));
+ "getOffenderList 3",
+ rc.getOffenderList() != null
+ && (ItemUID.getIDOfObject(testmc, false).equals(
+ rc.getOffenderList().get(0))));
} catch (UnresolvableException ure1) {
- assertTrue("create 3 with MClass", false);
+ assertTrue("create 3 with Class", false);
}
set.remove(testmc);
}
@@ -139,43 +141,43 @@
* Test the equals() method.
*/
public void testEquals() {
- Critic c = new Critic();
- ResolvedCritic rc1, rc2;
- Vector<String> vec = new Vector<String>();
- ListSet set = new ListSet();
-
- rc1 = new ResolvedCritic("RC", null);
- rc2 = new ResolvedCritic("RC", null);
- assertTrue("Same empty ctor", rc1.equals(rc2) && rc2.equals(rc1));
-
- rc2 = new ResolvedCritic("RC", vec);
- assertTrue("Empty vec ctor", rc1.equals(rc2) && rc2.equals(rc1));
-
- vec.add("a");
- rc2 = new ResolvedCritic("RC", vec);
- assertTrue("Bigger rc2 - 1", rc1.equals(rc2));
- assertTrue("Bigger rc2 - 2", !rc2.equals(rc1));
-
- rc1 = new ResolvedCritic("RC", vec);
- assertTrue("Same vec ctor", rc1.equals(rc2) && rc2.equals(rc1));
-
- vec.clear();
- vec.add("b");
- rc2 = new ResolvedCritic("RC", vec);
- assertTrue("Diff rc2 - 1", !rc1.equals(rc2));
- assertTrue("Diff rc2 - 2", !rc2.equals(rc1));
-
- try {
- rc1 = new ResolvedCritic(c, null);
- rc2 = new ResolvedCritic(c, null);
- assertTrue(
- "Same empty ctor (c)",
- rc1.equals(rc2) && rc2.equals(rc1));
-
- rc2 = new ResolvedCritic(c, set);
- assertTrue("Empty set ctor", rc1.equals(rc2) && rc2.equals(rc1));
- } catch (UnresolvableException ure) {
- assertTrue("Test error URE", false);
- }
+ Critic c = new Critic();
+ ResolvedCritic rc1, rc2;
+ List<String> list = new ArrayList<String>();
+ ListSet set = new ListSet();
+
+ rc1 = new ResolvedCritic("RC", (List<String>) null);
+ rc2 = new ResolvedCritic("RC", (List<String>) null);
+ assertTrue("Same empty ctor", rc1.equals(rc2) && rc2.equals(rc1));
+
+ rc2 = new ResolvedCritic("RC", list);
+ assertTrue("Empty vec ctor", rc1.equals(rc2) && rc2.equals(rc1));
+
+ list.add("a");
+ rc2 = new ResolvedCritic("RC", list);
+ assertTrue("Bigger rc2 - 1", rc1.equals(rc2));
+ assertTrue("Bigger rc2 - 2", !rc2.equals(rc1));
+
+ rc1 = new ResolvedCritic("RC", list);
+ assertTrue("Same vec ctor", rc1.equals(rc2) && rc2.equals(rc1));
+
+ list.clear();
+ list.add("b");
+ rc2 = new ResolvedCritic("RC", list);
+ assertTrue("Diff rc2 - 1", !rc1.equals(rc2));
+ assertTrue("Diff rc2 - 2", !rc2.equals(rc1));
+
+ try {
+ rc1 = new ResolvedCritic(c, null);
+ rc2 = new ResolvedCritic(c, null);
+ assertTrue(
+ "Same empty ctor (c)",
+ rc1.equals(rc2) && rc2.equals(rc1));
+
+ rc2 = new ResolvedCritic(c, set);
+ assertTrue("Empty set ctor", rc1.equals(rc2) && rc2.equals(rc1));
+ } catch (UnresolvableException ure) {
+ assertTrue("Test error URE", false);
+ }
}
}
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=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java 2007-07-04 09:48:48-0700
@@ -58,12 +58,12 @@
}
public void testAllModules() {
- Collection all = ModuleLoader2.allModules();
+ Collection<String> all = ModuleLoader2.allModules();
assertNotNull(all);
- Iterator iter = all.iterator();
+ Iterator<String> iter = all.iterator();
while (iter.hasNext()) {
- assertTrue(iter.next() instanceof ModuleInterface);
+ assertNotNull(iter.next());
}
}
@@ -89,9 +89,9 @@
List<String> extensionLocations =
ModuleLoader2.getInstance().getExtensionLocations();
assertNotNull(extensionLocations);
- for (Iterator iter = extensionLocations.iterator();
+ for (Iterator<String> iter = extensionLocations.iterator();
iter.hasNext();) {
- assertTrue(iter.next() instanceof String);
+ assertNotNull(iter.next());
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestDetailsPane.java 2007-07-04 09:48:48-0700
@@ -34,7 +34,6 @@
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
-import org.argouml.uml.diagram.ui.UMLDiagram;
import org.argouml.uml.ui.TabProps;
import org.tigris.swidgets.Horizontal;
@@ -84,7 +83,7 @@
});
pane.targetSet(e);
assertEquals("1:", todoPane, pane.getTabs().getSelectedComponent());
- UMLDiagram diagram = new UMLClassDiagram();
+ UMLClassDiagram diagram = new UMLClassDiagram();
e =
new TargetEvent(
this,
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=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/ui/TestPropertyPanels.java 2007-07-04 09:48:48-0700
@@ -121,6 +121,7 @@
*/
public static Test suite() throws Exception {
InitializeModel.initializeDefault();
+ new InitNotation().init();
// constains instances of each modelelement
// used for testing so that we only use each modelelement
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java 2007-07-04 09:48:48-0700
@@ -32,6 +32,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.tigris.gef.graph.presentation.JGraph;
@@ -46,7 +47,7 @@
private static final boolean PERFORMANCE_TEST = false;
- private UMLDiagram diagram;
+ private ArgoDiagram diagram;
/**
* Constructor for TestTabDiagram.
@@ -127,7 +128,7 @@
// setup
if (PERFORMANCE_TEST) {
try {
- UMLDiagram[] diagrams = new UMLDiagram[NUMBER_OF_DIAGRAMS];
+ ArgoDiagram[] diagrams = new ArgoDiagram[NUMBER_OF_DIAGRAMS];
Project project =
ProjectManager.getManager().getCurrentProject();
Object clazz = Model.getCoreFactory().buildClass();
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java 2007-07-04 09:48:48-0700
@@ -41,9 +41,14 @@
import antlr.TokenStreamException;
/**
- * Test the import of Java sources which have Unicode characters in various
- * locations, including in identifiers. The content of the Java source file is a
- * private constant at the bottom of the source of this class.
+ * Test the import of Java sources which have Unicode characters in
+ * various locations, including in identifiers.
+ *
+ * The content of the Java source file is a private constant at the
+ * bottom of the source of this class.
+ *
+ * The constant is written using the ISO8859-1 encoding so this class
+ * needs to be compiled using that encoding.
*/
public class TestJavaImportUnicode extends TestCase {
/*
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=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2007-07-04 09:48:48-0700
@@ -33,8 +33,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.ui.UMLDiagram;
/**
* @author JBranderhorst
@@ -119,7 +119,7 @@
assertTrue("The test case has a non-valid namespace",
action.isValidNamespace(ns));
- UMLDiagram diagram = action.createDiagram(ns);
+ ArgoDiagram diagram = action.createDiagram(ns);
Model.getPump().flushModelEvents();
assertNotNull(
"The diagram has no namespace",
@@ -143,7 +143,7 @@
*
* @param diagram The diagram to check the namespace for.
*/
- protected void checkNamespace(UMLDiagram diagram) {
+ protected void checkNamespace(ArgoDiagram diagram) {
assertTrue(
"The diagram has a non-valid namespace",
action.isValidNamespace(diagram.getNamespace()));
@@ -153,13 +153,13 @@
* Tests if two diagrams created have different names.
*/
public void testDifferentNames() {
- UMLDiagram diagram1 = action.createDiagram(ns);
+ ArgoDiagram diagram1 = action.createDiagram(ns);
// This next line is needed to register the diagram in the project,
// since creating a next diagram will need the new name to be compared
// with existing diagrams in the project, to validate
// there are no duplicates.
ProjectManager.getManager().getCurrentProject().addMember(diagram1);
- UMLDiagram diagram2 = action.createDiagram(ns);
+ ArgoDiagram diagram2 = action.createDiagram(ns);
Model.getPump().flushModelEvents();
assertTrue(
"The created diagrams have the same name",
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java 2007-07-04 09:48:48-0700
@@ -34,8 +34,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.ui.UMLDiagram;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -114,7 +114,7 @@
*
* @param diagram The diagram to check the namespace for.
*/
- protected void checkNamespace(UMLDiagram diagram) {
+ protected void checkNamespace(ArgoDiagram diagram) {
assertTrue(
"The Collaboration diagram has a non-valid namespace",
Model.getFacade().isACollaboration(diagram.getNamespace()));
@@ -128,9 +128,9 @@
Model.getPump().flushModelEvents();
action.actionPerformed(null);
Object d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram = (UMLDiagram) d;
+ ArgoDiagram diagram = (ArgoDiagram) d;
assertNotNull(
"The diagram has no namespace",
diagram.getNamespace());
@@ -149,9 +149,9 @@
public void testDifferentNames() {
action.actionPerformed(null);
Object d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram1 = (UMLDiagram) d;
+ ArgoDiagram diagram1 = (ArgoDiagram) d;
// This next line is needed to register the diagram in the project,
// since creating a next diagram will need the new name to be compared
// with existing diagrams in the project, to validate
@@ -161,9 +161,9 @@
TargetManager.getInstance().setTarget(ns);
action.actionPerformed(null);
d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram2 = (UMLDiagram) d;
+ ArgoDiagram diagram2 = (ArgoDiagram) d;
Model.getPump().flushModelEvents();
assertTrue(
@@ -195,7 +195,7 @@
assertTrue(
objDesc
+ " is not valid namespace for the diagram",
- d instanceof UMLDiagram);
+ d instanceof ArgoDiagram);
}
}
Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java?view=diff&rev=12980&p1=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java&r1=12979&r2=12980
==============================================================================
--- branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/TestActionStateDiagram.java 2007-07-04 09:48:48-0700
@@ -34,8 +34,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.ui.UMLDiagram;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -126,9 +126,9 @@
Model.getPump().flushModelEvents();
action.actionPerformed(null);
Object d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram = (UMLDiagram) d;
+ ArgoDiagram diagram = (ArgoDiagram) d;
assertNotNull(
"The diagram has no namespace",
diagram.getNamespace());
@@ -147,9 +147,9 @@
public void testDifferentNames() {
action.actionPerformed(null);
Object d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram1 = (UMLDiagram) d;
+ ArgoDiagram diagram1 = (ArgoDiagram) d;
// This next line is needed to register the diagram in the project,
// since creating a next diagram will need the new name to be compared
// with existing diagrams in the project, to validate
@@ -159,9 +159,9 @@
TargetManager.getInstance().setTarget(ns);
action.actionPerformed(null);
d = TargetManager.getInstance().getTarget();
- assertTrue("No diagram generated", d instanceof UMLDiagram);
+ assertTrue("No diagram generated", d instanceof ArgoDiagram);
Model.getPump().flushModelEvents();
- UMLDiagram diagram2 = (UMLDiagram) d;
+ ArgoDiagram diagram2 = (ArgoDiagram) d;
Model.getPump().flushModelEvents();
assertTrue(
@@ -192,7 +192,7 @@
assertTrue(
objDesc
+ " is not valid namespace for the diagram",
- d instanceof UMLDiagram);
+ d instanceof ArgoDiagram);
}
}
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.