This is an automated email from the ASF dual-hosted git repository.
claude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
The following commit(s) were added to refs/heads/master by this push:
new cd9aeaf0 RAT-98: updated tests (#437)
cd9aeaf0 is described below
commit cd9aeaf07f7cd70685ae93ed41efd543e296236f
Author: Claude Warren <[email protected]>
AuthorDate: Thu Feb 6 14:48:26 2025 +0100
RAT-98: updated tests (#437)
* updated tests
---------
Co-authored-by: P. Ottlinger <[email protected]>
---
.../java/org/apache/rat/OptionCollectionTest.java | 20 +--
.../rat/document/DocumentNameBuilderTest.java | 167 +++++++++++++++++++++
2 files changed, 169 insertions(+), 18 deletions(-)
diff --git
a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
index c0d45c08..7f34fa2e 100644
--- a/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
+++ b/apache-rat-core/src/test/java/org/apache/rat/OptionCollectionTest.java
@@ -53,10 +53,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static java.lang.String.format;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.assertj.core.api.Fail.fail;
public class OptionCollectionTest {
-
@TempDir
static Path testPath;
@@ -65,21 +64,6 @@ public class OptionCollectionTest {
AbstractOptionsProvider.preserveData(testPath.toFile(), "optionTest");
}
- /**
- * The base directory for the test.
- * We do not use TempFile because we want the evidence of the run
- * to exist after a failure.
- */
- private final File baseDir;
-
- /**
- * Constructor.
- */
- public OptionCollectionTest() {
- baseDir = new File("target/optionTools");
- baseDir.mkdirs();
- }
-
/**
* Defines the test method that is stored in a map.
*/
@@ -128,7 +112,7 @@ public class OptionCollectionTest {
ReportConfiguration config;
try {
DefaultLog.setInstance(log);
- String[] args = {"--dir", baseDir.getAbsolutePath()};
+ String[] args = {"--dir", testPath.toFile().getAbsolutePath()};
config = OptionCollection.parseCommands(testPath.toFile(), args,
(o) -> {
}, true);
} finally {
diff --git
a/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
new file mode 100644
index 00000000..0e0f0d1f
--- /dev/null
+++
b/apache-rat-core/src/test/java/org/apache/rat/document/DocumentNameBuilderTest.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ */
+package org.apache.rat.document;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.apache.rat.document.FSInfoTest.WINDOWS;
+
+public class DocumentNameBuilderTest {
+
+ @ParameterizedTest(name="{0}")
+ @MethodSource("buildTestData")
+ void buildTest(String testName, DocumentName documentName, String name,
String shortName, String baseName, String root,
+ String directorySeparator, Boolean isCaseSensitive, String
localized, String localizedArg) {
+ assertThat(documentName.getName()).as("Invalid name").isEqualTo(name);
+ assertThat(documentName.getShortName()).as("Invalid short
name").isEqualTo(shortName);
+ assertThat(documentName.getBaseName()).as("Invalid base
name").isEqualTo(baseName);
+ assertThat(documentName.getRoot()).as("Invalid root").isEqualTo(root);
+ assertThat(documentName.getDirectorySeparator()).as("Invalid directory
separator").isEqualTo(directorySeparator);
+ if (isCaseSensitive) {
+ assertThat(documentName.isCaseSensitive()).as("Invalid case
sensitivity").isTrue();
+ } else {
+ assertThat(documentName.isCaseSensitive()).as("Invalid case
sensitivity").isFalse();
+ }
+ assertThat(documentName.localized()).as("Invalid localized
").isEqualTo(localized);
+ final String sep = documentName.getDirectorySeparator().equals("/") ?
"\\" : "/";
+ assertThat(documentName.localized(sep)).as(() ->
String.format("Invalid localized('%s')", sep)).isEqualTo(localizedArg);
+ }
+
+ static Stream<Arguments> buildTestData() {
+ List<Arguments> lst = new ArrayList<>();
+
+ //
+ String testName = "windows\\foo direct";
+ DocumentName documentName =
DocumentName.builder(WINDOWS).setName("C:\\windows\\foo").setBaseName("C:\\windows").build();
+ lst.add(Arguments.of( testName, documentName, "C:\\windows\\foo",
"foo", "C:\\windows", "C:", "\\", false,
+ "\\foo", "/foo"));
+ DocumentName baseName = documentName;
+
+ //
+ testName = "builder(docName)";
+ documentName = DocumentName.builder(baseName).build();
+ lst.add(Arguments.of( testName, documentName, "C:\\windows\\foo",
"foo", "C:\\windows", "C:", "\\", false,
+ "\\foo", "/foo"));
+
+ //
+ testName = "windows\\foo\\bar by resolve";
+ documentName = baseName.resolve("bar");
+ lst.add(Arguments.of(testName, documentName,
"C:\\windows\\foo\\bar", "bar", "C:\\windows", "C:", "\\", false,
+ "\\foo\\bar", "/foo/bar"));
+
+ //
+ testName = "windows\\foo\\direct by basename";
+ documentName =
DocumentName.builder(baseName).setName("windows\\foo\\direct").build();
+ lst.add(Arguments.of(testName, documentName,
"C:\\windows\\foo\\direct", "direct", "C:\\windows", "C:", "\\", false,
+ "\\foo\\direct", "/foo/direct"));
+
+ //
+ testName = "windows\\foo\\bar by file";
+ File file = mock(File.class);
+ File parent = mock(File.class);
+ when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
+ when(file.getParentFile()).thenReturn(parent);
+ when(file.isDirectory()).thenReturn(false);
+ when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
+ when(parent.isDirectory()).thenReturn(true);
+ documentName = new DocumentName.Builder(WINDOWS, file).build();
+ lst.add(Arguments.of(testName, documentName,
"C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo", "C:", "\\", false,
+ "\\bar", "/bar"));
+
+ //
+ testName = "windows\\foo\\bar by directory";
+ file = mock(File.class);
+ parent = mock(File.class);
+ when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
+ when(file.getParentFile()).thenReturn(parent);
+ when(file.isDirectory()).thenReturn(true);
+ when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
+ when(parent.isDirectory()).thenReturn(true);
+ documentName = new DocumentName.Builder(WINDOWS, file).build();
+ lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar",
"bar", "C:\\windows\\foo\\bar", "C:", "\\", false,
+ "\\", "/"));
+
+ //
+ testName = "windows setRoot";
+ documentName =
DocumentName.builder(baseName).setRoot("D:").build();
+ lst.add(Arguments.of(testName, documentName, "D:\\windows\\foo",
"foo", "C:\\windows", "D:", "\\", false,
+ "D:\\windows\\foo", "D:/windows/foo"));
+
+ testName = "windows setRoot(null)";
+ documentName =
DocumentName.builder(baseName).setRoot(null).build();
+ lst.add(Arguments.of(testName, documentName, "\\windows\\foo",
"foo", "C:\\windows", "", "\\", false,
+ "\\windows\\foo", "/windows/foo"));
+
+ testName = "windows setRoot('')";
+ documentName = DocumentName.builder(baseName).setRoot("").build();
+ lst.add(Arguments.of(testName, documentName, "\\windows\\foo",
"foo", "C:\\windows", "", "\\", false,
+ "\\windows\\foo", "/windows/foo"));
+
+ //
+ testName = "windows setName('baz')";
+ documentName =
DocumentName.builder(baseName).setName("baz").build();
+ lst.add(Arguments.of(testName, documentName, "C:\\windows\\baz",
"baz", "C:\\windows", "C:", "\\", false,
+ "\\baz", "/baz"));
+
+ testName = "windows setName((String)null)";
+ documentName =
DocumentName.builder(baseName).setName((String)null).build();
+ lst.add(Arguments.of(testName, documentName, "C:\\windows",
"windows", "C:\\windows", "C:", "\\", false,
+ "\\", "/"));
+
+ testName = "windows setName('')";
+ documentName = DocumentName.builder(baseName).setName("").build();
+ lst.add(Arguments.of(testName, documentName, "C:\\windows",
"windows", "C:\\windows", "C:", "\\", false,
+ "\\", "/"));
+
+ file = mock(File.class);
+ parent = mock(File.class);
+ when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
+ when(file.getParentFile()).thenReturn(parent);
+ when(file.isDirectory()).thenReturn(false);
+ when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
+ when(parent.isDirectory()).thenReturn(true);
+ testName = "windows setName(file)";
+ documentName =
DocumentName.builder(baseName).setName(file).build();
+ lst.add(Arguments.of(testName, documentName,
"C:\\windows\\foo\\bar", "bar", "C:\\windows\\foo", "C:", "\\", false,
+ "\\bar", "/bar"));
+
+ file = mock(File.class);
+ parent = mock(File.class);
+ when(file.getAbsolutePath()).thenReturn("C:\\windows\\foo\\bar");
+ when(file.getParentFile()).thenReturn(parent);
+ when(file.isDirectory()).thenReturn(true);
+ when(parent.getAbsolutePath()).thenReturn("C:\\windows\\foo");
+ when(parent.isDirectory()).thenReturn(true);
+ testName = "windows setName(directory)";
+ documentName = DocumentName.builder(baseName).setName(file).build();
+ lst.add(Arguments.of(testName, documentName, "C:\\windows\\foo\\bar",
"bar", "C:\\windows\\foo\\bar", "C:", "\\", false,
+ "\\", "/"));
+
+ return lst.stream();
+ }
+}
