Просмотр исходного кода

Poprawiono testy- dokonano refaktoryzacji, dodano test dla 75 (3,5,5)

Adam Matuszewski 1 год назад
Родитель
Сommit
643cc8bf2b

+ 9 - 0
Task4_Cp/.idea/Task4_Cp.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 0 - 1
Task4_Cp/.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

+ 25 - 24
Task4_Cp/src/test/java/pl/dmcs/PrimeFactorsCalculatorTest.java

@@ -9,43 +9,44 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PrimeFactorsCalculatorTest {
 
-    @Test
-    public void testCalculatePrimeFactors() {
+    private void assertPrimeFactors(int number, List<Integer> expected){
         PrimeFactorsCalculator calculator = new PrimeFactorsCalculator();
-        List<Integer> result = calculator.calculatePrimeFactors(28);
-        List<Integer> expected = Arrays.asList(2, 2, 7);
+        List<Integer> result = calculator.calculatePrimeFactors(number);
         assertEquals(expected, result);
+
     }
 
     @Test
-    public void testCalculatePrimeFactorsForOne() {
-        PrimeFactorsCalculator calculator = new PrimeFactorsCalculator();
-        List<Integer> result = calculator.calculatePrimeFactors(1);
-        List<Integer> expected = Arrays.asList();
-        assertEquals(expected, result);
+    void testCalculatePrimeFactors() {
+        assertPrimeFactors(28, Arrays.asList(2,2,7));
+
     }
 
     @Test
-    public void testCalculatePrimeFactorsForZero() {
-        PrimeFactorsCalculator calculator = new PrimeFactorsCalculator();
-        List<Integer> result = calculator.calculatePrimeFactors(0);
-        List<Integer> expected = Arrays.asList();
-        assertEquals(expected, result);
+    void testCalculatePrimeFactorsForOne() {
+        assertPrimeFactors(1, Arrays.asList());
     }
 
     @Test
-    public void testCalculatePrimeFactorsForSixty() {
-        PrimeFactorsCalculator calculator = new PrimeFactorsCalculator();
-        List<Integer> result = calculator.calculatePrimeFactors(60);
-        List<Integer> expected = Arrays.asList(2, 2, 3, 5);
-        assertEquals(expected, result);
+    void testCalculatePrimeFactorsForZero() {
+        assertPrimeFactors(0, Arrays.asList());
     }
 
     @Test
-    public void testCalculatePrimeFactorsForPrimeNumber() {
-        PrimeFactorsCalculator calculator = new PrimeFactorsCalculator();
-        List<Integer> result = calculator.calculatePrimeFactors(13);
-        List<Integer> expected = Arrays.asList(13);
-        assertEquals(expected, result);
+    void testCalculatePrimeFactorsForSixty() {
+        assertPrimeFactors(60, Arrays.asList(2,2,3,5));
+
+    }
+
+    @Test
+    void testCalculatePrimeFactorsForSeventyFive() {
+        assertPrimeFactors(75, Arrays.asList(3,5,5));
+
     }
+
+    @Test
+    void testCalculatePrimeFactorsForPrimeNumber() {
+        assertPrimeFactors(13, Arrays.asList(13));
+    }
+
 }