patches from 148190 #22

2 files changed, 3 insertions, 79 deletions

diff --git a/ajde/testsrc/org/aspectj/ajde/ui/AjdeUiTests.java b/ajde/testsrc/org/aspectj/ajde/ui/AjdeUiTests.java
index 12f10eeb6..c0e4b6b96 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/AjdeUiTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/ui/AjdeUiTests.java
@@ -14,14 +14,15 @@
 
 package org.aspectj.ajde.ui;
  
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class AjdeUiTests extends TestCase {
 
     public static Test suite() { 
         TestSuite suite = new TestSuite(AjdeUiTests.class.getName());
         //$JUnit-BEGIN$
-        suite.addTestSuite(StructureModelUtilTest.class); 
         suite.addTestSuite(StructureSearchManagerTest.class); 
         suite.addTestSuite(StructureViewManagerTest.class); 
         //$JUnit-END$
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/StructureModelUtilTest.java b/ajde/testsrc/org/aspectj/ajde/ui/StructureModelUtilTest.java
deleted file mode 100644
index 3d1edd9cd..000000000
--- a/ajde/testsrc/org/aspectj/ajde/ui/StructureModelUtilTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.ajde.ui;
-
-import java.util.*;
-
-import junit.framework.TestSuite;
-
-import org.aspectj.ajde.AjdeTestCase;
-import org.aspectj.asm.IProgramElement;
-
-/**
- * @author Mik Kersten
- */
-public class StructureModelUtilTest extends AjdeTestCase {
-	
-    // TODO-path
-	private final String CONFIG_FILE_PATH = "../examples/figures-coverage/all.lst";
-
-	public StructureModelUtilTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(StructureModelUtilTest.class);
-	}
-
-	public static TestSuite suite() {
-		TestSuite result = new TestSuite();
-		result.addTestSuite(StructureModelUtilTest.class);	
-		return result;
-	}
-
-	public void testPackageViewUtil() {
-		List packages = StructureModelUtil.getPackagesInModel(); 
-		assertTrue("packages list not null", packages != null);
-        assertTrue("packages list not empty", !packages.isEmpty());
-	
-		IProgramElement packageNode = (IProgramElement)((Object[])packages.get(0))[0];
-		assertTrue("package node not null", packageNode != null);
-		
-		List files = StructureModelUtil.getFilesInPackage(packageNode);
-		assertTrue("fle list not null", files != null);
-		
-		// TODO: re-enable
-//		Map lineAdviceMap = StructureModelUtil.getLinesToAspectMap(
-//			((IProgramElement)files.get(0)).getSourceLocation().getSourceFile().getAbsolutePath()
-//		);
-//		
-//		assertTrue("line->advice map not null", lineAdviceMap != null);			
-//		
-//		Set aspects = StructureModelUtil.getAspectsAffectingPackage(packageNode);
-//		assertTrue("aspect list not null", aspects != null);			
-	}
-
-  
-	protected void setUp() throws Exception {
-		super.setUp("StructureModelUtilTest");
-		doSynchronousBuild(CONFIG_FILE_PATH);		
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-}
-