user 1 gadu atpakaļ
vecāks
revīzija
40d3248d34

+ 2 - 1
6/src/main/java/pl/dmcs/Main.java

@@ -8,10 +8,11 @@ public class Main {
         Str str = new Str();
         System.out.println(str.add("1,2"));
         System.out.println(str.add("21\n2,3"));
-        System.out.println(str.add("21,2\n3"));
+        System.out.println(str.add("21,2\n3,6,3"));
         System.out.println(str.add("8"));
         System.out.println(str.add("//,\n1,2"));
         System.out.println(str.add("//;\n1;2"));
+        System.out.println(str.add("//;\n2;3"));
 
     }
 }

+ 15 - 1
6/src/main/java/pl/dmcs/Str.java

@@ -1,5 +1,7 @@
 package pl.weeia;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -27,15 +29,27 @@ public class Str {
         // Podział i obliczenie sumy
         String[] liczby = numbers.split(delimiter);
         int sum = 0;
+        List<Integer> negatywy = new ArrayList<>();
+
         for (String liczba : liczby) {
             if (!liczba.isEmpty()) { // Unikaj pustych wartości
                 try {
-                    sum += Integer.parseInt(liczba);
+                    int parsedNumber = Integer.parseInt(liczba);
+                    if (parsedNumber < 0) {
+                        negatywy.add(parsedNumber); // Dodaj liczby ujemne do listy
+                    } else {
+                        sum += parsedNumber;
+                    }
                 } catch (NumberFormatException e) {
                     throw new IllegalArgumentException("Nieprawidłowy format liczby: " + liczba);
                 }
             }
         }
+
+        if (!negatywy.isEmpty()) {
+            throw new IllegalArgumentException("Negatywy niedozwolone: " + negatywy);
+        }
+
         return sum;
     }
 }

BIN
6/target/app6-1.0.jar


BIN
6/target/classes/pl/weeia/Main.class


BIN
6/target/classes/pl/weeia/Str.class


+ 1 - 1
6/target/surefire-reports/StrTest.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: StrTest
 -------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.052 s -- in StrTest
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.049 s -- in StrTest

+ 9 - 4
6/target/surefire-reports/TEST-StrTest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="StrTest" time="0.052" tests="2" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="StrTest" time="0.049" tests="3" errors="0" skipped="0" failures="0">
   <properties>
     <property name="java.specification.version" value="17"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
@@ -12,7 +12,7 @@
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="US"/>
     <property name="sun.boot.library.path" value="/usr/lib/jvm/java-17-openjdk-amd64/lib"/>
-    <property name="sun.java.command" value="/home/user/testy/tasks/6/target/surefire/surefirebooter-20250125174900406_3.jar /home/user/testy/tasks/6/target/surefire 2025-01-25T17-49-00_304-jvmRun1 surefire-20250125174900406_1tmp surefire_0-20250125174900406_2tmp"/>
+    <property name="sun.java.command" value="/home/user/testy/tasks/6/target/surefire/surefirebooter-20250126200806002_3.jar /home/user/testy/tasks/6/target/surefire 2025-01-26T20-08-05_919-jvmRun1 surefire-20250126200806002_1tmp surefire_0-20250126200806002_2tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/home/user/testy/tasks/6/target/test-classes:/home/user/testy/tasks/6/target/classes:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.2/junit-jupiter-engine-5.10.2.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-engine/1.10.2/junit-platform-engine-1.10.2.jar:/home/user/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/home/user/.m2/repository/org/junit/platform/junit-platform-commons/1.10.2/junit-platform-commons-1.10.2.jar:/home/user/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.2/junit-jupiter-api-5.10.2.jar:/home/user/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -27,7 +27,7 @@
     <property name="line.separator" value="&#10;"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="/home/user/testy/tasks/6/target/surefire/surefirebooter-20250125174900406_3.jar"/>
+    <property name="surefire.real.class.path" value="/home/user/testy/tasks/6/target/surefire/surefirebooter-20250126200806002_3.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="17.0.13+11-Debian-2deb12u1"/>
     <property name="user.name" value="user"/>
@@ -53,5 +53,10 @@
     <property name="java.class.version" value="61.0"/>
   </properties>
   <testcase name="testStep3" classname="StrTest" time="0.022"/>
-  <testcase name="testStep12" classname="StrTest" time="0.003"/>
+  <testcase name="testStep4" classname="StrTest" time="0.002">
+    <system-out><![CDATA[3
+3
+]]></system-out>
+  </testcase>
+  <testcase name="testStep12" classname="StrTest" time="0.002"/>
 </testsuite>

BIN
6/target/test-classes/StrTest.class