hazendaz / jmockit1 / 85

Committed 26 Apr 2025 06:37PM UTC coverage: 73.285% (-0.02%) from 73.308%

Build # 85

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #327 from hazendaz/paths

Use nio more per modernizer and update more tests to junit 5

Run Details

5625 of 8178 branches covered (68.78%)

Branch coverage included in aggregate %.

5 of 43 new or added lines in 14 files covered. (11.63%)

3 existing lines in 3 files now uncovered.

11885 of 15715 relevant lines covered (75.63%)

0.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/main/src/main/java/mockit/coverage/reporting/sourceFiles/InputFile.java

/*
 * Copyright (c) 2006 JMockit developers
 * This file is subject to the terms of the MIT license (see LICENSE.txt).
 */
package mockit.coverage.reporting.sourceFiles;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;

import org.checkerframework.checker.index.qual.NonNegative;

public final class InputFile {
    @NonNull
    final String filePath;
    @NonNull
    private final File sourceFile;
    @NonNull
    private final BufferedReader input;

    @Nullable
    public static InputFile createIfFileExists(@NonNull List<File> sourceDirs, @NonNull String filePath)
            throws IOException {
        File sourceFile = findSourceFile(sourceDirs, filePath);
        return sourceFile == null ? null : new InputFile(filePath, sourceFile);
    }

    @Nullable
    private static File findSourceFile(@NonNull List<File> sourceDirs, @NonNull String filePath) {
        int p = filePath.indexOf('/');
        String topLevelPackage = p < 0 ? "" : filePath.substring(0, p);
        int n = sourceDirs.size();

        for (int i = 0; i < n; i++) {
            File sourceDir = sourceDirs.get(i);
            File sourceFile = getSourceFile(sourceDir, topLevelPackage, filePath);

            if (sourceFile != null) {
                giveCurrentSourceDirHighestPriority(sourceDirs, i);
                addRootSourceDirIfNew(sourceDirs, filePath, sourceFile);
                return sourceFile;
            }
        }

        return null;
    }

    @Nullable
    private static File getSourceFile(@NonNull File sourceDir, @NonNull final String topLevelPackage,
            @NonNull String filePath) {
        File file = sourceDir.toPath().resolve(filePath).toFile();

        if (file.exists()) {
            return file;
        }

        File[] subDirs = sourceDir.listFiles((FileFilter) subDir -> subDir.isDirectory() && !subDir.isHidden()
                && !subDir.getName().equals(topLevelPackage));

        if (subDirs != null && subDirs.length > 0) {
            for (File subDir : subDirs) {
                File sourceFile = getSourceFile(subDir, topLevelPackage, filePath);

                if (sourceFile != null) {
                    return sourceFile;
                }
            }
        }

        return null;
    }

    private static void giveCurrentSourceDirHighestPriority(@NonNull List<File> sourceDirs,
            @NonNegative int currentSourceDirIndex) {
        if (currentSourceDirIndex > 0) {
            File firstSourceDir = sourceDirs.get(0);
            File currentSourceDir = sourceDirs.get(currentSourceDirIndex);

            if (!firstSourceDir.getPath().startsWith(currentSourceDir.getPath())) {
                sourceDirs.set(currentSourceDirIndex, firstSourceDir);
                sourceDirs.set(0, currentSourceDir);
            }
        }
    }

    private static void addRootSourceDirIfNew(@NonNull List<File> sourceDirs, @NonNull String filePath,
            @NonNull File sourceFile) {
        String sourceFilePath = sourceFile.getPath();
        String sourceRootDir = sourceFilePath.substring(0, sourceFilePath.length() - filePath.length());
        File newSourceDir = Path.of(sourceRootDir).toFile();

        if (!sourceDirs.contains(newSourceDir)) {
            sourceDirs.add(0, newSourceDir);
        }
    }

    private InputFile(@NonNull String filePath, @NonNull File sourceFile) throws IOException {
        this.filePath = filePath;
        this.sourceFile = sourceFile;
        input = Files.newBufferedReader(sourceFile.toPath(), StandardCharsets.UTF_8);
    }

    @NonNull
    String getSourceFileName() {
        return sourceFile.getName();
    }

    @NonNull
    String getSourceFilePath() {
        String path = sourceFile.getPath();
        return path.startsWith("..") ? path.substring(3) : path;
    }

    @Nullable
    String nextLine() throws IOException {
        return input.readLine();
    }

    void close() throws IOException {
        input.close();
    }
}

