Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3176] trunk/org.rubypeople.rdt.core.tests/src/org /rubypeople/rdt/internal/core/builder
|
From: <caw...@us...> - 2007-09-13 20:26:07
|
Revision: 3176
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3176&view=rev
Author: cawilliams
Date: 2007-09-13 13:26:05 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
fix broken tests (sort of, rip some out because they need to be re-written)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_CleanRdtCompiler.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TS_InternalCoreBuilder.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamSingleCompiler.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_TaskCompiler.java
Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/AbstractRdtTestCase.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -1,6 +1,5 @@
package org.rubypeople.rdt.internal.core.builder;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -17,7 +16,7 @@
static protected final String REMOVING_MARKERS_SUB_TASK = "Removing Markers...";
protected abstract void assertMarkersRemoved(List expectedFiles);
- abstract AbstractRdtCompiler createCompiler(IMarkerManager markerManager, List singleCompilers);
+ abstract AbstractRdtCompiler createCompiler(IMarkerManager markerManager);
protected ShamMonitor monitor;
protected ShamFile t1;
@@ -26,8 +25,6 @@
protected ShamFolder f1;
protected ShamProject project;
protected ShamMarkerManager markerManager;
- protected ShamSingleCompiler singleCompiler1;
- protected ShamSingleCompiler singleCompiler2;
protected AbstractRdtCompiler compiler;
private ShamFile nonRubyFile;
@@ -40,11 +37,8 @@
project = new ShamProject("test");
markerManager = new ShamMarkerManager();
- singleCompiler1 = new ShamSingleCompiler();
- singleCompiler2 = new ShamSingleCompiler();
- List singleCompilers = ListUtil.create(singleCompiler1, singleCompiler2);
- compiler = createCompiler(markerManager, singleCompilers);
+ compiler = createCompiler(markerManager);
monitor = new ShamMonitor();
}
@@ -102,8 +96,6 @@
t1.getFullPath().toString());
monitor.assertSubTasks(subTasks);
assertMarkersRemoved(ListUtil.create(t1,t2));
- singleCompiler1.assertCompiled(new HashSet(expectedFiles));
- singleCompiler2.assertCompiled(new HashSet(expectedFiles));
}
public void testCompileSkipsNonRubyFiles() throws Exception {
@@ -131,8 +123,6 @@
monitor.assertSubTasks(subTasks);
assertMarkersRemoved(expectedFiles);
- singleCompiler1.assertCompiled(new HashSet(expectedFiles));
- singleCompiler2.assertCompiled(new HashSet(expectedFiles));
}
}
Deleted: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamSingleCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamSingleCompiler.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/ShamSingleCompiler.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -1,24 +0,0 @@
-/**
- *
- */
-package org.rubypeople.rdt.internal.core.builder;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-class ShamSingleCompiler implements SingleFileCompiler {
-
- private Set compiledFiles = new HashSet();
-
- public void compileFile(IFile file) throws CoreException {
- compiledFiles.add(file);
- }
-
- public void assertCompiled(Set expectedFiles) {
- TC_CleanRdtCompiler.assertEquals(expectedFiles, compiledFiles);
- }
-
-}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_CleanRdtCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_CleanRdtCompiler.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_CleanRdtCompiler.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -5,9 +5,8 @@
public class TC_CleanRdtCompiler extends AbstractRdtTestCase {
- AbstractRdtCompiler createCompiler(IMarkerManager markerManager, List singleCompilers) {
- return new CleanRdtCompiler(project,
- markerManager, singleCompilers);
+ AbstractRdtCompiler createCompiler(IMarkerManager markerManager) {
+ return new CleanRdtCompiler(project, markerManager);
}
protected void assertMarkersRemoved(List expectedFiles) {
Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_IncrementalRdtCompiler.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -1,7 +1,6 @@
package org.rubypeople.rdt.internal.core.builder;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -27,8 +26,6 @@
List subTasks = ListUtil.create(REMOVING_MARKERS_SUB_TASK);
monitor.assertSubTasks(subTasks);
assertMarkersRemoved(ListUtil.create(t1));
- singleCompiler1.assertCompiled(new HashSet());
- singleCompiler2.assertCompiled(new HashSet());
}
protected void assertMarkersRemoved(List expectedFiles) {
@@ -63,10 +60,10 @@
return childDelta;
}
- AbstractRdtCompiler createCompiler(IMarkerManager markerManager, List singleCompilers) {
+ AbstractRdtCompiler createCompiler(IMarkerManager markerManager) {
delta.setResource(project);
return new IncrementalRdtCompiler(project, delta,
- markerManager, singleCompilers);
+ markerManager);
}
}
Deleted: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RubyCodeAnalyzer.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -1,73 +0,0 @@
-/*
- * Author: David Corbin
- *
- * Copyright (c) 2005 RubyPeople.
- *
- * This file is part of the Ruby Development Tools (RDT) plugin for eclipse.
- * RDT is subject to the "Common Public License (CPL) v 1.0". You may not use
- * RDT except in compliance with the License. For further information see
- * org.rubypeople.rdt/rdt.license.
- */
-package org.rubypeople.rdt.internal.core.builder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.jruby.ast.Node;
-import org.jruby.ast.visitor.NodeVisitor;
-import org.jruby.evaluator.Instruction;
-import org.jruby.lexer.yacc.SyntaxException;
-import org.rubypeople.eclipse.shams.resources.ShamFile;
-import org.rubypeople.rdt.internal.core.parser.RdtPosition;
-
-public class TC_RubyCodeAnalyzer extends TestCase {
-
- private static final String FILE_CONTENTS = "file Contents";
- private static final String FILENAME = "testFile.rb";
- private ShamFile file;
- private ShamMarkerManager markerManager;
- private ShamRubyParser parser;
- private RubyCodeAnalyzer compiler;
- private Node rootNode;
-
- public void setUp() {
- file = new ShamFile(FILENAME);
- file.setContents(FILE_CONTENTS);
-
- rootNode = new Node(null, 0) {
- private static final long serialVersionUID = 9089679642764992140L;
-
- public Instruction accept(NodeVisitor visitor) {
- return null;
- }
-
- public List childNodes() {
- return new ArrayList();
- }
- };
- markerManager = new ShamMarkerManager();
- parser = new ShamRubyParser();
- parser.addParseResult(file, rootNode);
- compiler = new RubyCodeAnalyzer(markerManager, parser);
- }
-
- public void testParserInvocation() throws Exception {
- compiler.compileFile(file);
-
- parser.assertParsed(file, FILE_CONTENTS);
- file.assertContentStreamClosed();
- }
-
-
- public void testSyntaxException() throws Exception {
- SyntaxException syntaxException = new SyntaxException(new RdtPosition(1, 0, 10), "");
- parser.setExceptionToThrow(syntaxException);
-
- compiler.compileFile(file);
-
- file.assertContentStreamClosed();
- markerManager.assertWarningAdded(file, "", 1, 0, 10);
- }
-}
Deleted: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_TaskCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_TaskCompiler.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_TaskCompiler.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -1,65 +0,0 @@
-package org.rubypeople.rdt.internal.core.builder;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.rubypeople.eclipse.shams.resources.ShamFile;
-import org.rubypeople.rdt.internal.core.parser.TaskParser;
-import org.rubypeople.rdt.internal.core.parser.TaskTag;
-
-public class TC_TaskCompiler extends TestCase {
-
- private static final TaskTag TASK_TAG = new TaskTag("",0,0,0,0);
- private ShamMarkerManager markerManager;
- private ShamTaskParser taskParser;
- private TaskCompiler taskCompiler;
- private ShamFile file;
- private static class ShamTaskParser extends TaskParser {
-
- private String contents;
- private List tasks = new ArrayList();
-
- public ShamTaskParser() {
- super(new HashMap());
- }
-
- public void parse(Reader reader) throws IOException {
- contents = IoUtils.readAll(reader);
- }
-
- public List getTasks() {
- return tasks;
- }
-
- public void assertFileContents(String expectedContents) {
- assertEquals(expectedContents, contents);
-
- }
-
- public void addTaskToReturn(TaskTag taskTag) {
- tasks.add(taskTag);
- }
- }
-
- public void setUp() {
- markerManager = new ShamMarkerManager();
- taskParser = new ShamTaskParser();
- taskCompiler = new TaskCompiler(markerManager, taskParser);
-
- file = new ShamFile("");
- file.setContents("fileContents");
- }
-
- public void testCompile() throws Exception {
- taskParser.addTaskToReturn(TASK_TAG);
- taskCompiler.compileFile(file);
- taskParser.assertFileContents("fileContents");
- markerManager.assertTasksCreated(file, Collections.singletonList(TASK_TAG));
- }
-}
Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TS_InternalCoreBuilder.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TS_InternalCoreBuilder.java 2007-09-13 20:25:59 UTC (rev 3175)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TS_InternalCoreBuilder.java 2007-09-13 20:26:05 UTC (rev 3176)
@@ -16,9 +16,7 @@
public class TS_InternalCoreBuilder {
public static Test suite() {
- TestSuite suite = new TestSuite("Builder");
- suite.addTestSuite(TC_TaskCompiler.class);
- suite.addTestSuite(TC_RubyCodeAnalyzer.class);
+ TestSuite suite = new TestSuite("Builder");
suite.addTestSuite(TC_CleanRdtCompiler.class);
suite.addTestSuite(TC_IncrementalRdtCompiler.class);
return suite;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
