From fc52fe4b4fd7bc0ea762e69a848a0a8b8bef9bc1 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 31 May 2017 07:12:46 +0200
Subject: [PATCH] fix JpsArtifactSerializationTest

---
 .../jps/model/serialization/JpsArtifactSerializationTest.java   | 2 +-
 .../jps/model/serialization/JpsSerializationTestCase.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsArtifactSerializationTest.java b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsArtifactSerializationTest.java
index 06ea314d6993..c5e2b43c438b 100644
--- a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsArtifactSerializationTest.java
+++ b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsArtifactSerializationTest.java
@@ -45,7 +45,7 @@ public class JpsArtifactSerializationTest extends JpsSerializationTestCase {
 
   public void testSaveProject() throws IOException {
     loadProject(SAMPLE_PROJECT_PATH);
-    List<Path> artifactFiles = Files.list(getTestDataAbsoluteFile(SAMPLE_PROJECT_PATH + ".idea/artifacts")).collect(Collectors.toList());
+    List<Path> artifactFiles = Files.list(getTestDataAbsoluteFile(SAMPLE_PROJECT_PATH + "/.idea/artifacts")).collect(Collectors.toList());
     assertNotNull(artifactFiles);
     for (Path file : artifactFiles) {
       JpsArtifact artifact = getService().createReference(FileUtil.getNameWithoutExtension(file.getFileName().toString())).asExternal(myModel).resolve();
diff --git a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsSerializationTestCase.java b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsSerializationTestCase.java
index e7252ac3501f..da5fb5bc041b 100644
--- a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsSerializationTestCase.java
+++ b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsSerializationTestCase.java
@@ -85,7 +85,7 @@ public abstract class JpsSerializationTestCase extends JpsModelTestCase {
     return variables;
   }
 
-  protected String getTestDataFileAbsolutePath(String relativePath) {
+  protected String getTestDataFileAbsolutePath(@NotNull String relativePath) {
     return PathManagerEx.findFileUnderProjectHome(relativePath, getClass()).getAbsolutePath();
   }