1	/*
2	* Copyright (c) 2006 JMockit developers
3	* This file is subject to the terms of the MIT license (see LICENSE.txt).
4	*/
5	package mockit.coverage.reporting.sourceFiles;
6
7	import edu.umd.cs.findbugs.annotations.NonNull;
8	import edu.umd.cs.findbugs.annotations.Nullable;
9
10	import java.io.BufferedReader;
11	import java.io.File;
12	import java.io.FileFilter;
13	import java.io.IOException;
14	import java.nio.charset.StandardCharsets;
15	import java.nio.file.Files;
16	import java.nio.file.Path;
17	import java.util.List;
18
19	import org.checkerframework.checker.index.qual.NonNegative;
20
21	public final class InputFile {
22	@NonNull
23	final String filePath;
24	@NonNull
25	private final File sourceFile;
26	@NonNull
27	private final BufferedReader input;
28
29	@Nullable
30	public static InputFile createIfFileExists(@NonNull List<File> sourceDirs, @NonNull String filePath)
31	throws IOException {
32	File sourceFile = findSourceFile(sourceDirs, filePath);	×
33	return sourceFile == null ? null : new InputFile(filePath, sourceFile);	×
34	}
35
36	@Nullable
37	private static File findSourceFile(@NonNull List<File> sourceDirs, @NonNull String filePath) {
38	int p = filePath.indexOf('/');	×
39	String topLevelPackage = p < 0 ? "" : filePath.substring(0, p);	×
40	int n = sourceDirs.size();	×
41
42	for (int i = 0; i < n; i++) {	×
43	File sourceDir = sourceDirs.get(i);	×
44	File sourceFile = getSourceFile(sourceDir, topLevelPackage, filePath);	×
45
46	if (sourceFile != null) {	×
47	giveCurrentSourceDirHighestPriority(sourceDirs, i);	×
48	addRootSourceDirIfNew(sourceDirs, filePath, sourceFile);	×
49	return sourceFile;	×
50	}
51	}
52
53	return null;	×
54	}
55
56	@Nullable
57	private static File getSourceFile(@NonNull File sourceDir, @NonNull final String topLevelPackage,
58	@NonNull String filePath) {
NEW 59	File file = sourceDir.toPath().resolve(filePath).toFile();	×
60
61	if (file.exists()) {	×
62	return file;	×
63	}
64
65	File[] subDirs = sourceDir.listFiles((FileFilter) subDir -> subDir.isDirectory() && !subDir.isHidden()	×
66	&& !subDir.getName().equals(topLevelPackage));	×
67
68	if (subDirs != null && subDirs.length > 0) {	×
69	for (File subDir : subDirs) {	×
70	File sourceFile = getSourceFile(subDir, topLevelPackage, filePath);	×
71
72	if (sourceFile != null) {	×
73	return sourceFile;	×
74	}
75	}
76	}
77
78	return null;	×
79	}
80
81	private static void giveCurrentSourceDirHighestPriority(@NonNull List<File> sourceDirs,
82	@NonNegative int currentSourceDirIndex) {
83	if (currentSourceDirIndex > 0) {	×
84	File firstSourceDir = sourceDirs.get(0);	×
85	File currentSourceDir = sourceDirs.get(currentSourceDirIndex);	×
86
87	if (!firstSourceDir.getPath().startsWith(currentSourceDir.getPath())) {	×
88	sourceDirs.set(currentSourceDirIndex, firstSourceDir);	×
89	sourceDirs.set(0, currentSourceDir);	×
90	}
91	}
92	}	×
93
94	private static void addRootSourceDirIfNew(@NonNull List<File> sourceDirs, @NonNull String filePath,
95	@NonNull File sourceFile) {
96	String sourceFilePath = sourceFile.getPath();	×
97	String sourceRootDir = sourceFilePath.substring(0, sourceFilePath.length() - filePath.length());	×
NEW 98	File newSourceDir = Path.of(sourceRootDir).toFile();	×
99
100	if (!sourceDirs.contains(newSourceDir)) {	×
101	sourceDirs.add(0, newSourceDir);	×
102	}
103	}	×
104
105	private InputFile(@NonNull String filePath, @NonNull File sourceFile) throws IOException {	×
106	this.filePath = filePath;	×
107	this.sourceFile = sourceFile;	×
NEW 108	input = Files.newBufferedReader(sourceFile.toPath(), StandardCharsets.UTF_8);	×
109	}	×
110
111	@NonNull
112	String getSourceFileName() {
113	return sourceFile.getName();	×
114	}
115
116	@NonNull
117	String getSourceFilePath() {
118	String path = sourceFile.getPath();	×
119	return path.startsWith("..") ? path.substring(3) : path;	×
120	}
121
122	@Nullable
123	String nextLine() throws IOException {
124	return input.readLine();	×
125	}
126
127	void close() throws IOException {
128	input.close();	×
129	}	×
130	}

hazendaz / jmockit1 / 85

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous