From df93bfd225ad26b472b8a5f6f3454718beb2aae2 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 20 Mar 2013 12:57:32 +0100
Subject: [PATCH] use vfs time stamp instead of modification stamp in tests

---
 .../intellij/testFramework/vcs/AbstractVcsTestCase.java   | 6 ++----
 .../plugins/groovy/compiler/GroovyCompilerTest.groovy     | 8 ++++----
 .../plugins/groovy/compiler/GroovyCompilerTestCase.java   | 2 +-
 .../test/java/org/jetbrains/idea/maven/MavenTestCase.java | 2 +-
 .../org/jetbrains/idea/maven/dom/MavenDomTestCase.java    | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
index 637573c1bd70..288a5a86baa8 100644
--- a/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
@@ -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);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
index e2f1aeea27e3..da3963e9b7e1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -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() {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
index c78819cee2c8..66481489f66a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
@@ -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);
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
index 88f5be3ed97d..dcf900e1f087 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
@@ -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());
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
index 1211ce5c60e6..f47b6e152bdf 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
@@ -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 {