Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Dr. Martin Goik
GoikLectures
Commits
c7ad7f34
Commit
c7ad7f34
authored
Jul 08, 2020
by
Dr. Martin Goik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
single file name char test, simplified »if«
parent
077ce169
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
17 deletions
+39
-17
P/Sd1/Filepath/src/main/java/de/hdm_stuttgart/mi/sd1/filepath/FileMetaInfo.java
...n/java/de/hdm_stuttgart/mi/sd1/filepath/FileMetaInfo.java
+1
-5
P/Sd1/Filepath/src/test/java/de/hdm_stuttgart/mi/sd1/filepath/MetaInfoUnixTest.java
...va/de/hdm_stuttgart/mi/sd1/filepath/MetaInfoUnixTest.java
+25
-12
P/Sd1/Filepath/src/test/java/de/hdm_stuttgart/mi/sd1/filepath/MetaInfoWindowsTest.java
...de/hdm_stuttgart/mi/sd1/filepath/MetaInfoWindowsTest.java
+13
-0
No files found.
P/Sd1/Filepath/src/main/java/de/hdm_stuttgart/mi/sd1/filepath/FileMetaInfo.java
View file @
c7ad7f34
...
...
@@ -56,11 +56,7 @@ public class FileMetaInfo {
}
}
else
{
drive
=
NO_DRIVE
;
if
(
filePathName
.
charAt
(
0
)
==
fileSeparatorChar
)
{
isRelative
=
false
;
}
else
{
isRelative
=
true
;
}
isRelative
=
filePathName
.
charAt
(
0
)
!=
fileSeparatorChar
;
pathComponents
=
new
StringTokenizer
(
filePathName
,
fileSeparatorString
);
}
// Now we must scan for directory separators (either '/' on UNIX or '\' on Windows)
...
...
P/Sd1/Filepath/src/test/java/de/hdm_stuttgart/mi/sd1/filepath/MetaInfoUnixTest.java
View file @
c7ad7f34
...
...
@@ -52,16 +52,29 @@ public class MetaInfoUnixTest {
Assert
.
assertEquals
(
null
,
fmi
.
extension
);
}
@Test
public
void
testRelativeWithExtension
()
{
Assume
.
assumeFalse
(
isWindows
);
final
FileMetaInfo
fmi
=
new
FileMetaInfo
(
"../../Desktop/icon.gif"
);
Assert
.
assertTrue
(
fmi
.
isRelative
);
Assert
.
assertEquals
(
FileMetaInfo
.
NO_DRIVE
,
fmi
.
drive
);
Assert
.
assertEquals
(
"../../Desktop"
,
fmi
.
path
);
Assert
.
assertEquals
(
"icon"
,
fmi
.
basename
);
Assert
.
assertEquals
(
"gif"
,
fmi
.
extension
);
}
@Test
public
void
testRelativeWithExtension
()
{
Assume
.
assumeFalse
(
isWindows
);
final
FileMetaInfo
fmi
=
new
FileMetaInfo
(
"../../Desktop/icon.gif"
);
Assert
.
assertTrue
(
fmi
.
isRelative
);
Assert
.
assertEquals
(
FileMetaInfo
.
NO_DRIVE
,
fmi
.
drive
);
Assert
.
assertEquals
(
"../../Desktop"
,
fmi
.
path
);
Assert
.
assertEquals
(
"icon"
,
fmi
.
basename
);
Assert
.
assertEquals
(
"gif"
,
fmi
.
extension
);
}
@Test
public
void
testRelativeSingleChar
()
{
Assume
.
assumeFalse
(
isWindows
);
final
FileMetaInfo
fmi
=
new
FileMetaInfo
(
"a"
);
Assert
.
assertTrue
(
fmi
.
isRelative
);
Assert
.
assertEquals
(
FileMetaInfo
.
NO_DRIVE
,
fmi
.
drive
);
Assert
.
assertEquals
(
""
,
fmi
.
path
);
Assert
.
assertEquals
(
"a"
,
fmi
.
basename
);
Assert
.
assertEquals
(
null
,
fmi
.
extension
);
}
}
P/Sd1/Filepath/src/test/java/de/hdm_stuttgart/mi/sd1/filepath/MetaInfoWindowsTest.java
View file @
c7ad7f34
...
...
@@ -64,4 +64,17 @@ public class MetaInfoWindowsTest {
Assert
.
assertEquals
(
"icon"
,
fmi
.
basename
);
Assert
.
assertEquals
(
"gif"
,
fmi
.
extension
);
}
@Test
public
void
testRelativeSingleChar
()
{
Assume
.
assumeTrue
(
isWindows
);
final
FileMetaInfo
fmi
=
new
FileMetaInfo
(
"a"
);
Assert
.
assertTrue
(
fmi
.
isRelative
);
Assert
.
assertEquals
(
FileMetaInfo
.
NO_DRIVE
,
fmi
.
drive
);
Assert
.
assertEquals
(
""
,
fmi
.
path
);
Assert
.
assertEquals
(
"a"
,
fmi
.
basename
);
Assert
.
assertEquals
(
null
,
fmi
.
extension
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment