Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into checkstyle_parameter
- Loading branch information
Showing
10 changed files
with
436 additions
and
286 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
387 changes: 200 additions & 187 deletions
387
ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplNetworkWriter.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
...tep-up-transformer/src/test/java/eu/itesla_project/iidm/ddb/eurostag/EurostagDDBTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
package eu.itesla_project.iidm.ddb.eurostag; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertNull; | ||
|
||
import java.io.IOException; | ||
import java.nio.file.FileSystem; | ||
import java.nio.file.Files; | ||
import java.nio.file.Path; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
|
||
import org.junit.Test; | ||
|
||
import com.google.common.jimfs.Configuration; | ||
import com.google.common.jimfs.Jimfs; | ||
|
||
public class EurostagDDBTest { | ||
|
||
@Test | ||
public void testEurostagDDB() throws IOException { | ||
try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) { | ||
Path folder1 = Files.createDirectory(fs.getPath("/folder1")); | ||
Path folder2 = Files.createDirectory(fs.getPath("/folder2")); | ||
Path folder3 = Files.createDirectory(fs.getPath("/folder3")); | ||
|
||
Path generator1 = Files.createFile(folder1.resolve("generator1.tg")); | ||
Path generator2 = Files.createFile(folder1.resolve("generator2.tg")); | ||
|
||
Files.createFile(folder2.resolve("generator3.tg.bck")); | ||
Path link = Files.createSymbolicLink(folder2.resolve("folder3"), folder3); | ||
|
||
Path generator4 = Files.createFile(link.resolve("generator4.tg")); | ||
Path dataFile = Files.createFile(folder3.resolve("generator.data")); | ||
Files.createSymbolicLink(folder3.resolve("generator5.tg"), dataFile); | ||
|
||
EurostagDDB eurostagDDB = new EurostagDDB(Arrays.asList(folder1, folder2)); | ||
assertEquals(generator1, eurostagDDB.findGenerator("generator1")); | ||
assertEquals(generator2, eurostagDDB.findGenerator("generator2")); | ||
assertNull(eurostagDDB.findGenerator("generator3")); | ||
assertEquals(generator4, eurostagDDB.findGenerator("generator4")); | ||
assertEquals(dataFile, eurostagDDB.findGenerator("generator5")); | ||
} | ||
} | ||
|
||
@Test | ||
public void testLinkFiles() throws IOException { | ||
try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) { | ||
Path folder = Files.createDirectory(fs.getPath("/tmp")); | ||
Path dataFile = Files.createFile(folder.resolve("generator.data")); | ||
Files.createSymbolicLink(folder.resolve("generator1.tg"), dataFile); | ||
Files.createSymbolicLink(folder.resolve("generator2.tg"), dataFile); | ||
Files.createSymbolicLink(folder.resolve("generator3.tg"), dataFile); | ||
Path generator4 = Files.createFile(folder.resolve("generator4.tg")); | ||
|
||
EurostagDDB eurostagDDB = new EurostagDDB(Collections.singletonList(folder)); | ||
assertEquals(dataFile, eurostagDDB.findGenerator("generator1")); | ||
assertEquals(dataFile, eurostagDDB.findGenerator("generator2")); | ||
assertEquals(dataFile, eurostagDDB.findGenerator("generator3")); | ||
assertEquals(generator4, eurostagDDB.findGenerator("generator4")); | ||
} | ||
} | ||
|
||
@Test | ||
public void testLinkDirectory() throws IOException { | ||
try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) { | ||
Path folder = Files.createDirectory(fs.getPath("/folder")); | ||
Path file = Files.createFile(folder.resolve("generator.tg")); | ||
Path linkFolder = Files.createSymbolicLink(fs.getPath("/work/folder.link"), folder); | ||
|
||
EurostagDDB eurostagDDB = new EurostagDDB(Collections.singletonList(linkFolder)); | ||
assertEquals(file, eurostagDDB.findGenerator("generator")); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.