You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/06/06 16:33:56 UTC

[maven-shared-utils] branch MSHARED-826 updated (4991f7f -> 882e845)

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git.


    from 4991f7f  Require Java 7
     new 102437f  Load SUT class a little later
     new 882e845  Cleanup

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/maven/shared/utils/OsTest.java | 33 ----------------------
 1 file changed, 33 deletions(-)


[maven-shared-utils] 01/02: Load SUT class a little later

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit 102437f7346455d37c61d11b66614b9598444cc7
Author: Maarten Mulders <m....@xs4all.nl>
AuthorDate: Thu Jun 6 13:32:09 2019 +0200

    Load SUT class a little later
    
    This way, we can first change the system props
    and then interact with the SUT. This way, changing
    the static class fields is no longer needed.
---
 .../java/org/apache/maven/shared/utils/OsTest.java | 30 +---------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java
index 051a930..7c2fd1f 100644
--- a/src/test/java/org/apache/maven/shared/utils/OsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java
@@ -47,58 +47,30 @@ public class OsTest
 
     @Before
     public void setUp()
-        throws Exception
     {
         origOsName = System.getProperty( "os.name" );
         origOsArch = System.getProperty( "os.arch" );
         origOsVersion = System.getProperty( "os.version" );
-        origOsFamily = Os.OS_FAMILY;
 
         // and now set some special settings ;)
         System.setProperty( "os.name"   , "os/2" );
         System.setProperty( "os.arch"   , "i386" );
         System.setProperty( "os.version", "2.1.32" );
 
-        // blow away the originally loaded values
-        setStaticOsField( "OS_NAME", "os/2" );
-        setStaticOsField( "OS_FAMILY", "os/2" );
-        setStaticOsField( "OS_ARCH", "i386" );
-        setStaticOsField( "OS_VERSION", "2.1.32" );
+        origOsFamily = Os.OS_FAMILY;
     }
 
     @After
     public void tearDown()
-        throws Exception
     {
         // set the original OS settings again
         System.setProperty( "os.name"   , origOsName );
         System.setProperty( "os.arch"   , origOsArch );
         System.setProperty( "os.version", origOsVersion );
-
-        // restore the originally loaded values
-        setStaticOsField( "OS_NAME", origOsName );
-        setStaticOsField( "OS_ARCH", origOsArch );
-        setStaticOsField( "OS_VERSION", origOsVersion );
-        setStaticOsField( "OS_FAMILY", origOsFamily );
     }
 
-    private void setStaticOsField( String variableName, Object value )
-        throws NoSuchFieldException, IllegalAccessException
-    {
-        Field field = Os.class.getField( variableName );
-
-        Field modifiersField = Field.class.getDeclaredField( "modifiers" );
-        modifiersField.setAccessible( true );
-        modifiersField.setInt( field, field.getModifiers() & ~Modifier.FINAL );
-
-        field.setAccessible( true );
-        field.set( null, value );
-    }
-
-
     @Test
     public void testConstructor()
-        throws Exception
     {
         Os os  = new Os();
         os.eval();


[maven-shared-utils] 02/02: Cleanup

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit 882e845a2d2504f21d5a0d1596210a4ca72f56e6
Author: Maarten Mulders <m....@xs4all.nl>
AuthorDate: Thu Jun 6 14:08:10 2019 +0200

    Cleanup
---
 src/test/java/org/apache/maven/shared/utils/OsTest.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java
index 7c2fd1f..d5ea683 100644
--- a/src/test/java/org/apache/maven/shared/utils/OsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java
@@ -24,8 +24,6 @@ import org.junit.Before;
 import org.junit.After;
 import org.junit.Assert;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.Set;
 
 import static org.hamcrest.CoreMatchers.*;
@@ -40,7 +38,6 @@ public class OsTest
     extends Assert
 {
     private String origOsName;
-    private String origOsFamily;
     private String origOsArch;
     private String origOsVersion;
 
@@ -56,8 +53,6 @@ public class OsTest
         System.setProperty( "os.name"   , "os/2" );
         System.setProperty( "os.arch"   , "i386" );
         System.setProperty( "os.version", "2.1.32" );
-
-        origOsFamily = Os.OS_FAMILY;
     }
 
     @After