MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use vfs time stamp instead of modification stamp in tests

Browse Source
This commit is contained in:
peter
2013-03-20 12:59:15 +01:00
parent 5a1266d574
commit df93bfd225
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+2 -4
View File
@@ -325,14 +325,12 @@ public abstract class AbstractVcsTestCase {
@Override
protected void run() throws Throwable {
try {
long newModTs = Math.max(System.currentTimeMillis(), file.getModificationStamp() + 1100);
final long newTs = Math.max(System.currentTimeMillis(), file.getTimeStamp() + 1100);
file.setBinaryContent(newContent.getBytes(), newModTs, newTs);
file.setBinaryContent(newContent.getBytes(), -1, newTs);
final File file1 = new File(file.getPath());
FileUtil.writeToFile(file1, newContent.getBytes());
file.refresh(false, false);
newModTs = Math.max(System.currentTimeMillis() + 1100, file.getModificationStamp() + 1100);
assertTrue(file1 + " / " + newModTs, file1.setLastModified(newModTs));
assertTrue(file1 + " / " + newTs, file1.setLastModified(newTs));
}
catch(IOException ex) {
throw new RuntimeException(ex);
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+4 -4
View File
@@ -528,14 +528,14 @@ class Indirect {
myFixture.addFileToProject('Bar.groovy', 'class Bar extends Foo { }')
def main = myFixture.addFileToProject('Main.groovy', 'class Main extends Bar { }').virtualFile
assertEmpty make()
long oldBaseStamp = findClassFile("Base").modificationStamp
long oldMainStamp = findClassFile("Main").modificationStamp
long oldBaseStamp = findClassFile("Base").timeStamp
long oldMainStamp = findClassFile("Main").timeStamp
touch(main)
touch(foo)
assertEmpty make()
assert oldMainStamp != findClassFile("Main").modificationStamp
assert oldBaseStamp == findClassFile("Base").modificationStamp
assert oldMainStamp != findClassFile("Main").timeStamp
assert oldBaseStamp == findClassFile("Base").timeStamp
}
public void testPartialCrossRecompile() {
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+1 -1
View File
@@ -214,7 +214,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC
}
protected static void touch(VirtualFile file) throws IOException {
file.setBinaryContent(file.contentsToByteArray(), file.getModificationStamp() + 1, file.getTimeStamp() + 1);
file.setBinaryContent(file.contentsToByteArray(), -1, file.getTimeStamp() + 1);
File ioFile = VfsUtil.virtualToIoFile(file);
assert ioFile.setLastModified(ioFile.lastModified() - 100000);
file.refresh(false, false);
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
+1 -1
View File
@@ -481,7 +481,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
@Override
protected void run(Result<VirtualFile> result) throws Throwable {
if (advanceStamps) {
file.setBinaryContent(content.getBytes(), file.getModificationStamp() + 4000, file.getTimeStamp() + 4000);
file.setBinaryContent(content.getBytes(), -1, file.getTimeStamp() + 4000);
}
else {
file.setBinaryContent(content.getBytes(), file.getModificationStamp(), file.getTimeStamp());
plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
+2 -2
View File
@@ -99,9 +99,9 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
}
protected void configTest(VirtualFile f) throws IOException {
if (Comparing.equal(myConfigTimestamps.get(f), f.getModificationStamp())) return;
if (Comparing.equal(myConfigTimestamps.get(f), f.getTimeStamp())) return;
myFixture.configureFromExistingVirtualFile(f);
myConfigTimestamps.put(f, f.getModificationStamp());
myConfigTimestamps.put(f, f.getTimeStamp());
}
protected void type(VirtualFile f, char c) throws IOException {