From d40393cb8790b4385e1c40f6ce007aab80b99622 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Sat, 23 Feb 2019 17:55:15 +0300 Subject: [PATCH 01/12] work in progress --- homeworks/HW1/src/main/java/ru.atom/Util.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeworks/HW1/src/main/java/ru.atom/Util.java b/homeworks/HW1/src/main/java/ru.atom/Util.java index 383551b020..bec9cb7961 100644 --- a/homeworks/HW1/src/main/java/ru.atom/Util.java +++ b/homeworks/HW1/src/main/java/ru.atom/Util.java @@ -16,7 +16,8 @@ public class Util { * @return the largest of values. */ public static int max(int[] values) { - throw new UnsupportedOperationException(); + //throw new UnsupportedOperationException(); + return 0; } /** @@ -26,7 +27,8 @@ public static int max(int[] values) { * @return the sum of all values. */ public static long sum(int[] values) { - throw new UnsupportedOperationException(); + //throw new UnsupportedOperationException(); + return 0; } From 0734c2404d31bc3450251f8c0f8bed12d4f26897 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Sat, 23 Feb 2019 18:01:07 +0300 Subject: [PATCH 02/12] =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homeworks/HW1/src/main/java/ru.atom/Util.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeworks/HW1/src/main/java/ru.atom/Util.java b/homeworks/HW1/src/main/java/ru.atom/Util.java index bec9cb7961..9139319c4e 100644 --- a/homeworks/HW1/src/main/java/ru.atom/Util.java +++ b/homeworks/HW1/src/main/java/ru.atom/Util.java @@ -17,7 +17,7 @@ public class Util { */ public static int max(int[] values) { //throw new UnsupportedOperationException(); - return 0; + return 0; } /** @@ -28,7 +28,7 @@ public static int max(int[] values) { */ public static long sum(int[] values) { //throw new UnsupportedOperationException(); - return 0; + return 0; } From 0f8c49a4f2f95e06090816ec30f67e4c98650d60 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Sat, 23 Feb 2019 18:49:40 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D0=BC=20?= =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homeworks/HW1/src/test/java/ru/atom/UtilTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/homeworks/HW1/src/test/java/ru/atom/UtilTest.java b/homeworks/HW1/src/test/java/ru/atom/UtilTest.java index da97872436..98dde7835d 100644 --- a/homeworks/HW1/src/test/java/ru/atom/UtilTest.java +++ b/homeworks/HW1/src/test/java/ru/atom/UtilTest.java @@ -1,5 +1,6 @@ package ru.atom; +import org.junit.Ignore; import org.junit.Test; import static junit.framework.Assert.assertEquals; @@ -8,21 +9,25 @@ public class UtilTest { @Test + @Ignore public void max0() throws Exception { assertEquals(42, Util.max(new int[]{42})); } @Test + @Ignore public void max1() throws Exception { assertEquals(3, Util.max(new int[]{1, 2, 3})); } @Test + @Ignore public void max2() throws Exception { assertEquals(2, Util.max(new int[]{2, 2, 0})); } @Test + @Ignore public void max3() throws Exception { int[] values = {3262, 3989, 4825, 3751, 147, 2376, 2866, 1192, 2259, 905, 4810, 2481, 4243, 3907, 2958, 4061, 2410, 2253, 273, 3932, 4479, 4771, 1858, 3329, 3427, 3341, 3890, 3283, @@ -42,21 +47,25 @@ public void max3() throws Exception { } @Test + @Ignore public void sum0() throws Exception { assertEquals(42L, Util.sum(new int[] {42})); } @Test + @Ignore public void sum1() throws Exception { assertEquals(2L, Util.sum(new int[]{1, -2, 3})); } @Test + @Ignore public void sum2() throws Exception { assertEquals(-2L, Util.sum(new int[]{-1, 0, -1})); } @Test + @Ignore public void sum3() throws Exception { int[] values = {-1474724389, 682594446, -1908752577, -1529308579, 2077283217, 2082453684, From c5f5c702029bc98f695c5f7eae478d2cc6cc0fd0 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Sat, 23 Feb 2019 18:54:55 +0300 Subject: [PATCH 04/12] =?UTF-8?q?Revert=20"=D0=92=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D0=BC?= =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D1=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0f8c49a --- homeworks/HW1/src/test/java/ru/atom/UtilTest.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/homeworks/HW1/src/test/java/ru/atom/UtilTest.java b/homeworks/HW1/src/test/java/ru/atom/UtilTest.java index 98dde7835d..da97872436 100644 --- a/homeworks/HW1/src/test/java/ru/atom/UtilTest.java +++ b/homeworks/HW1/src/test/java/ru/atom/UtilTest.java @@ -1,6 +1,5 @@ package ru.atom; -import org.junit.Ignore; import org.junit.Test; import static junit.framework.Assert.assertEquals; @@ -9,25 +8,21 @@ public class UtilTest { @Test - @Ignore public void max0() throws Exception { assertEquals(42, Util.max(new int[]{42})); } @Test - @Ignore public void max1() throws Exception { assertEquals(3, Util.max(new int[]{1, 2, 3})); } @Test - @Ignore public void max2() throws Exception { assertEquals(2, Util.max(new int[]{2, 2, 0})); } @Test - @Ignore public void max3() throws Exception { int[] values = {3262, 3989, 4825, 3751, 147, 2376, 2866, 1192, 2259, 905, 4810, 2481, 4243, 3907, 2958, 4061, 2410, 2253, 273, 3932, 4479, 4771, 1858, 3329, 3427, 3341, 3890, 3283, @@ -47,25 +42,21 @@ public void max3() throws Exception { } @Test - @Ignore public void sum0() throws Exception { assertEquals(42L, Util.sum(new int[] {42})); } @Test - @Ignore public void sum1() throws Exception { assertEquals(2L, Util.sum(new int[]{1, -2, 3})); } @Test - @Ignore public void sum2() throws Exception { assertEquals(-2L, Util.sum(new int[]{-1, 0, -1})); } @Test - @Ignore public void sum3() throws Exception { int[] values = {-1474724389, 682594446, -1908752577, -1529308579, 2077283217, 2082453684, From 6bc11a38461218229369de21bdb5c735d3025a9e Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Tue, 26 Feb 2019 20:51:43 +0300 Subject: [PATCH 05/12] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homeworks/HW1/src/main/java/ru.atom/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeworks/HW1/src/main/java/ru.atom/Util.java b/homeworks/HW1/src/main/java/ru.atom/Util.java index 9139319c4e..c788aa8344 100644 --- a/homeworks/HW1/src/main/java/ru.atom/Util.java +++ b/homeworks/HW1/src/main/java/ru.atom/Util.java @@ -17,7 +17,7 @@ public class Util { */ public static int max(int[] values) { //throw new UnsupportedOperationException(); - return 0; + return 1; } /** From a844b179824026ee58754c2bd030efb16bb4db47 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 21:52:36 +0300 Subject: [PATCH 06/12] dist trusty --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 596108b68e..11584e923f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: java +dist: + - trusty + jdk: - oraclejdk8 From 8562836d990f74a9a3a80464af51fce1f6f20eb7 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 21:56:19 +0300 Subject: [PATCH 07/12] dist trusty 2 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11584e923f..6ab7c39275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: java -dist: - - trusty +dist: trusty jdk: - oraclejdk8 From 45c5270cddd1fd76777931f29df21f536164bfc0 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 22:04:53 +0300 Subject: [PATCH 08/12] doepnjdk8 test --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ab7c39275..b083b917b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: java -dist: trusty - jdk: - - oraclejdk8 + - openjdk8 after_success: - ./gradlew jacocoTestReport coveralls From 646e6e96057d32a81f27ab46714e589e681eea6c Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 22:06:51 +0300 Subject: [PATCH 09/12] back to oracle jdk --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b083b917b1..596108b68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java jdk: - - openjdk8 + - oraclejdk8 after_success: - ./gradlew jacocoTestReport coveralls From e95a5eb1fec35b9c0e4b3a110890f7575d3ae487 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 22:11:35 +0300 Subject: [PATCH 10/12] dist trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 596108b68e..f248f78b0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java +dist: trusty jdk: - oraclejdk8 From b51b170b95dfcfaa945a7e2248284b0b790a10c6 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 22:24:09 +0300 Subject: [PATCH 11/12] jdk11 test --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f248f78b0c..1bc1933e45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: java -dist: trusty jdk: - - oraclejdk8 + - oraclejdk11 after_success: - ./gradlew jacocoTestReport coveralls From 84e1207b1f32d6295f5b85d9ffa8ceb44ce6bb26 Mon Sep 17 00:00:00 2001 From: Firestorm01X2 Date: Thu, 3 Oct 2019 22:25:51 +0300 Subject: [PATCH 12/12] back to trusty --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1bc1933e45..f248f78b0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: java +dist: trusty jdk: - - oraclejdk11 + - oraclejdk8 after_success: - ./gradlew jacocoTestReport coveralls