Merge pull request #44 from egozcl/master

Add region South America (São Paulo)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Simple Amazon Glacier Uploader Changelog
 
+### 2020/09/20 - Version 0.76.1
+
+- Add new region: South America (São Paulo), Brasil.
+- Fix class test for Windows.
+- Update URL website to https://simpleamazonglacieruploader.github.io
+
 ### 2018/12/09 - Version 0.76.0
 
 - Add new regions: EU (Frankfurt, EU (London), EU (Paris), Asia Pacific (Seoul), Asia Pacific (Osaka-Local),

src/main/java/com/brianmcmichael/sagu/Endpoint.java

@@ -33,7 +33,8 @@ public enum Endpoint {
     CN_NORTHWEST_NINGXIA("cn-northwest-1", "China (Ningxia)"),
     CA_CENTRAL("ca-central-1", "Canada (Central)"),
     US_EAST_OHIO("us-east-2", "US East (Ohio)"),
-    US_GOV_WEST("us-gov-west-1", "AWS GovCloud (US)");
+    US_GOV_WEST("us-gov-west-1", "AWS GovCloud (US)"),
+    SA_SAO_PAULO("sa-east-1","South America (São Paulo)");
 
     private final String id;
     private final String title;

src/main/java/com/brianmcmichael/sagu/SAGU.java

@@ -54,7 +54,7 @@ public class SAGU extends JFrame implements ActionListener {
             TITLE + " is free software.\n" +
             "Your feedback is appreciated.\n" +
             "This program is not any way affiliated with Amazon Web Services or Amazon.com.";
-    private static final String URL_STRING = "http://simpleglacieruploader.brianmcmichael.com/";
+    private static final String URL_STRING = "https://simpleamazonglacieruploader.github.io/";
     private static final String AWS_SITE_STRING = "Get AWS Credentials";
 
     public static final String ACCESS_LABEL = "Access Key: ";

src/test/java/com/brianmcmichael/sagu/AppPropertiesTest.java

@@ -27,11 +27,14 @@ public class AppPropertiesTest {
 
     private String propertiesResourcePath;
     private String resourceDir;
-
+    private static final boolean IS_WINDOWS = System.getProperty( "os.name" ).contains( "indow" );
+
     @BeforeClass
     public void setUpClass() throws Exception {
         propertiesResourcePath = AppPropertiesTest.class.getResource("/SAGU.properties").getPath();
+        propertiesResourcePath = IS_WINDOWS ? propertiesResourcePath.replace("/C:/","C:\\").replace("/","\\") : propertiesResourcePath;
         resourceDir = Paths.get(propertiesResourcePath).getParent().toString();
+        resourceDir = IS_WINDOWS ? resourceDir.replace("/C:/","C:\\") : resourceDir;
     }
 
     @Test
@@ -158,4 +161,4 @@ public void savePropertiesShouldWriteThemToFile() throws Exception {
         assertThat(savedProp.getProperty("logType"), is("4"));
     }
 
-}
+}

src/test/java/com/brianmcmichael/sagu/EndpointTest.java

@@ -38,6 +38,7 @@ public void shouldReturnCorrectInstanceByIndex() {
         assertThat(Endpoint.getByIndex(15), is(CA_CENTRAL));
         assertThat(Endpoint.getByIndex(16), is(US_EAST_OHIO));
         assertThat(Endpoint.getByIndex(17), is(US_GOV_WEST));
+        assertThat(Endpoint.getByIndex(18), is(SA_SAO_PAULO));
     }
 
     @Test
@@ -60,6 +61,7 @@ public void getRegionTitleShouldReturnCorrectValues() {
         assertThat(getTitleByIndex(15), is("Canada (Central)"));
         assertThat(getTitleByIndex(16), is("US East (Ohio)"));
         assertThat(getTitleByIndex(17), is("AWS GovCloud (US)"));
+        assertThat(getTitleByIndex(18), is("South America (São Paulo)"));
     }
 
     @Test
@@ -68,7 +70,7 @@ public void shouldPopulateComboBoxWithValuesInCorrectOrder() {
         assertThat(comboBox.getItemCount(), is(0));
 
         Endpoint.populateComboBox(comboBox);
-        assertThat(comboBox.getItemCount(), is(18));
+        assertThat(comboBox.getItemCount(), is(19));
         assertThat(comboBox.getItemAt(0), is("US East (Northern Virginia)"));
         assertThat(comboBox.getItemAt(1), is("US West (Oregon)"));
         assertThat(comboBox.getItemAt(2), is("US West (Northern California)"));
@@ -87,6 +89,7 @@ public void shouldPopulateComboBoxWithValuesInCorrectOrder() {
         assertThat(comboBox.getItemAt(15), is("Canada (Central)"));
         assertThat(comboBox.getItemAt(16), is("US East (Ohio)"));
         assertThat(comboBox.getItemAt(17), is("AWS GovCloud (US)"));
+        assertThat(comboBox.getItemAt(18), is("South America (São Paulo)"));
     }
 
     @Test
@@ -109,6 +112,7 @@ public void getGlacierEndpointShouldReturnCorrectAddress() {
         assertThat(CA_CENTRAL.getGlacierEndpoint(), is("https://glacier.ca-central-1.amazonaws.com/"));
         assertThat(US_EAST_OHIO.getGlacierEndpoint(), is("https://glacier.us-east-2.amazonaws.com/"));
         assertThat(US_GOV_WEST.getGlacierEndpoint(), is("https://glacier.us-gov-west-1.amazonaws.com/"));
+        assertThat(SA_SAO_PAULO.getGlacierEndpoint(), is("https://glacier.sa-east-1.amazonaws.com/"));
     }
 
     @Test
@@ -131,6 +135,7 @@ public void getSQSEndpointShouldReturnCorrectAddress() {
         assertThat(CA_CENTRAL.getSQSEndpoint(), is("https://sqs.ca-central-1.amazonaws.com/"));
         assertThat(US_EAST_OHIO.getSQSEndpoint(), is("https://sqs.us-east-2.amazonaws.com/"));
         assertThat(US_GOV_WEST.getSQSEndpoint(), is("https://sqs.us-gov-west-1.amazonaws.com/"));
+        assertThat(SA_SAO_PAULO.getSQSEndpoint(), is("https://sqs.sa-east-1.amazonaws.com/"));
     }
 
     @Test
@@ -153,5 +158,6 @@ public void getSNSEndpointShouldReturnCorrectAddress() {
         assertThat(CA_CENTRAL.getSNSEndpoint(), is("https://sns.ca-central-1.amazonaws.com/"));
         assertThat(US_EAST_OHIO.getSNSEndpoint(), is("https://sns.us-east-2.amazonaws.com/"));
         assertThat(US_GOV_WEST.getSNSEndpoint(), is("https://sns.us-gov-west-1.amazonaws.com/"));
+        assertThat(SA_SAO_PAULO.getSNSEndpoint(), is("https://sns.sa-east-1.amazonaws.com/"));
     }
-}
+}