From b464f5b517844591e93358bc007aff677efa16df Mon Sep 17 00:00:00 2001 From: dsinj Date: Sat, 8 Aug 2020 15:54:07 -0500 Subject: [PATCH 01/18] Hw5 --- src/main/java/hw5/Hw5.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/java/hw5/Hw5.java diff --git a/src/main/java/hw5/Hw5.java b/src/main/java/hw5/Hw5.java new file mode 100644 index 0000000..657ea15 --- /dev/null +++ b/src/main/java/hw5/Hw5.java @@ -0,0 +1,8 @@ +package hw5; + +public class Hw5 { + public static void main(String[] args) { + System.out.println("It's HW5"); + + } +} From 7a4c672f205c1f60aca3ce0b9a01ebc334fca47f Mon Sep 17 00:00:00 2001 From: dsinj Date: Sun, 9 Aug 2020 13:28:18 -0500 Subject: [PATCH 02/18] Hw6 --- src/main/java/hw6/HW6.java | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/main/java/hw6/HW6.java diff --git a/src/main/java/hw6/HW6.java b/src/main/java/hw6/HW6.java new file mode 100644 index 0000000..52331b9 --- /dev/null +++ b/src/main/java/hw6/HW6.java @@ -0,0 +1,46 @@ +package hw6; + +public class HW6 { + + + public static void main(String[]args){ + int xx = sum_of_two_numbers(7,8); + + numbers(); + + System.out.println(xx); + + int[] arr = {1,4,6,9,10,17,20,44,55}; + + for (int v: arr){ + if (isEven(v)){ + System.out.println(v); + } + + } + + } + + public static void numbers(){ + System.out.println("7"); + System.out.println("8"); + } + + public static int sum_of_two_numbers(int a, int b) { + int result = (a+b); + return result; + + + + + } + + public static boolean isEven(int number){ + if(number%2==1){ + return true; + } else { + return false; + } + } + +} From 605e5823a76de3ca99ba2d07e45322a5bedcdb8e Mon Sep 17 00:00:00 2001 From: dsinj Date: Wed, 12 Aug 2020 18:13:00 -0500 Subject: [PATCH 03/18] Hw4 --- src/main/java/hw4/HW4.java | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/main/java/hw4/HW4.java diff --git a/src/main/java/hw4/HW4.java b/src/main/java/hw4/HW4.java new file mode 100644 index 0000000..fd09f8a --- /dev/null +++ b/src/main/java/hw4/HW4.java @@ -0,0 +1,59 @@ +package hw4; + +public class HW4 { + + public static void main(String[] args) { + + // int[] numbers = {2, 76, 9, 90, 31, 76, 6, 88, 21, 12}; + +// for (int v:numbers) { +// System.out.println(v); +// } +// +// for (int i=0;i max) { +// max = v; +// +// } +// } +// System.out.println(max); + +// int min = numbers[9]; +// for (int v : numbers) { +// if (v < min) { +// min = v; +// +// } +// } +// System.out.println(min); + + int[] numbers = {10,15,12,7,88,10,6,17,23,10,10,16}; + + for(int v:numbers){ + if(v==10){ + System.out.println(v); + } + } + } +} + + + + From 8f169d5ec2bb50d971a9c65315ae6f60c974220f Mon Sep 17 00:00:00 2001 From: dsinj Date: Thu, 13 Aug 2020 13:20:26 -0500 Subject: [PATCH 04/18] Hw7 --- src/main/java/hw7/Hw7.java | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/main/java/hw7/Hw7.java diff --git a/src/main/java/hw7/Hw7.java b/src/main/java/hw7/Hw7.java new file mode 100644 index 0000000..6490e8b --- /dev/null +++ b/src/main/java/hw7/Hw7.java @@ -0,0 +1,53 @@ +package hw7; + +public class Hw7 { + public static void main(String[] args) { + int[] a1 = {2, 3, 5, 6, 7, 8}; + System.out.println(sumOfArray(a1)); + + int[] a2 = {3,9,1,8,4,8,5}; + System.out.println(a2[i]); + + int[] a3 = {3,9,1,8,4,8,5}; + System.out.println(max(a3)); + + + + + } + + public static int sumOfArray(int[] arr) { + int sum = 0; + for (int v : arr) { + sum += v; + } + return sum; + + } + public static int sort(int[] arr){ + for(int i=0; i>a2.lengh; i++){ + + } + public static int max(int[]xx){ + int max = xx[0]; + for (int v : xx) { + if(v>max){ + max=v; + } + } + return max; + + + } + + } +} + + + + + + + + + From e96f40443531241754892b24aa7beca4b37f0422 Mon Sep 17 00:00:00 2001 From: dsinj Date: Fri, 14 Aug 2020 12:49:22 -0500 Subject: [PATCH 05/18] hw8 --- src/main/java/hw7/Hw7.java | 30 ++++++++++++++-------------- src/main/java/hw8/Names.java | 10 ++++++++++ src/main/java/hw8/TypesOfWeight.java | 10 ++++++++++ src/main/java/hw8/hw8.java | 27 +++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 src/main/java/hw8/Names.java create mode 100644 src/main/java/hw8/TypesOfWeight.java create mode 100644 src/main/java/hw8/hw8.java diff --git a/src/main/java/hw7/Hw7.java b/src/main/java/hw7/Hw7.java index 6490e8b..3feb465 100644 --- a/src/main/java/hw7/Hw7.java +++ b/src/main/java/hw7/Hw7.java @@ -1,33 +1,36 @@ package hw7; +import java.sql.SQLOutput; +import java.util.Arrays; + public class Hw7 { public static void main(String[] args) { - int[] a1 = {2, 3, 5, 6, 7, 8}; - System.out.println(sumOfArray(a1)); + int[] arr = {2, 3, 5, 6, 7, 8}; + System.out.println("Sum "); + System.out.println(sumOfArray(arr)); - int[] a2 = {3,9,1,8,4,8,5}; - System.out.println(a2[i]); + System.out.println("Sort "); + sort(arr); int[] a3 = {3,9,1,8,4,8,5}; + System.out.println("Max "); System.out.println(max(a3)); - - - - } - public static int sumOfArray(int[] arr) { int sum = 0; for (int v : arr) { sum += v; } return sum; + } + public static void sort(int[] arr) { + Arrays.sort(arr); + for(int v: arr){ + System.out.println(v); + } } - public static int sort(int[] arr){ - for(int i=0; i>a2.lengh; i++){ - } public static int max(int[]xx){ int max = xx[0]; for (int v : xx) { @@ -36,12 +39,9 @@ public static int max(int[]xx){ } } return max; - - } } -} diff --git a/src/main/java/hw8/Names.java b/src/main/java/hw8/Names.java new file mode 100644 index 0000000..663ba9e --- /dev/null +++ b/src/main/java/hw8/Names.java @@ -0,0 +1,10 @@ +package hw8; + +public enum Names { + JECK, + JHON, + MARK, + ALISSIA, + JANE, + PITER +} diff --git a/src/main/java/hw8/TypesOfWeight.java b/src/main/java/hw8/TypesOfWeight.java new file mode 100644 index 0000000..57af1eb --- /dev/null +++ b/src/main/java/hw8/TypesOfWeight.java @@ -0,0 +1,10 @@ +package hw8; + +public enum TypesOfWeight { + GRAM, + ML, + KG, + TON, + OZ, + LB +} diff --git a/src/main/java/hw8/hw8.java b/src/main/java/hw8/hw8.java new file mode 100644 index 0000000..ae2a90e --- /dev/null +++ b/src/main/java/hw8/hw8.java @@ -0,0 +1,27 @@ +package hw8; + +import java.sql.Types; +import java.util.Arrays; + +public class hw8 { + public static void main(String[] args) { + Names nam = Names.ALISSIA; + Names nam1 = Names.JECK; + System.out.println(nam+" + "+nam1+" = Forever :)"); + + + TypesOfWeight type = TypesOfWeight.KG; + TypesOfWeight type1 = TypesOfWeight.LB; + TypesOfWeight type2 = TypesOfWeight.OZ; + System.out.println(type+" European"+" Metric"); + System.out.println(type1+" USA"); + System.out.println(type2+" USA"); + + TypesOfWeight[] arr = {TypesOfWeight.GRAM, TypesOfWeight.KG, TypesOfWeight.ML, TypesOfWeight.TON}; + System.out.println(Arrays.toString(arr)); + + + + + } +} From a6c06507981d3090f36eed75f92ab115a1abf680 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sun, 16 Aug 2020 11:14:23 -0500 Subject: [PATCH 06/18] hw9 --- src/main/java/hw9/Beer.java | 20 +++++++++++++ src/main/java/hw9/Bike.java | 23 ++++++++++++++ src/main/java/hw9/Company.java | 21 +++++++++++++ src/main/java/hw9/Hw9.java | 55 ++++++++++++++++++++++++++++++++++ src/main/java/hw9/Type.java | 13 ++++++++ 5 files changed, 132 insertions(+) create mode 100644 src/main/java/hw9/Beer.java create mode 100644 src/main/java/hw9/Bike.java create mode 100644 src/main/java/hw9/Company.java create mode 100644 src/main/java/hw9/Hw9.java create mode 100644 src/main/java/hw9/Type.java diff --git a/src/main/java/hw9/Beer.java b/src/main/java/hw9/Beer.java new file mode 100644 index 0000000..fe1a92f --- /dev/null +++ b/src/main/java/hw9/Beer.java @@ -0,0 +1,20 @@ +package hw9; + +public class Beer { + public String name; + public String company; + public int age; + public Type type; + + + public void PrintBeerInfo(){ + System.out.println("Brand "+name); + System.out.println("Brewery "+company); + System.out.println("Reserved "+age+" years"); + System.out.println("Type "+type); + + } + public void LoveBeer(){ + System.out.println("I love to drink "+name+" "+type+" reserved for "+age+" years in cold weather!!!"); + } +} diff --git a/src/main/java/hw9/Bike.java b/src/main/java/hw9/Bike.java new file mode 100644 index 0000000..5100391 --- /dev/null +++ b/src/main/java/hw9/Bike.java @@ -0,0 +1,23 @@ +package hw9; + +public class Bike { + public String brand; + public String model; + public int year; + public String type; + public String color; + + + public void PrintBikeInfo(){ + System.out.println(brand+" "+model+" "+year+" "+type+" "+color); + + } + + public void drive(){ + System.out.println("My Bike "+brand+" model "+model+" of "+year+" needs "+type ); + + } + + + +} diff --git a/src/main/java/hw9/Company.java b/src/main/java/hw9/Company.java new file mode 100644 index 0000000..433e323 --- /dev/null +++ b/src/main/java/hw9/Company.java @@ -0,0 +1,21 @@ +package hw9; + +public class Company { + public String name; + public int year; + public String founder; + public int emploees; + public String adress; + + + public void printCompanyInfo(){ + System.out.println("Company name is "+name); + System.out.println("Main adress is " +adress); + System.out.println("Number of employees "+emploees); + System.out.println("Founded by "+founder+" in "+year); + + + } + + +} diff --git a/src/main/java/hw9/Hw9.java b/src/main/java/hw9/Hw9.java new file mode 100644 index 0000000..268158b --- /dev/null +++ b/src/main/java/hw9/Hw9.java @@ -0,0 +1,55 @@ +package hw9; + +public class Hw9 { + public static void main(String[] args) { + + Company N1 = new Company(); + N1.name = "Google"; + N1.year = 1998; + N1.founder = "Larry Page"; + N1.emploees = 114000; + N1.adress = "Menlo Park, CA"; + + N1.printCompanyInfo(); + + System.out.println("=================================="); + + + Company N2 = new Company(); + N2.name = "Netflix"; + N2.year = 1997; + N2.founder = " Reed Hastings and Marc Randolph"; + N2.emploees = 90000; + N2.adress = "Scotts Valey, CA"; + + N2.printCompanyInfo(); + + System.out.println("====================================="); + + Bike Superbike = new Bike(); + Superbike.brand = "Harley Davidson"; + Superbike.model = "Street 500"; + Superbike.color = "Black"; + Superbike.type = "Gas"; + Superbike.year = 2019; + + Superbike.PrintBikeInfo(); + System.out.println("-------------------------------------"); + Superbike.drive(); + System.out.println("====================================="); + + + Beer MyBeer = new Beer(); + MyBeer.company = "Chimay Premiere"; + MyBeer.name = "CHIMAY Grand Reserve"; + MyBeer.type = Type.ALE; + MyBeer.age = 5; + + MyBeer.PrintBeerInfo(); + System.out.println("----------------------------------------"); + MyBeer.LoveBeer(); + + } + + } + diff --git a/src/main/java/hw9/Type.java b/src/main/java/hw9/Type.java new file mode 100644 index 0000000..1272c14 --- /dev/null +++ b/src/main/java/hw9/Type.java @@ -0,0 +1,13 @@ +package hw9; + +public enum Type { + IPA, + LAGER, + PILS, + WHEAT, + GOSE, + ALE + + + +} From fb12ea7d94b9a3e7645ae7e334bc04adb0a8e280 Mon Sep 17 00:00:00 2001 From: dsinj Date: Mon, 17 Aug 2020 08:58:59 -0500 Subject: [PATCH 07/18] hw10 --- src/main/java/hw10/Colors.java | 8 +++++ src/main/java/hw10/Genre.java | 12 ++++++++ src/main/java/hw10/Hw10.java | 54 ++++++++++++++++++++++++++++++++++ src/main/java/hw10/Market.java | 38 ++++++++++++++++++++++++ src/main/java/hw10/Movies.java | 42 ++++++++++++++++++++++++++ src/main/java/hw10/Phones.java | 41 ++++++++++++++++++++++++++ 6 files changed, 195 insertions(+) create mode 100644 src/main/java/hw10/Colors.java create mode 100644 src/main/java/hw10/Genre.java create mode 100644 src/main/java/hw10/Hw10.java create mode 100644 src/main/java/hw10/Market.java create mode 100644 src/main/java/hw10/Movies.java create mode 100644 src/main/java/hw10/Phones.java diff --git a/src/main/java/hw10/Colors.java b/src/main/java/hw10/Colors.java new file mode 100644 index 0000000..ea57fce --- /dev/null +++ b/src/main/java/hw10/Colors.java @@ -0,0 +1,8 @@ +package hw10; + +public enum Colors { + BLACK, + WHITE, + PINK, + BLUE +} diff --git a/src/main/java/hw10/Genre.java b/src/main/java/hw10/Genre.java new file mode 100644 index 0000000..374f945 --- /dev/null +++ b/src/main/java/hw10/Genre.java @@ -0,0 +1,12 @@ +package hw10; + +public enum Genre { + ACTION, + DRAMA, + HORROR, + COMEDY, + MISTIC, + EROTIC, + ROMANCE + +} diff --git a/src/main/java/hw10/Hw10.java b/src/main/java/hw10/Hw10.java new file mode 100644 index 0000000..40c4f53 --- /dev/null +++ b/src/main/java/hw10/Hw10.java @@ -0,0 +1,54 @@ +package hw10; + +public class Hw10 { + public static void main(String[] args) { + Market Walmart = new Market("Walmart", "Dobie st. WA", "USA", 10000); + Market HEB = new Market("HEB","Hills Dr.","USA",20000); + + Walmart.PrintMarketInfo(); + Walmart.setAdress("Dobie st. WA"); + Walmart.setCount(10000); + Walmart.setCountry("USA"); + Walmart.setName("Wallgreens"); + Walmart.PrintMarketInfo(); + System.out.println("-----------------------------------------------------------------------------"); + HEB.PrintMarketInfo(); + System.out.println(HEB.getCount()); + System.out.println("=============================================================================="); + + Phones Apple = new Phones("Apple","iPhone 11",2019,Colors.BLACK); + + Phones Samsung = new Phones(); + + Apple.PrintPhoneInfo(); + Samsung.setBrand("Samsung"); + System.out.println(Samsung.getBrand()); + Samsung.PrintPhoneInfo(); + System.out.println("==============================================================="); + + Movies Titanic = new Movies("Titanic",1997,200,Genre.DRAMA); + Genre[] genr = {Genre.ACTION,Genre.DRAMA,Genre.ROMANCE}; + // Titanic.setGenre(genr); + // Titanic.PrintMoviesInfo(); + + + + + + + + + + + + + + + + + + + + + } +} diff --git a/src/main/java/hw10/Market.java b/src/main/java/hw10/Market.java new file mode 100644 index 0000000..5b83d10 --- /dev/null +++ b/src/main/java/hw10/Market.java @@ -0,0 +1,38 @@ +package hw10; + +public class Market { + private String name; + private String adress; + private String country; + private int count; + + + public Market(String name, String adress, String country, int count){ + this.name = name; + this.adress = adress; + this.country = country; + this.count = count; + } + public Market(){} + + public String getName(){return name;} + public String getAdress(){return adress;} + public String getCountry(){return country;} + public int getCount(){return count;} + + public void setName(String name){this.name = name;} + public void setAdress(String adress){this.adress = adress;} + public void setCountry(String country){this.country = country;} + public void setCount(int count){this.count = count;} + public void PrintMarketInfo(){ + System.out.println(" Brand "+name+" is from "+country+" have "+count+" locations. Main adress is "+adress); + + } + + + + + + + +} diff --git a/src/main/java/hw10/Movies.java b/src/main/java/hw10/Movies.java new file mode 100644 index 0000000..73410f6 --- /dev/null +++ b/src/main/java/hw10/Movies.java @@ -0,0 +1,42 @@ +package hw10; + +public class Movies { + private String name; + private int year; + private int budget; + private Genre genre; + private Genre[] genres; + + + public Movies(){ + + } + public Movies(String name, int year, int budget, Genre genre){ + this.name = name; + this.year = year; + this.budget = budget; + this.genre = genre; + + } + public String getName(){return name;} + public int getYear(){return year;} + public int getBudget(){return budget;} + public Genre getGenre(){return genre;} + + public Genre[] getGenres() { + return genres; + } + + public void setName(String name){this.name = name;} + public void setYear(int year){this.year = year;} + public void setBudget(int budget){this.budget = budget;} +// public void setGenre(Genre[] genre){this.Genre = genre;} + public void setGenres(Genre[] genres){this.genres = genres;} + + public void PrintMoviesInfo(Class aClass){ + System.out.println(name+" is released in "+year+" and had "+budget+" million budget, genre: "+genre); + for (Genre m: this.genres); + + + } +} diff --git a/src/main/java/hw10/Phones.java b/src/main/java/hw10/Phones.java new file mode 100644 index 0000000..2d57d0b --- /dev/null +++ b/src/main/java/hw10/Phones.java @@ -0,0 +1,41 @@ +package hw10; + +import hw10.Colors; + +public class Phones { + private String brand; + private String model; + private int year; + private Colors color; + private Colors[] colors; + + public Phones(){} + public Phones(String brand, String model, int year,Colors color){ + this.brand = brand; + this.model = model; + this.year = year; + this.color = color; + + } + public String getBrand(){ return this.brand;} + public String getModel(){ return this.model;} + public int getYear(){ return this.year;} + public Colors getColor(){ return this.color;} + public Colors[] getcolors(){ return colors;} + + public void setColors(Colors[] colors){ + this.colors = colors; } + + + public void setBrand(String brand){this.brand = brand;} + public void setModel(String model){this.model = model;} + public void setYear(int year){this.year = year;} + public void setColor(Colors color){this.color = color;} + public void PrintPhoneInfo(){ + System.out.println("My "+brand+" "+model+" is produced in "+year+" "); + for(Colors p: this.colors); + } + + + +} From d56bff974080c16da4ed029159226fc2d2101007 Mon Sep 17 00:00:00 2001 From: dsinj Date: Thu, 20 Aug 2020 10:06:07 -0500 Subject: [PATCH 08/18] hw11 --- src/main/java/hw10/Hw10.java | 6 ++- src/main/java/hw10/Phones.java | 69 ++++++++++++++++++++++++-------- src/main/java/hw11/Bicycle.java | 19 +++++++++ src/main/java/hw11/Car.java | 23 +++++++++++ src/main/java/hw11/Colors.java | 9 +++++ src/main/java/hw11/FuelType.java | 9 +++++ src/main/java/hw11/Hw11.java | 25 ++++++++++++ src/main/java/hw11/Plane.java | 19 +++++++++ src/main/java/hw11/Vehicle.java | 46 +++++++++++++++++++++ 9 files changed, 207 insertions(+), 18 deletions(-) create mode 100644 src/main/java/hw11/Bicycle.java create mode 100644 src/main/java/hw11/Car.java create mode 100644 src/main/java/hw11/Colors.java create mode 100644 src/main/java/hw11/FuelType.java create mode 100644 src/main/java/hw11/Hw11.java create mode 100644 src/main/java/hw11/Plane.java create mode 100644 src/main/java/hw11/Vehicle.java diff --git a/src/main/java/hw10/Hw10.java b/src/main/java/hw10/Hw10.java index 40c4f53..5e4d1f5 100644 --- a/src/main/java/hw10/Hw10.java +++ b/src/main/java/hw10/Hw10.java @@ -21,9 +21,11 @@ public static void main(String[] args) { Phones Samsung = new Phones(); Apple.PrintPhoneInfo(); + System.out.println("Samsung"); Samsung.setBrand("Samsung"); - System.out.println(Samsung.getBrand()); - Samsung.PrintPhoneInfo(); + Colors[] col = {Colors.BLACK,Colors.BLUE,Colors.PINK,Colors.WHITE}; + Samsung.setColors(col); + Samsung.printColors(col); System.out.println("==============================================================="); Movies Titanic = new Movies("Titanic",1997,200,Genre.DRAMA); diff --git a/src/main/java/hw10/Phones.java b/src/main/java/hw10/Phones.java index 2d57d0b..f4fcdae 100644 --- a/src/main/java/hw10/Phones.java +++ b/src/main/java/hw10/Phones.java @@ -9,33 +9,70 @@ public class Phones { private Colors color; private Colors[] colors; - public Phones(){} - public Phones(String brand, String model, int year,Colors color){ + public Phones() { + } + + public Phones(String brand, String model, int year, Colors color) { this.brand = brand; this.model = model; this.year = year; this.color = color; } - public String getBrand(){ return this.brand;} - public String getModel(){ return this.model;} - public int getYear(){ return this.year;} - public Colors getColor(){ return this.color;} - public Colors[] getcolors(){ return colors;} - public void setColors(Colors[] colors){ - this.colors = colors; } + public String getBrand() { + return this.brand; + } + + public String getModel() { + return this.model; + } + public int getYear() { + return this.year; + } - public void setBrand(String brand){this.brand = brand;} - public void setModel(String model){this.model = model;} - public void setYear(int year){this.year = year;} - public void setColor(Colors color){this.color = color;} - public void PrintPhoneInfo(){ - System.out.println("My "+brand+" "+model+" is produced in "+year+" "); - for(Colors p: this.colors); + public Colors getColor() { + return this.color; } + public Colors[] getcolors() { + return colors; + } + public void setColors(Colors[] colors) { + this.colors = colors; + } + + + public void setBrand(String brand) { + this.brand = brand; + } + + public void setModel(String model) { + this.model = model; + } + public void setYear(int year) { + this.year = year; + } + + public void setColor(Colors color) { + this.color = color; + } + + public void PrintPhoneInfo() { + System.out.println("My " + brand + " " + model + " is produced in " + year + " "); + + } + + public void printColors(Colors[] colors) { + for (Colors p : colors) { + System.out.println(p); + } + } } + + + + diff --git a/src/main/java/hw11/Bicycle.java b/src/main/java/hw11/Bicycle.java new file mode 100644 index 0000000..95c3d0c --- /dev/null +++ b/src/main/java/hw11/Bicycle.java @@ -0,0 +1,19 @@ +package hw11; + +import java.util.Arrays; + +public class Bicycle extends Plane{ + + public Bicycle(String brand, String name, int year,FuelType fuel) { + super(brand, name, year, fuel); + } + + @Override + public String toString() { + return "Bicycle{" + + "brand='" + brand + '\'' + + ", name='" + name + '\'' + + ", year=" + year + + '}'; + } +} diff --git a/src/main/java/hw11/Car.java b/src/main/java/hw11/Car.java new file mode 100644 index 0000000..0bfbfea --- /dev/null +++ b/src/main/java/hw11/Car.java @@ -0,0 +1,23 @@ +package hw11; + +import java.util.Arrays; + +public class Car extends Vehicle{ + private FuelType fuel; + + public Car(String brand, String name, int year, FuelType fuel) { + super(brand, name, year); + this.fuel = fuel; + + } + + @Override + public String toString() { + return "Car{" + + "fuel=" + fuel + + ", brand='" + brand + '\'' + + ", name='" + name + '\'' + + ", year=" + year + + '}'; + } +} diff --git a/src/main/java/hw11/Colors.java b/src/main/java/hw11/Colors.java new file mode 100644 index 0000000..99ad3b3 --- /dev/null +++ b/src/main/java/hw11/Colors.java @@ -0,0 +1,9 @@ +package hw11; + +public enum Colors { + WHITE, + BLACK, + YELLOW, + BLUE, + RED +} diff --git a/src/main/java/hw11/FuelType.java b/src/main/java/hw11/FuelType.java new file mode 100644 index 0000000..33e5837 --- /dev/null +++ b/src/main/java/hw11/FuelType.java @@ -0,0 +1,9 @@ +package hw11; + +public enum FuelType { + GAS, + DIESEL, + AIR, + ELECTRIC, + HYBRID +} diff --git a/src/main/java/hw11/Hw11.java b/src/main/java/hw11/Hw11.java new file mode 100644 index 0000000..fa12102 --- /dev/null +++ b/src/main/java/hw11/Hw11.java @@ -0,0 +1,25 @@ +package hw11; + +public class Hw11 { + + public static void main(String[] args) { + Vehicle GeneralVehicle = new Car("GMC","Sierra",2020,FuelType.GAS); + GeneralVehicle.setYear(2019); + System.out.println(GeneralVehicle); + + Vehicle Audi = new Car("Audi", "S5", 2018,FuelType.HYBRID); + System.out.println(Audi); + + System.out.println("==========================================================="); + + Vehicle Airbus = new Plane("Airbus","425",2015,FuelType.GAS); + System.out.println(Airbus); + + System.out.println("=============================================================="); + + Vehicle Bike = new Bicycle("Strinx","Equinox",2020,FuelType.ELECTRIC); + System.out.println(Bike); + + } + +} diff --git a/src/main/java/hw11/Plane.java b/src/main/java/hw11/Plane.java new file mode 100644 index 0000000..6923f61 --- /dev/null +++ b/src/main/java/hw11/Plane.java @@ -0,0 +1,19 @@ +package hw11; + +import java.util.Arrays; + +public class Plane extends Car{ + + public Plane(String brand, String name, int year, FuelType fuel) { + super(brand, name, year, fuel); + } + + @Override + public String toString() { + return "Plane{" + + "brand='" + brand + '\'' + + ", name='" + name + '\'' + + ", year=" + year + + '}'; + } +} diff --git a/src/main/java/hw11/Vehicle.java b/src/main/java/hw11/Vehicle.java new file mode 100644 index 0000000..1d9f545 --- /dev/null +++ b/src/main/java/hw11/Vehicle.java @@ -0,0 +1,46 @@ +package hw11; + +import java.util.Arrays; + +public class Vehicle { + protected String brand; + protected String name; + protected int year; + + + public Vehicle(String brand, String name, int year){ + this.brand = brand; + this.name = name; + this.year = year; + + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + + + + +} From a152cecb505e8fef3d4174175f7594a3f6703057 Mon Sep 17 00:00:00 2001 From: dsinj Date: Fri, 21 Aug 2020 12:47:28 -0500 Subject: [PATCH 09/18] hw11 --- src/main/java/hw11/Bicycle.java | 10 ++++---- src/main/java/hw11/Car.java | 42 ++++++++++++++++++++++++++++----- src/main/java/hw11/Hw11.java | 20 +++++++--------- src/main/java/hw11/Plane.java | 13 ++++++---- src/main/java/hw11/Vehicle.java | 17 +++++++++---- 5 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/main/java/hw11/Bicycle.java b/src/main/java/hw11/Bicycle.java index 95c3d0c..a24ce03 100644 --- a/src/main/java/hw11/Bicycle.java +++ b/src/main/java/hw11/Bicycle.java @@ -10,10 +10,10 @@ public Bicycle(String brand, String name, int year,FuelType fuel) { @Override public String toString() { - return "Bicycle{" + - "brand='" + brand + '\'' + - ", name='" + name + '\'' + - ", year=" + year + - '}'; + return "Bicycle: " + + "\nbrand='" + brand + '\'' + + "\nname='" + name + '\'' + + "\nyear=" + year + + "\n**********************************"; } } diff --git a/src/main/java/hw11/Car.java b/src/main/java/hw11/Car.java index 0bfbfea..f5bb9cc 100644 --- a/src/main/java/hw11/Car.java +++ b/src/main/java/hw11/Car.java @@ -4,20 +4,50 @@ public class Car extends Vehicle{ private FuelType fuel; + private Colors[] colors; public Car(String brand, String name, int year, FuelType fuel) { super(brand, name, year); this.fuel = fuel; } + public Car(String gmc, String sierra, int i, FuelType fuel, Colors colors){ + setBrand("Audi"); + setName("S5"); + setYear(2020); + setFuelType(FuelType.HYBRID); + setColors(getColors()); + } + public void setFuelType(FuelType fuel){ + this.fuel = fuel; + } + public Car(){} + + + public FuelType getFuel() { + return fuel; + } + + public void setFuel(FuelType fuel) { + this.fuel = fuel; + } + + public Colors[] getColors() { + return colors; + } + + public void setColors(Colors[] colors) { + this.colors = colors; + } @Override public String toString() { - return "Car{" + - "fuel=" + fuel + - ", brand='" + brand + '\'' + - ", name='" + name + '\'' + - ", year=" + year + - '}'; + return "Car" + + "\nfuel=" + fuel + + "\ncolors=" + Arrays.toString(colors) + + "\nbrand='" + brand + '\'' + + "\nname='" + name + '\'' + + "\nyear=" + year + + "\n****************************************"; } } diff --git a/src/main/java/hw11/Hw11.java b/src/main/java/hw11/Hw11.java index fa12102..139655f 100644 --- a/src/main/java/hw11/Hw11.java +++ b/src/main/java/hw11/Hw11.java @@ -3,22 +3,20 @@ public class Hw11 { public static void main(String[] args) { - Vehicle GeneralVehicle = new Car("GMC","Sierra",2020,FuelType.GAS); - GeneralVehicle.setYear(2019); - System.out.println(GeneralVehicle); - Vehicle Audi = new Car("Audi", "S5", 2018,FuelType.HYBRID); - System.out.println(Audi); - System.out.println("==========================================================="); + Colors[] colors = {Colors.WHITE,Colors.BLACK,Colors.RED,Colors.YELLOW,Colors.BLUE}; - Vehicle Airbus = new Plane("Airbus","425",2015,FuelType.GAS); - System.out.println(Airbus); + Car Audi = new Car("Audi", "S5", 2018,FuelType.HYBRID,Colors.BLUE); + Audi.getColors(); + System.out.println(Audi.toString()); - System.out.println("=============================================================="); + Plane Airbus = new Plane("Airbus","425",2015,FuelType.GAS); + System.out.println(Airbus.toString()); - Vehicle Bike = new Bicycle("Strinx","Equinox",2020,FuelType.ELECTRIC); - System.out.println(Bike); + + Bicycle Bike = new Bicycle("Strinx","Equinox",2020,FuelType.ELECTRIC); + System.out.println(Bike.toString()); } diff --git a/src/main/java/hw11/Plane.java b/src/main/java/hw11/Plane.java index 6923f61..7cb0b55 100644 --- a/src/main/java/hw11/Plane.java +++ b/src/main/java/hw11/Plane.java @@ -7,13 +7,16 @@ public class Plane extends Car{ public Plane(String brand, String name, int year, FuelType fuel) { super(brand, name, year, fuel); } + public Plane(){} + + @Override public String toString() { - return "Plane{" + - "brand='" + brand + '\'' + - ", name='" + name + '\'' + - ", year=" + year + - '}'; + return "Plane" + + "\nbrand='" + brand + '\'' + + "\nname='" + name + '\'' + + "\nyear=" + year + + "\n*********************************"; } } diff --git a/src/main/java/hw11/Vehicle.java b/src/main/java/hw11/Vehicle.java index 1d9f545..4354eff 100644 --- a/src/main/java/hw11/Vehicle.java +++ b/src/main/java/hw11/Vehicle.java @@ -2,7 +2,7 @@ import java.util.Arrays; -public class Vehicle { +abstract class Vehicle { protected String brand; protected String name; protected int year; @@ -13,6 +13,9 @@ public Vehicle(String brand, String name, int year){ this.name = name; this.year = year; + } + public Vehicle(){ + } public String getBrand() { @@ -39,8 +42,12 @@ public void setYear(int year) { this.year = year; } - - - - + @Override + public String toString() { + return "Vehicle" + + "\nbrand='" + brand + '\'' + + "\nname='" + name + '\'' + + "\nyear=" + year + + "\n********************************"; + } } From 6d7e36be56a78e997e12d911a08cbb776a52c838 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sat, 22 Aug 2020 12:35:31 -0500 Subject: [PATCH 10/18] hw12 --- src/main/java/hw11/Bicycle.java | 22 ++++++++++--- src/main/java/hw11/Car.java | 30 ++++++++++++----- src/main/java/hw11/Hw11.java | 22 +++++++++++-- src/main/java/hw11/Plane.java | 24 +++++++++++--- .../java/hw12/AmericanWeightStandard.java | 6 ++++ .../java/hw12/EuropeanWeightStandard.java | 6 ++++ src/main/java/hw12/Fruit.java | 32 +++++++++++++++++++ src/main/java/hw12/Hw12.java | 18 +++++++++++ src/main/java/hw12/Vegetable.java | 31 ++++++++++++++++++ 9 files changed, 171 insertions(+), 20 deletions(-) create mode 100644 src/main/java/hw12/AmericanWeightStandard.java create mode 100644 src/main/java/hw12/EuropeanWeightStandard.java create mode 100644 src/main/java/hw12/Fruit.java create mode 100644 src/main/java/hw12/Hw12.java create mode 100644 src/main/java/hw12/Vegetable.java diff --git a/src/main/java/hw11/Bicycle.java b/src/main/java/hw11/Bicycle.java index a24ce03..e938cad 100644 --- a/src/main/java/hw11/Bicycle.java +++ b/src/main/java/hw11/Bicycle.java @@ -3,17 +3,31 @@ import java.util.Arrays; public class Bicycle extends Plane{ + private String bike; - public Bicycle(String brand, String name, int year,FuelType fuel) { - super(brand, name, year, fuel); + public Bicycle(){} + + + public Bicycle(String brand, String name, int year, FuelType fuel, Colors[] colors, String fly,String bike) { + super(brand, name, year, fuel, colors); + this.bike = bike; + } + + public String getBike() { + return bike; + } + + public void setBike(String bike) { + this.bike = bike; } @Override public String toString() { - return "Bicycle: " + + return "Bicycle" + + "\nbike='" + bike + '\'' + "\nbrand='" + brand + '\'' + "\nname='" + name + '\'' + "\nyear=" + year + - "\n**********************************"; + "\n************************************"; } } diff --git a/src/main/java/hw11/Car.java b/src/main/java/hw11/Car.java index f5bb9cc..08943b8 100644 --- a/src/main/java/hw11/Car.java +++ b/src/main/java/hw11/Car.java @@ -3,26 +3,38 @@ import java.util.Arrays; public class Car extends Vehicle{ + private Colors color; private FuelType fuel; private Colors[] colors; + + public Car(){} + public Car(String brand, String name, int year, FuelType fuel) { super(brand, name, year); this.fuel = fuel; } - public Car(String gmc, String sierra, int i, FuelType fuel, Colors colors){ - setBrand("Audi"); - setName("S5"); - setYear(2020); - setFuelType(FuelType.HYBRID); - setColors(getColors()); + public Car(String brand, String name, int year, FuelType fuel, Colors[] colors){ + super(brand, name, year); + this.fuel = fuel; + this.colors = colors; } + public Car(FuelType fuel, Colors[] colors){ + this.fuel = fuel; + this.colors = colors; + + } +// public Car(String gmc, String sierra, int i, FuelType fuel, Colors colors){ +// setBrand("Audi"); +// setName("S5"); +// setYear(2020); +// setFuelType(FuelType.HYBRID); +// setColors(getColors()); +// } public void setFuelType(FuelType fuel){ this.fuel = fuel; } - public Car(){} - public FuelType getFuel() { return fuel; @@ -32,6 +44,8 @@ public void setFuel(FuelType fuel) { this.fuel = fuel; } + public void setColor(Colors color){ this.color = color;} + public Colors[] getColors() { return colors; } diff --git a/src/main/java/hw11/Hw11.java b/src/main/java/hw11/Hw11.java index 139655f..559d87e 100644 --- a/src/main/java/hw11/Hw11.java +++ b/src/main/java/hw11/Hw11.java @@ -1,5 +1,7 @@ package hw11; +import java.awt.*; + public class Hw11 { public static void main(String[] args) { @@ -7,15 +9,29 @@ public static void main(String[] args) { Colors[] colors = {Colors.WHITE,Colors.BLACK,Colors.RED,Colors.YELLOW,Colors.BLUE}; - Car Audi = new Car("Audi", "S5", 2018,FuelType.HYBRID,Colors.BLUE); + Car Audi = new Car("Audi", "S5", 2018,FuelType.HYBRID, colors); Audi.getColors(); System.out.println(Audi.toString()); - Plane Airbus = new Plane("Airbus","425",2015,FuelType.GAS); + Car GMC = new Car(); + GMC.setBrand("GMC"); + GMC.setName("Sierra"); + GMC.setFuelType(FuelType.GAS); + GMC.setColor(Colors.BLACK); + System.out.println(GMC.toString()); + + Plane Airbus = new Plane("Airbus","425",2020,FuelType.DIESEL,colors,"Can fly"); + Airbus.getBrand(); + Airbus.getName(); + Airbus.getYear(); + Airbus.getFuel(); + Airbus.getColors(); + Airbus.getFly(); System.out.println(Airbus.toString()); - Bicycle Bike = new Bicycle("Strinx","Equinox",2020,FuelType.ELECTRIC); + Bicycle Bike = new Bicycle("Strinx","Equinox",2020,FuelType.ELECTRIC,colors,"",""); + Bike.setBike("Has 2 weels"); System.out.println(Bike.toString()); } diff --git a/src/main/java/hw11/Plane.java b/src/main/java/hw11/Plane.java index 7cb0b55..13cdd77 100644 --- a/src/main/java/hw11/Plane.java +++ b/src/main/java/hw11/Plane.java @@ -3,20 +3,34 @@ import java.util.Arrays; public class Plane extends Car{ + private String fly; - public Plane(String brand, String name, int year, FuelType fuel) { - super(brand, name, year, fuel); - } public Plane(){} + public Plane(String brand, String name, int year, FuelType fuel, Colors[] colors){} + + public Plane(String brand, String name, int year, FuelType fuel, Colors[] colors, String fly) { + super(brand, name, year, fuel, colors); + this.fly = fly; + } + + public Plane(String brand, String name, int year, FuelType fuel){} + public String getFly() { + return fly; + } + + public void setFly(String fly) { + this.fly = fly; + } @Override public String toString() { - return "Plane" + + return "Plane " + + "\nfly='" + fly + '\'' + "\nbrand='" + brand + '\'' + "\nname='" + name + '\'' + "\nyear=" + year + - "\n*********************************"; + "\n********************************"; } } diff --git a/src/main/java/hw12/AmericanWeightStandard.java b/src/main/java/hw12/AmericanWeightStandard.java new file mode 100644 index 0000000..67ac512 --- /dev/null +++ b/src/main/java/hw12/AmericanWeightStandard.java @@ -0,0 +1,6 @@ +package hw12; + +public interface AmericanWeightStandard { + void lb(); + void oz(); +} diff --git a/src/main/java/hw12/EuropeanWeightStandard.java b/src/main/java/hw12/EuropeanWeightStandard.java new file mode 100644 index 0000000..9cded9a --- /dev/null +++ b/src/main/java/hw12/EuropeanWeightStandard.java @@ -0,0 +1,6 @@ +package hw12; + +public interface EuropeanWeightStandard { + void kg(); + void gr(); +} diff --git a/src/main/java/hw12/Fruit.java b/src/main/java/hw12/Fruit.java new file mode 100644 index 0000000..5e45cd8 --- /dev/null +++ b/src/main/java/hw12/Fruit.java @@ -0,0 +1,32 @@ +package hw12; + +public class Fruit implements AmericanWeightStandard{ + private String name; + private int weight; + + public Fruit(String name, int weight) { + this.name = name; + this.weight = weight; + } + public void YouCanEat(){ + System.out.println("It's healthy fruit"); + } + + public void lb() { + System.out.println("1 pound = 0.453592 kg"); + + } + + public void oz() { + System.out.println("1 ounce = 28.3495 grams"); + + } + + @Override + public String toString() { + return "Fruit" + + "\nname='" + name + '\'' + + "\nweight=" + weight + + "\n**********************************"; + } +} diff --git a/src/main/java/hw12/Hw12.java b/src/main/java/hw12/Hw12.java new file mode 100644 index 0000000..9e42d4c --- /dev/null +++ b/src/main/java/hw12/Hw12.java @@ -0,0 +1,18 @@ +package hw12; + +public class Hw12 { + public static void main(String[] args) { + Fruit Banana = new Fruit("Banana",1); + Banana.lb(); + Banana.oz(); + Banana.YouCanEat(); + + + Vegetable Cucumber = new Vegetable("Cucumber",14); + Cucumber.kg(); + Cucumber.gr(); + Cucumber.CanCook(); + + } + +} diff --git a/src/main/java/hw12/Vegetable.java b/src/main/java/hw12/Vegetable.java new file mode 100644 index 0000000..3ea2058 --- /dev/null +++ b/src/main/java/hw12/Vegetable.java @@ -0,0 +1,31 @@ +package hw12; + +public class Vegetable implements EuropeanWeightStandard{ + private String name; + private int weight; + + public Vegetable(String name, int weight) { + this.name = name; + this.weight = weight; + } + public void CanCook(){ + System.out.println("You will get delicious meal"); + } + + public void kg() { + System.out.println("EU Standard"); + + } + public void gr() { + System.out.println("EU Type"); + + } + + @Override + public String toString() { + return "Vegetable" + + "\nname='" + name + '\'' + + "\nweight=" + weight + + "\n***************************"; + } +} From 6375b85e15e0fb403f13dfd18030fe7df1e55215 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sat, 22 Aug 2020 19:04:28 -0500 Subject: [PATCH 11/18] hw13 --- src/main/java/hw13/ForHash.java | 38 +++++++++++++++++++++++++++++ src/main/java/hw13/House.java | 36 +++++++++++++++++++++++++++ src/main/java/hw13/Hw13.java | 43 +++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 src/main/java/hw13/ForHash.java create mode 100644 src/main/java/hw13/House.java create mode 100644 src/main/java/hw13/Hw13.java diff --git a/src/main/java/hw13/ForHash.java b/src/main/java/hw13/ForHash.java new file mode 100644 index 0000000..f9f04db --- /dev/null +++ b/src/main/java/hw13/ForHash.java @@ -0,0 +1,38 @@ +package hw13; + +import lesson14.Person; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ForHash { + public static void main(String[] args) { + HashMap colors = new HashMap<>(); + colors.put("Blue",1); + colors.put("Red",2); + colors.put("Black",3); + + for(String v: colors.keySet()) { + System.out.println(v); + } + + HashMap house = new HashMap<>(); + HashMap sale = new HashMap<>(); + sale.put("H1", new House("Dallas",400000)); + sale.put("H2", new House("Chicago",800000)); + sale.put("H3", new House("Atlanta",400000)); + + for (String h: sale.keySet()){ + System.out.println(h); + } + for (Map.Entry set: sale.entrySet()){ + System.out.println(set.getKey()); + System.out.println(set.getValue()); + } + + + + + } +} diff --git a/src/main/java/hw13/House.java b/src/main/java/hw13/House.java new file mode 100644 index 0000000..cec7d95 --- /dev/null +++ b/src/main/java/hw13/House.java @@ -0,0 +1,36 @@ +package hw13; + +public class House { + private String city; + private int price; + + public House(String city,int price) { + this.city = city; + this.price = price; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; + } + + @Override + public String toString() { + return "House" + + "\ncity ='" + city + '\'' + + "\nprice = " + price + + "\n***************************************"; + } +} diff --git a/src/main/java/hw13/Hw13.java b/src/main/java/hw13/Hw13.java new file mode 100644 index 0000000..cf92b33 --- /dev/null +++ b/src/main/java/hw13/Hw13.java @@ -0,0 +1,43 @@ +package hw13; + +import java.util.ArrayList; + +public class Hw13 { + public static void main(String[] args) { + ArrayList car = new ArrayList<>(); + car.add("Audi"); + car.add("Mercedes"); + car.add("BMW"); + car.add("GMC"); + car.add("Tesla"); + + car.forEach(cars-> System.out.println(car)); + System.out.println("***********************************"); + + + + ArrayList model = new ArrayList<>(); + model.add(5); + model.add(600); + model.add(750); + model.add(425); + model.add(3); + + model.forEach(carmodels-> System.out.println(model)); + System.out.println("*****************************************"); + + + ArrayList saleHouse = new ArrayList<>(); + saleHouse.add(new House("Austin",300000)); + saleHouse.add(new House("Seattle",60000)); + saleHouse.add(new House("Sacramento",700000)); + saleHouse.add(new House("Miami",500000)); + + saleHouse.forEach(city-> System.out.println(saleHouse)); + + + + + + } +} From 7ee7db53ca38ac5c83cf4673da6f3ccb9ec87975 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sun, 23 Aug 2020 15:18:25 -0500 Subject: [PATCH 12/18] hw14 --- src/main/java/hw14/Address.java | 9 ++++++++ src/main/java/hw14/Doctor.java | 37 +++++++++++++++++++++++++++++++ src/main/java/hw14/Hospital.java | 31 ++++++++++++++++++++++++++ src/main/java/hw14/Hw14.java | 17 ++++++++++++++ src/main/java/hw14/Insurance.java | 9 ++++++++ src/main/java/hw14/Position.java | 10 +++++++++ src/main/java/hw14/Rooms.java | 8 +++++++ 7 files changed, 121 insertions(+) create mode 100644 src/main/java/hw14/Address.java create mode 100644 src/main/java/hw14/Doctor.java create mode 100644 src/main/java/hw14/Hospital.java create mode 100644 src/main/java/hw14/Hw14.java create mode 100644 src/main/java/hw14/Insurance.java create mode 100644 src/main/java/hw14/Position.java create mode 100644 src/main/java/hw14/Rooms.java diff --git a/src/main/java/hw14/Address.java b/src/main/java/hw14/Address.java new file mode 100644 index 0000000..f7a652c --- /dev/null +++ b/src/main/java/hw14/Address.java @@ -0,0 +1,9 @@ +package hw14; + +public class Address { + private String streetAddress; + private String town; + private String state; + private int zip; + +} diff --git a/src/main/java/hw14/Doctor.java b/src/main/java/hw14/Doctor.java new file mode 100644 index 0000000..fa98628 --- /dev/null +++ b/src/main/java/hw14/Doctor.java @@ -0,0 +1,37 @@ +package hw14; + +public class Doctor { + private String name; + private String lastname; + private Position position; + + public Doctor(String name, String lastname, Position position) { + this.name = name; + this.lastname = lastname; + this.position = position; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public Position getPosition() { + return position; + } + + public void setPosition(Position position) { + this.position = position; + } +} diff --git a/src/main/java/hw14/Hospital.java b/src/main/java/hw14/Hospital.java new file mode 100644 index 0000000..7495d85 --- /dev/null +++ b/src/main/java/hw14/Hospital.java @@ -0,0 +1,31 @@ +package hw14; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class Hospital { + private String hospitalName; + private Address address; + + public Hospital(String hospitalName, Address address) { + this.hospitalName = hospitalName; + this.address = address; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } +} \ No newline at end of file diff --git a/src/main/java/hw14/Hw14.java b/src/main/java/hw14/Hw14.java new file mode 100644 index 0000000..22f9e0e --- /dev/null +++ b/src/main/java/hw14/Hw14.java @@ -0,0 +1,17 @@ +package hw14; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class Hw14 { + + public static void main(String[] args) { + List doctors = new ArrayList<>(); + + + + + } + +} diff --git a/src/main/java/hw14/Insurance.java b/src/main/java/hw14/Insurance.java new file mode 100644 index 0000000..2337dad --- /dev/null +++ b/src/main/java/hw14/Insurance.java @@ -0,0 +1,9 @@ +package hw14; + +public enum Insurance { + UNITED, + KAISER, + ANTHEM, + HUMANA, + CVS +} diff --git a/src/main/java/hw14/Position.java b/src/main/java/hw14/Position.java new file mode 100644 index 0000000..4e408bb --- /dev/null +++ b/src/main/java/hw14/Position.java @@ -0,0 +1,10 @@ +package hw14; + +public enum Position { + PHYSICIAN, + SURGEON, + PEDIATRIC, + CARDIOLOGIST, + DERMATOLOGIST + +} diff --git a/src/main/java/hw14/Rooms.java b/src/main/java/hw14/Rooms.java new file mode 100644 index 0000000..15129b1 --- /dev/null +++ b/src/main/java/hw14/Rooms.java @@ -0,0 +1,8 @@ +package hw14; + +import java.util.HashMap; + +public class Rooms { + private HashMap rooms = new HashMap<>(); + +} From ecf7a0d02f78ca081b3903a5dda3084bd06d31d3 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sun, 23 Aug 2020 17:16:36 -0500 Subject: [PATCH 13/18] hw13 --- src/main/java/hw13/ForHash.java | 4 ++-- src/main/java/hw13/Hw13.java | 6 +++--- src/main/java/hw14/Doctor.java | 10 ++++++++++ src/main/java/hw14/Hospital.java | 26 ++++++++++++++++++++++++++ src/main/java/hw14/Hw14.java | 18 ++++++++++++++++++ src/main/java/hw14/Rooms.java | 32 +++++++++++++++++++++++++++++++- 6 files changed, 90 insertions(+), 6 deletions(-) diff --git a/src/main/java/hw13/ForHash.java b/src/main/java/hw13/ForHash.java index f9f04db..b4bdffb 100644 --- a/src/main/java/hw13/ForHash.java +++ b/src/main/java/hw13/ForHash.java @@ -14,7 +14,7 @@ public static void main(String[] args) { colors.put("Black",3); for(String v: colors.keySet()) { - System.out.println(v); + System.out.println(v+" Colors "); } HashMap house = new HashMap<>(); @@ -24,7 +24,7 @@ public static void main(String[] args) { sale.put("H3", new House("Atlanta",400000)); for (String h: sale.keySet()){ - System.out.println(h); + System.out.println(h+" Houses "); } for (Map.Entry set: sale.entrySet()){ System.out.println(set.getKey()); diff --git a/src/main/java/hw13/Hw13.java b/src/main/java/hw13/Hw13.java index cf92b33..55d0702 100644 --- a/src/main/java/hw13/Hw13.java +++ b/src/main/java/hw13/Hw13.java @@ -11,7 +11,7 @@ public static void main(String[] args) { car.add("GMC"); car.add("Tesla"); - car.forEach(cars-> System.out.println(car)); + car.forEach(c-> System.out.println(c)); System.out.println("***********************************"); @@ -23,7 +23,7 @@ public static void main(String[] args) { model.add(425); model.add(3); - model.forEach(carmodels-> System.out.println(model)); + model.forEach(x-> System.out.println(x)); System.out.println("*****************************************"); @@ -33,7 +33,7 @@ public static void main(String[] args) { saleHouse.add(new House("Sacramento",700000)); saleHouse.add(new House("Miami",500000)); - saleHouse.forEach(city-> System.out.println(saleHouse)); + saleHouse.forEach(v-> System.out.println(v)); diff --git a/src/main/java/hw14/Doctor.java b/src/main/java/hw14/Doctor.java index fa98628..19624ca 100644 --- a/src/main/java/hw14/Doctor.java +++ b/src/main/java/hw14/Doctor.java @@ -10,6 +10,7 @@ public Doctor(String name, String lastname, Position position) { this.lastname = lastname; this.position = position; } + public Doctor(){} public String getName() { return name; @@ -34,4 +35,13 @@ public Position getPosition() { public void setPosition(Position position) { this.position = position; } + + @Override + public String toString() { + return "\nDoctor" + + "\nname='" + name + '\'' + + "\nlastname='" + lastname + '\'' + + "\nposition=" + position + + "\n***************************************************"; + } } diff --git a/src/main/java/hw14/Hospital.java b/src/main/java/hw14/Hospital.java index 7495d85..1f5e2dc 100644 --- a/src/main/java/hw14/Hospital.java +++ b/src/main/java/hw14/Hospital.java @@ -7,6 +7,32 @@ public class Hospital { private String hospitalName; private Address address; + private ArrayList doctors; + + Doctor James = new Doctor("James","Jameson",Position.CARDIOLOGIST); + Doctor Ivan = new Doctor("Ivan","Ivanov",Position.DERMATOLOGIST); + Doctor Susan = new Doctor("Susan","Simpson",Position.PEDIATRIC); + Doctor Mike = new Doctor("Mike", "Pense",Position.PHYSICIAN); + Doctor Lukas = new Doctor("Lukas","Cane",Position.SURGEON); + + + private HashMap rooms; + + Rooms f1 = new Rooms(1,Position.SURGEON); + Rooms f2 = new Rooms(2,Position.PHYSICIAN); + Rooms f3 = new Rooms(3,Position.PEDIATRIC); + Rooms f4 = new Rooms(4,Position.DERMATOLOGIST); + Rooms f5 = new Rooms(5,Position.CARDIOLOGIST); + + private ArrayList acceptedInsurances = new ArrayList<>(); + + + + + + + + public Hospital(String hospitalName, Address address) { this.hospitalName = hospitalName; diff --git a/src/main/java/hw14/Hw14.java b/src/main/java/hw14/Hw14.java index 22f9e0e..5b5253a 100644 --- a/src/main/java/hw14/Hw14.java +++ b/src/main/java/hw14/Hw14.java @@ -7,7 +7,25 @@ public class Hw14 { public static void main(String[] args) { + Doctor James = new Doctor("James","Jameson",Position.CARDIOLOGIST); + Doctor Ivan = new Doctor("Ivan","Ivanov",Position.DERMATOLOGIST); + Doctor Susan = new Doctor("Susan","Simpson",Position.PEDIATRIC); + Doctor Mike = new Doctor("Mike", "Pense",Position.PHYSICIAN); + Doctor Lukas = new Doctor("Lukas","Cane",Position.SURGEON); List doctors = new ArrayList<>(); + doctors.add(James); + doctors.add(Ivan); + doctors.add(Susan); + doctors.add(Mike); + doctors.add(Lukas); + System.out.println(doctors); + System.out.println("===================================================="); + + + + + + diff --git a/src/main/java/hw14/Rooms.java b/src/main/java/hw14/Rooms.java index 15129b1..a32d082 100644 --- a/src/main/java/hw14/Rooms.java +++ b/src/main/java/hw14/Rooms.java @@ -3,6 +3,36 @@ import java.util.HashMap; public class Rooms { - private HashMap rooms = new HashMap<>(); + private int number; + private Position position; + public Rooms(int number, Position position) { + this.number = number; + this.position = position; + } + public Rooms(){} + + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } + + public Position getPosition() { + return position; + } + + public void setPosition(Position position) { + this.position = position; + } + + @Override + public String toString() { + return "\nRooms" + + "\nnumber=" + number + + "\nposition=" + position + + "*****************************************************"; + } } From 8576111f4a87bb8614988e050094ec5f2bf71a63 Mon Sep 17 00:00:00 2001 From: dsinj Date: Mon, 24 Aug 2020 12:10:44 -0500 Subject: [PATCH 14/18] hw14 --- src/main/java/hw14/Address.java | 17 ++++++ src/main/java/hw14/Hospital.java | 93 +++++++++++++++++++++++--------- src/main/java/hw14/Hw14.java | 44 ++++++++++++--- 3 files changed, 120 insertions(+), 34 deletions(-) diff --git a/src/main/java/hw14/Address.java b/src/main/java/hw14/Address.java index f7a652c..02420d9 100644 --- a/src/main/java/hw14/Address.java +++ b/src/main/java/hw14/Address.java @@ -6,4 +6,21 @@ public class Address { private String state; private int zip; + public Address(String streetAddress, String town, String state, int zip) { + this.streetAddress = streetAddress; + this.town = town; + this.state = state; + this.zip = zip; + } + public Address(){} + + @Override + public String toString() { + return "\nAddress" + + "\nstreetAddress='" + streetAddress + '\'' + + "\ntown='" + town + '\'' + + "\nstate='" + state + '\'' + + "\nzip=" + zip + + "\n**************************************************"; + } } diff --git a/src/main/java/hw14/Hospital.java b/src/main/java/hw14/Hospital.java index 1f5e2dc..a64ebb4 100644 --- a/src/main/java/hw14/Hospital.java +++ b/src/main/java/hw14/Hospital.java @@ -8,37 +8,20 @@ public class Hospital { private String hospitalName; private Address address; private ArrayList doctors; + private HashMap rooms; + private ArrayList acceptedInsurances; - Doctor James = new Doctor("James","Jameson",Position.CARDIOLOGIST); - Doctor Ivan = new Doctor("Ivan","Ivanov",Position.DERMATOLOGIST); - Doctor Susan = new Doctor("Susan","Simpson",Position.PEDIATRIC); - Doctor Mike = new Doctor("Mike", "Pense",Position.PHYSICIAN); - Doctor Lukas = new Doctor("Lukas","Cane",Position.SURGEON); - - - private HashMap rooms; - - Rooms f1 = new Rooms(1,Position.SURGEON); - Rooms f2 = new Rooms(2,Position.PHYSICIAN); - Rooms f3 = new Rooms(3,Position.PEDIATRIC); - Rooms f4 = new Rooms(4,Position.DERMATOLOGIST); - Rooms f5 = new Rooms(5,Position.CARDIOLOGIST); - - private ArrayList acceptedInsurances = new ArrayList<>(); - - - - - - - - - - public Hospital(String hospitalName, Address address) { + public Hospital(String hospitalName, Address address, ArrayList doctors, HashMap rooms, ArrayList acceptedInsurances) { this.hospitalName = hospitalName; this.address = address; + this.doctors = doctors; + this.rooms = rooms; + this.acceptedInsurances = acceptedInsurances; } + + public Hospital(){} + public String getHospitalName() { return hospitalName; } @@ -54,4 +37,62 @@ public Address getAddress() { public void setAddress(Address address) { this.address = address; } + + public ArrayList getDoctors() { + return doctors; + } + + public void setDoctors(ArrayList doctors) { + this.doctors = doctors; + } + + public HashMap getRooms() { + return rooms; + } + + public void setRooms(HashMap rooms) { + this.rooms = rooms; + } + + public ArrayList getAcceptedInsurances() { + return acceptedInsurances; + } + + public void setAcceptedInsurances(ArrayList acceptedInsurances) { + this.acceptedInsurances = acceptedInsurances; + } + + public void printHospital(){ + System.out.println("Hospital: "+ + "\nHospitalname='"+ hospitalName+'\''+ + "Address= "+ address.toString()); + } + public void printDoctor(){ + for(Doctor d: doctors){ + System.out.println("\nDoctors= "+d); + } + } + public void printRooms(){ + for(Integer d: rooms.keySet()){ + System.out.println(d); + } + } + public void printInsurance(){ + for(Insurance i: acceptedInsurances);{ + System.out.println(i); + } + } + + + +// @Override +// public String toString() { +// return "\nHospital" + +// "\nhospitalName='" + hospitalName + '\'' + +// "\naddress=" + address + +// "\ndoctors=" + doctors + +// "\nrooms=" + rooms + +// "\nacceptedInsurances=" + acceptedInsurances + +// "\n*************************************************************"; +// } } \ No newline at end of file diff --git a/src/main/java/hw14/Hw14.java b/src/main/java/hw14/Hw14.java index 5b5253a..1ec010d 100644 --- a/src/main/java/hw14/Hw14.java +++ b/src/main/java/hw14/Hw14.java @@ -7,19 +7,47 @@ public class Hw14 { public static void main(String[] args) { + List listDoctors = new ArrayList<>(); Doctor James = new Doctor("James","Jameson",Position.CARDIOLOGIST); Doctor Ivan = new Doctor("Ivan","Ivanov",Position.DERMATOLOGIST); Doctor Susan = new Doctor("Susan","Simpson",Position.PEDIATRIC); Doctor Mike = new Doctor("Mike", "Pense",Position.PHYSICIAN); Doctor Lukas = new Doctor("Lukas","Cane",Position.SURGEON); - List doctors = new ArrayList<>(); - doctors.add(James); - doctors.add(Ivan); - doctors.add(Susan); - doctors.add(Mike); - doctors.add(Lukas); - System.out.println(doctors); - System.out.println("===================================================="); + + listDoctors.add(James); + listDoctors.add(Ivan); + listDoctors.add(Susan); + listDoctors.add(Mike); + listDoctors.add(Lukas); + + HashMap rooms = new HashMap<>(); + rooms.put(1,Position.SURGEON); + rooms.put(2,Position.PHYSICIAN); + rooms.put(3,Position.PEDIATRIC); + rooms.put(4,Position.DERMATOLOGIST); + rooms.put(5,Position.CARDIOLOGIST); + + List listInsurance = new ArrayList<>(); + listInsurance.add(Insurance.ANTHEM); + listInsurance.add(Insurance.CVS); + listInsurance.add(Insurance.HUMANA); + listInsurance.add(Insurance.UNITED); + listInsurance.add(Insurance.KAISER); + + Address address = new Address("2545 Hollow str","Washington","DC",5412); + + Hospital hospital = new Hospital("St Jones",address,listDoctors,rooms,listInsurance); + + + + + + + + + + + From bc8fa788d08007e653cf32a0b2801c0a372b81c2 Mon Sep 17 00:00:00 2001 From: dsinj Date: Tue, 25 Aug 2020 09:12:36 -0500 Subject: [PATCH 15/18] hw14 --- src/main/java/hw14/Hospital.java | 25 +++++++++++++------------ src/main/java/hw14/Hw14.java | 19 ++++++++++++------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/main/java/hw14/Hospital.java b/src/main/java/hw14/Hospital.java index a64ebb4..2cce759 100644 --- a/src/main/java/hw14/Hospital.java +++ b/src/main/java/hw14/Hospital.java @@ -3,13 +3,14 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; public class Hospital { - private String hospitalName; - private Address address; - private ArrayList doctors; - private HashMap rooms; - private ArrayList acceptedInsurances; + private static String hospitalName; + private static Address address; + private static ArrayList doctors; + private static HashMap rooms; + private static ArrayList acceptedInsurances; public Hospital(String hospitalName, Address address, ArrayList doctors, HashMap rooms, ArrayList acceptedInsurances) { this.hospitalName = hospitalName; @@ -62,24 +63,24 @@ public void setAcceptedInsurances(ArrayList acceptedInsurances) { this.acceptedInsurances = acceptedInsurances; } - public void printHospital(){ + public static void printHospital(){ System.out.println("Hospital: "+ "\nHospitalname='"+ hospitalName+'\''+ "Address= "+ address.toString()); } - public void printDoctor(){ + public static void printDoctor(){ for(Doctor d: doctors){ System.out.println("\nDoctors= "+d); } } - public void printRooms(){ - for(Integer d: rooms.keySet()){ - System.out.println(d); + public static void printRooms(){ + for(Map.Entry entry: rooms.entrySet()){ + System.out.println(entry.getKey() +" "+ entry.getValue()); } } - public void printInsurance(){ + public static void printInsurance(){ for(Insurance i: acceptedInsurances);{ - System.out.println(i); + System.out.println(acceptedInsurances); } } diff --git a/src/main/java/hw14/Hw14.java b/src/main/java/hw14/Hw14.java index 1ec010d..9bbc30a 100644 --- a/src/main/java/hw14/Hw14.java +++ b/src/main/java/hw14/Hw14.java @@ -7,7 +7,7 @@ public class Hw14 { public static void main(String[] args) { - List listDoctors = new ArrayList<>(); + ArrayList listDoctors = new ArrayList<>(); Doctor James = new Doctor("James","Jameson",Position.CARDIOLOGIST); Doctor Ivan = new Doctor("Ivan","Ivanov",Position.DERMATOLOGIST); Doctor Susan = new Doctor("Susan","Simpson",Position.PEDIATRIC); @@ -21,13 +21,13 @@ public static void main(String[] args) { listDoctors.add(Lukas); HashMap rooms = new HashMap<>(); - rooms.put(1,Position.SURGEON); - rooms.put(2,Position.PHYSICIAN); - rooms.put(3,Position.PEDIATRIC); - rooms.put(4,Position.DERMATOLOGIST); - rooms.put(5,Position.CARDIOLOGIST); + rooms.put(101,Position.SURGEON); + rooms.put(232,Position.PHYSICIAN); + rooms.put(314,Position.PEDIATRIC); + rooms.put(254,Position.DERMATOLOGIST); + rooms.put(365,Position.CARDIOLOGIST); - List listInsurance = new ArrayList<>(); + ArrayList listInsurance = new ArrayList<>(); listInsurance.add(Insurance.ANTHEM); listInsurance.add(Insurance.CVS); listInsurance.add(Insurance.HUMANA); @@ -37,6 +37,11 @@ public static void main(String[] args) { Address address = new Address("2545 Hollow str","Washington","DC",5412); Hospital hospital = new Hospital("St Jones",address,listDoctors,rooms,listInsurance); + Hospital.printHospital(); + Hospital.printInsurance(); + Hospital.printDoctor(); + Hospital.printRooms(); + From 28c27aa1c95f2f16b085c32e26da67c9e0a8db39 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sun, 6 Sep 2020 14:31:09 -0500 Subject: [PATCH 16/18] hw assert --- src/main/java/hw14/Hospital.java | 4 +- src/main/java/lesson7/App.java | 1 + src/test/java/davitTest/koelappLoginTest.java | 57 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 src/test/java/davitTest/koelappLoginTest.java diff --git a/src/main/java/hw14/Hospital.java b/src/main/java/hw14/Hospital.java index 2cce759..0f15eee 100644 --- a/src/main/java/hw14/Hospital.java +++ b/src/main/java/hw14/Hospital.java @@ -79,8 +79,8 @@ public static void printRooms(){ } } public static void printInsurance(){ - for(Insurance i: acceptedInsurances);{ - System.out.println(acceptedInsurances); + for(Insurance i : acceptedInsurances){ + System.out.println(i); } } diff --git a/src/main/java/lesson7/App.java b/src/main/java/lesson7/App.java index 805bbc6..41ae67e 100644 --- a/src/main/java/lesson7/App.java +++ b/src/main/java/lesson7/App.java @@ -21,4 +21,5 @@ public static int sum(int a,int b, int c){ return a+b+c; } + } diff --git a/src/test/java/davitTest/koelappLoginTest.java b/src/test/java/davitTest/koelappLoginTest.java new file mode 100644 index 0000000..34d4321 --- /dev/null +++ b/src/test/java/davitTest/koelappLoginTest.java @@ -0,0 +1,57 @@ +package davitTest; + +import com.google.common.base.VerifyException; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.FluentWait; +import org.openqa.selenium.support.ui.WebDriverWait; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.testng.reporters.jq.ResultsByClass; + +import java.time.Duration; + +public class koelappLoginTest { + private WebDriver driver; + private WebDriverWait wait; + private FluentWait fluentWait; + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + wait = new WebDriverWait(driver,10); + fluentWait = new FluentWait<>(driver) + .pollingEvery(Duration.ofMillis(100)) + .withTimeout(Duration.ofSeconds(20)); + driver.get("https://koelapp.testpro.io"); + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void loginKoel(){ + wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("[type='email']"))); + WebElement email = driver.findElement(By.cssSelector("[type='email']")); + WebElement password = driver.findElement(By.cssSelector("[type='password']")); + WebElement loginButton = driver.findElement(By.tagName("button")); + + email.sendKeys("koeluser06@testpro.io"); + password.sendKeys("student"); + loginButton.click(); + + //wait.until(ExpectedConditions.elementToBeSelected(By.cssSelector("[class='error']"))); + + WebElement loginError = driver.findElement(By.cssSelector("[class='error']")); + + Assert.assertFalse(loginError.isSelected()); + + } +} From 85d786694979d040fbd25bbf07ddd48c047c4f09 Mon Sep 17 00:00:00 2001 From: dsinj Date: Fri, 11 Sep 2020 09:50:32 -0500 Subject: [PATCH 17/18] hw assert --- src/test/java/davitTest/koelappLoginTest.java | 6 +- src/test/java/davitTest/sample.java | 79 +++++++++++++++++++ 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 src/test/java/davitTest/sample.java diff --git a/src/test/java/davitTest/koelappLoginTest.java b/src/test/java/davitTest/koelappLoginTest.java index 34d4321..1569403 100644 --- a/src/test/java/davitTest/koelappLoginTest.java +++ b/src/test/java/davitTest/koelappLoginTest.java @@ -47,11 +47,11 @@ public void loginKoel(){ password.sendKeys("student"); loginButton.click(); - //wait.until(ExpectedConditions.elementToBeSelected(By.cssSelector("[class='error']"))); + wait.until(ExpectedConditions.elementToBeSelected(By.xpath("//*[@class='error']"))); - WebElement loginError = driver.findElement(By.cssSelector("[class='error']")); + WebElement loginError = driver.findElement(By.xpath("//*[@class='error']")); - Assert.assertFalse(loginError.isSelected()); + Assert.assertFalse(loginError.isDisplayed()); } } diff --git a/src/test/java/davitTest/sample.java b/src/test/java/davitTest/sample.java new file mode 100644 index 0000000..a8bb08e --- /dev/null +++ b/src/test/java/davitTest/sample.java @@ -0,0 +1,79 @@ +package davitTest; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.FluentWait; +import org.openqa.selenium.support.ui.WebDriverWait; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.time.Duration; + +public class sample { + private WebDriver driver; + private WebDriverWait wait; + private FluentWait fluentWait; + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + wait = new WebDriverWait(driver,10); + fluentWait = new FluentWait<>(driver) + .pollingEvery(Duration.ofMillis(100)) + .withTimeout(Duration.ofSeconds(20)); + driver.get("https://staging.qliqsoft.com/"); + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void loginstaging(){ + wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("[value='Login']"))); + WebElement email = driver.findElement(By.cssSelector("[type='email']")); + WebElement password = driver.findElement(By.cssSelector("[type='password']")); + WebElement loginButton = driver.findElement(By.cssSelector("[value='Login']")); + + email.sendKeys("jdonut@elmer.test"); + password.sendKeys("jsm108"); + loginButton.click(); + + WebElement clickConversation = driver.findElement(By.xpath("//*[contains(@shape,'talk-bubbles')]")); + clickConversation.click(); + + WebElement startConversation = driver.findElement(By.xpath("//*[contains(@class,'v-btn v-btn--contained theme--light v-size--small has-tooltip')]")); + startConversation.click(); + + WebElement enterPatientName = driver.findElement(By.xpath("//*[@id='input-1760']")); + enterPatientName.sendKeys("dat test"); + + + // WebElement loginsucces = driver.findElement(By.xpath("//*[@class='dropdown_txt']")); + + // Assert.assertTrue(loginsucces.isDisplayed()); + } +// @Test +// public void loginError(){ +// wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("[value='Login']"))); +// WebElement email = driver.findElement(By.cssSelector("[type='email']")); +// WebElement password = driver.findElement(By.cssSelector("[type='password']")); +// WebElement loginButton = driver.findElement(By.cssSelector("[value='Login']")); +// +// email.sendKeys("jdonut@elmer.test"); +// password.sendKeys("jsm108"); +// loginButton.click(); +// +// WebElement logout = driver.findElement(By.xpath("//*[@class='action_link'][3]")); +// logout.click(); +// WebElement logoutAssert = driver.findElement(By.cssSelector("[value='Login']")); +// +// Assert.assertFalse(logoutAssert.isSelected()); +// } +} From 9b8dd00eb03e87488890835e8a3b64c11c6e5278 Mon Sep 17 00:00:00 2001 From: dsinj Date: Sat, 12 Sep 2020 14:45:25 -0500 Subject: [PATCH 18/18] hw playlist --- .../java/datHelper/TestDataGenerator.java | 11 +++++ src/test/java/datPageObjects/BasePage.java | 25 ++++++++++ src/test/java/datPageObjects/LoginPage.java | 38 +++++++++++++++ src/test/java/datPageObjects/MainPage.java | 48 +++++++++++++++++++ src/test/java/datPageTests/LoginTest.java | 41 ++++++++++++++++ src/test/java/datPageTests/PlaylistTest.java | 48 +++++++++++++++++++ src/test/java/davitTest/LoginTest.java | 43 +++++++++++++++++ src/test/java/davitTest/PlaylistTest.java | 43 +++++++++++++++++ 8 files changed, 297 insertions(+) create mode 100644 src/test/java/datHelper/TestDataGenerator.java create mode 100644 src/test/java/datPageObjects/BasePage.java create mode 100644 src/test/java/datPageObjects/LoginPage.java create mode 100644 src/test/java/datPageObjects/MainPage.java create mode 100644 src/test/java/datPageTests/LoginTest.java create mode 100644 src/test/java/datPageTests/PlaylistTest.java create mode 100644 src/test/java/davitTest/LoginTest.java create mode 100644 src/test/java/davitTest/PlaylistTest.java diff --git a/src/test/java/datHelper/TestDataGenerator.java b/src/test/java/datHelper/TestDataGenerator.java new file mode 100644 index 0000000..3d7e0d7 --- /dev/null +++ b/src/test/java/datHelper/TestDataGenerator.java @@ -0,0 +1,11 @@ +package datHelper; + +import org.apache.commons.lang3.RandomStringUtils; + +public class TestDataGenerator { + public static String randomString(int length){ + boolean useLetters = true; + boolean useNumbers = false; + return RandomStringUtils.random(length, useLetters, useNumbers); + } +} diff --git a/src/test/java/datPageObjects/BasePage.java b/src/test/java/datPageObjects/BasePage.java new file mode 100644 index 0000000..7141309 --- /dev/null +++ b/src/test/java/datPageObjects/BasePage.java @@ -0,0 +1,25 @@ +package datPageObjects; + +import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.StaleElementReferenceException; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.ui.FluentWait; +import org.openqa.selenium.support.ui.WebDriverWait; + +import java.time.Duration; + +public class BasePage { + protected WebDriver driver; + protected WebDriverWait wait; + protected FluentWait fluentWait; + + public BasePage(WebDriver driver) { + this.driver = driver; + wait = new WebDriverWait(driver,10); + fluentWait = new FluentWait(driver) + .pollingEvery(Duration.ofMillis(100)) + .withTimeout(Duration.ofSeconds(20)) + .ignoring(NoSuchElementException.class) + .ignoring(StaleElementReferenceException.class); + } +} diff --git a/src/test/java/datPageObjects/LoginPage.java b/src/test/java/datPageObjects/LoginPage.java new file mode 100644 index 0000000..07a1e06 --- /dev/null +++ b/src/test/java/datPageObjects/LoginPage.java @@ -0,0 +1,38 @@ +package datPageObjects; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedConditions; +import pageObjects.BasePage; +import pageObjects.MainPage; + +public class LoginPage extends BasePage { + public LoginPage(WebDriver driver) { + super(driver); + } + + private WebElement getEmail(){ + wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("[type='email']"))); + return driver.findElement(By.cssSelector("[type='email']")); + } + + private WebElement getPassword(){ + return driver.findElement(By.cssSelector("[type='password']")); + } + + private WebElement getLoginButton(){ + return driver.findElement(By.tagName("button")); + } + + public void open() { + driver.get("https://koelapp.testpro.io"); + } + + public MainPage logIn(String email, String password) { + getEmail().sendKeys(email); + getPassword().sendKeys(password); + getLoginButton().click(); + return new MainPage(driver); + } +} diff --git a/src/test/java/datPageObjects/MainPage.java b/src/test/java/datPageObjects/MainPage.java new file mode 100644 index 0000000..f2dc902 --- /dev/null +++ b/src/test/java/datPageObjects/MainPage.java @@ -0,0 +1,48 @@ +package datPageObjects; + +import org.openqa.selenium.*; +import org.openqa.selenium.support.ui.ExpectedConditions; +import pageObjects.BasePage; + +import java.util.List; + +public class MainPage extends BasePage { + public MainPage(WebDriver driver) { + super(driver); + } + + private WebElement getPlusButton(){ + wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector(".fa-plus-circle"))); + return driver.findElement(By.cssSelector(".fa-plus-circle")); + } + private WebElement getNewPlaylistField(){ + return driver.findElement(By.xpath("//*[contains(@placeholder,'to save')]")); + } + + public String createPlaylist(String name){ + getPlusButton().click(); + getNewPlaylistField().sendKeys(name); + getNewPlaylistField().sendKeys(Keys.ENTER); + wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//*[@class='success show']"))); + + return driver.getCurrentUrl().split("/")[5]; + } + + public boolean isPlaylistExist(String playlistId){ + List list = driver.findElements(By.xpath("//*[@href='#!/playlist/"+playlistId+"']")); + return list.size() > 0; + } + + public boolean isLogoutButton(){ + try{ + wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector(".logout"))); + } catch (TimeoutException err) { + return false; + } + return true; + } + + public void renamePlaylist(String playlistId, String newName) { + // ((JavascriptExecutor)driver).executeScript("arguments[0].scrollIntoView();",isPlaylistExist()) + } +} diff --git a/src/test/java/datPageTests/LoginTest.java b/src/test/java/datPageTests/LoginTest.java new file mode 100644 index 0000000..510b8cf --- /dev/null +++ b/src/test/java/datPageTests/LoginTest.java @@ -0,0 +1,41 @@ +package datPageTests; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import pageObjects.LoginPage; +import pageObjects.MainPage; + + +public class LoginTest { + private WebDriver driver; + + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void loginTest(){ + LoginPage loginPage = new LoginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.logIn("koeluser06@testpro.io","te$t$tudent"); + Assert.assertTrue(mainPage.isLogoutButton()); + } + @Test + public void wrongLoginTest(){ + LoginPage loginPage = new LoginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.logIn("koeluser06@testpro.io","88888888"); + Assert.assertFalse(mainPage.isLogoutButton()); + } +} diff --git a/src/test/java/datPageTests/PlaylistTest.java b/src/test/java/datPageTests/PlaylistTest.java new file mode 100644 index 0000000..21f44d2 --- /dev/null +++ b/src/test/java/datPageTests/PlaylistTest.java @@ -0,0 +1,48 @@ +package datPageTests; + +import helper.TestDataGenerator; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import pageObjects.LoginPage; +import pageObjects.MainPage; + + +public class PlaylistTest { + private WebDriver driver; + + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void createPlaylistTest(){ + String name = TestDataGenerator.randomString(8); + LoginPage loginPage = new LoginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.logIn("koeluser06@testpro.io","te$t$tudent"); + String playlistId = mainPage.createPlaylist(name); + Assert.assertTrue(mainPage.isPlaylistExist(playlistId)); + } + @Test + public void renamePlaylistTest(){ + String name = TestDataGenerator.randomString(8); + LoginPage loginPage = new LoginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.logIn("koeluser06@testpro.io","te$t$tudent"); + String playlistId = mainPage.createPlaylist(name); + + String newName = TestDataGenerator.randomString(8); + mainPage.renamePlaylist(playlistId, newName); + } +} diff --git a/src/test/java/davitTest/LoginTest.java b/src/test/java/davitTest/LoginTest.java new file mode 100644 index 0000000..16abc1c --- /dev/null +++ b/src/test/java/davitTest/LoginTest.java @@ -0,0 +1,43 @@ +package davitTest; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + + +public class LoginTest { + private WebDriver driver; + + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + + + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void loginTest(){ + loginPage loginPage = new loginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.login("koeluser06@testpro.io","te$t$tudent"); + Assert.assertTrue(mainPage.isLogoutButton()); + + } + @Test + public void wrongLoginTest(){ + loginPage loginPage = new loginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.login("koeluser06@testpro.io","77777"); + mainPage.createPlaylist("Dat"); + + } +} diff --git a/src/test/java/davitTest/PlaylistTest.java b/src/test/java/davitTest/PlaylistTest.java new file mode 100644 index 0000000..227a121 --- /dev/null +++ b/src/test/java/davitTest/PlaylistTest.java @@ -0,0 +1,43 @@ +package davitTest; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + + +public class PlaylistTest { + private WebDriver driver; + + @BeforeMethod + public void startUp(){ + System.setProperty("webdriver.chrome.driver","chromedriver.exe"); + driver = new ChromeDriver(); + + + + } + @AfterMethod + public void teatDown() throws InterruptedException { + Thread.sleep(5000); + driver.quit(); + } + @Test + public void loginTest(){ + loginPage loginPage = new loginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.login("koeluser06@testpro.io","te$t$tudent"); + Assert.assertTrue(mainPage.isLogoutButton()); + + } + @Test + public void wrongLoginTest(){ + loginPage loginPage = new loginPage(driver); + loginPage.open(); + MainPage mainPage = loginPage.login("koeluser06@testpro.io","77777"); + Assert.assertFalse(mainPage.isLogoutButton()); + + } +}