Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Removed bst from architecture tests and prepared for Globals #1699

Closed
wants to merge 1 commit into from
Closed

Removed bst from architecture tests and prepared for Globals #1699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 23 additions & 32 deletions src/test/java/net/sf/jabref/ArchitectureTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,63 +22,54 @@ public class ArchitectureTests {
public static final String PACKAGE_NET_SF_JABREF_GUI = "net.sf.jabref.gui";
public static final String PACKAGE_NET_SF_JABREF_LOGIC = "net.sf.jabref.logic";
public static final String PACKAGE_NET_SF_JABREF_MODEL = "net.sf.jabref.model";
public static final String GLOBALS = "net.sf.jabref.Globals";

private final String firstPackage;
private final String secondPackage;


public ArchitectureTests(String firstPackage, String secondPackage) {
this.firstPackage = firstPackage;
this.secondPackage = secondPackage;
}

@Parameterized.Parameters(name = "{index} -- is {0} independent of {1}?")
public static Iterable<Object[]> data() {
return Arrays.asList(
new Object[][] {
{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVA_AWT},
{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVAX_SWING},
{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_NET_SF_JABREF_GUI},

{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVA_AWT},
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVAX_SWING},
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_GUI},
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_LOGIC},
return Arrays.asList(new Object[][] {{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVA_AWT},
{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVAX_SWING},
{PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_NET_SF_JABREF_GUI},
// {PACKAGE_NET_SF_JABREF_LOGIC, GLOBALS},

{"net.sf.jabref.bst", PACKAGE_JAVA_AWT},
{"net.sf.jabref.bst", PACKAGE_JAVAX_SWING},
{"net.sf.jabref.bst", PACKAGE_NET_SF_JABREF_GUI},
{"net.sf.jabref.bst", PACKAGE_NET_SF_JABREF_LOGIC}
}
);
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVA_AWT}, {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVAX_SWING},
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_GUI},
{PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_LOGIC},
// {PACKAGE_NET_SF_JABREF_MODEL, GLOBALS},
});
}



@Test
public void testLogicIndependentOfSwingAndGui() throws IOException {
assertIndependenceOfPackages();
}

private void assertIndependenceOfPackages() throws IOException {
List<Path> files = Files.walk(Paths.get("src"))
.filter(p -> p.toString().endsWith(".java"))
.filter(p -> {
try {
List<Path> files = Files.walk(Paths.get("src")).filter(p -> p.toString().endsWith(".java")).filter(p -> {
try {
return Files.readAllLines(p, StandardCharsets.UTF_8).stream()
.filter(s -> s.startsWith("package " + firstPackage)).findAny().isPresent();
} catch (IOException e) {
return false;
}
}).filter(p -> {
try {
} catch (IOException e) {
return false;
}
}).filter(p -> {
try {
return Files.readAllLines(p, StandardCharsets.UTF_8).stream()
.filter(s -> s.startsWith("import " + secondPackage)).findAny().isPresent();
} catch (IOException e) {
return false;
}
}).collect(Collectors.toList());
} catch (IOException e) {
return false;
}
}).collect(Collectors.toList());

if(!files.isEmpty()) {
if (!files.isEmpty()) {
Assert.fail(files.toString());
}
}
Expand Down