From 8e7cc4198d414f20188edad080a13551a9a08a02 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 6 Aug 2004 12:31:02 +0000 Subject: [PATCH] promoted code up the hierarchy. --- .../incremental/IncrementalTests.java | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java index abefc41f3..dacbfd2cb 100644 --- a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java +++ b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java @@ -226,56 +226,5 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { assertTrue("Should say updated hello",after.getStdOut().startsWith("updated hello")); } - private long nextIncrement(boolean doWait) { - long time = System.currentTimeMillis(); - if (doWait) { - try { - Thread.sleep(1000); - } catch (InterruptedException intEx) {} - } - return time; - } - - private void copyFileAndDoIncrementalBuild(String from, String to) throws Exception { - String dir = getCurrentTest().getDir(); - FileUtil.copyFile(new File(dir + File.separator + from), - new File(ajc.getSandboxDirectory(),to)); - CompilationResult result = ajc.doIncrementalCompile(); - assertNoMessages(result,"Expected clean compile from test '" + getCurrentTest().getTitle() + "'"); - } - - private void copyFileAndDoIncrementalBuild(String from, String to, MessageSpec expectedResults) throws Exception { - String dir = getCurrentTest().getDir(); - FileUtil.copyFile(new File(dir + File.separator + from), - new File(ajc.getSandboxDirectory(),to)); - CompilationResult result = ajc.doIncrementalCompile(); - assertMessages(result,"Test '" + getCurrentTest().getTitle() + "' did not produce expected messages",expectedResults); - } - - - private void deleteFileAndDoIncrementalBuild(String file, MessageSpec expectedResult) throws Exception { - new File(ajc.getSandboxDirectory(),file).delete(); - CompilationResult result = ajc.doIncrementalCompile(); - assertMessages(result,"Test '" + getCurrentTest().getTitle() + "' did not produce expected messages",expectedResult); - } - - private void deleteFileAndDoIncrementalBuild(String file) throws Exception { - deleteFileAndDoIncrementalBuild(file,MessageSpec.EMPTY_MESSAGE_SET); - } - - private void assertAdded(String file) { - assertTrue("File " + file + " should have been added", - new File(ajc.getSandboxDirectory(),file).exists()); - } - - private void assertDeleted(String file) { - assertFalse("File " + file + " should have been deleted", - new File(ajc.getSandboxDirectory(),file).exists()); - } - - private void assertUpdated(String file, long sinceTime) { - File f = new File(ajc.getSandboxDirectory(),file); - assertTrue("File " + file + " should have been updated",f.lastModified() > sinceTime); - } } -- 2.39.5